security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-09 12:54:23 +01:00
Code Activity

g10: Signal an error when trying to revoke non-existant UID.

Browse Source 
* g10/keyedit.c (keyedit_quick_revuid): Signal an error when trying to
revoke non-existant UID.
* tests/openpgp/quick-key-manipulation.scm: Test that.

GnuPG-bug-id: 2962
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2017-03-02 11:39:00 +01:00
parent 74cb3b230c
commit 62d21a4ab4
No known key found for this signature in database
GPG Key ID: DD1A52F9DA8C9020
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
g10/keyedit.c
View File

@ -3053,6 +3053,8 @@ keyedit_quick_revuid (ctrl_t ctrl, const char *username, const char *uidtorev)
} }
} }
log_error (_("User ID revocation failed: %s\n"), gpg_strerror (GPG_ERR_NOT_FOUND));
leave: leave:
release_kbnode (keyblock); release_kbnode (keyblock);
keydb_release (kdbhd); keydb_release (kdbhd);

6
tests/openpgp/quick-key-manipulation.scm
View File

@ -37,6 +37,7 @@
(define alpha "Alpha <alpha@invalid.example.net>") (define alpha "Alpha <alpha@invalid.example.net>")
(define bravo "Bravo <bravo@invalid.example.net>") (define bravo "Bravo <bravo@invalid.example.net>")
(define charlie "Charlie <charlie@invalid.example.net>")
(define (key-data key) (define (key-data key)
(filter (lambda (x) (or (string=? (car x) "pub") (filter (lambda (x) (or (string=? (car x) "pub")
@ -79,6 +80,11 @@
(info "Checking that we can revoke a user ID...") (info "Checking that we can revoke a user ID...")
(call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,alpha)) (call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,alpha))
(info "Checking that we get an error revoking a non-existant user ID.")
(catch '()
(call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,charlie))
(error "Expected an error, but get none."))
(assert (= 1 (count-uids-of-secret-key bravo))) (assert (= 1 (count-uids-of-secret-key bravo)))
(info "Checking that we can change the expiration time.") (info "Checking that we can change the expiration time.")