security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

* keyedit.c (menu_addrevoker), getkey.c (finish_lookup): Fix problem with

Browse Source 
adding a cert-only designated revoker.  Code was looking for a key with
sign ability, and not cert ability.  Noted by Timo Schulz.
This commit is contained in:
David Shaw 2005-10-27 16:23:59 +00:00
parent 2b50f31435
commit b3ea683ac9
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2005-10-27 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (menu_addrevoker), getkey.c (finish_lookup): Fix
problem with adding a cert-only designated revoker. Code was
looking for a key with sign ability, and not cert ability. Noted
by Timo Schulz.
2005-10-27 Werner Koch <wk@g10code.com> 2005-10-27 Werner Koch <wk@g10code.com>
* gpg.c [__CYGWIN__]: Set default driver to winscard.dll. * gpg.c [__CYGWIN__]: Set default driver to winscard.dll.

2
g10/getkey.c
View File

@ -2345,7 +2345,7 @@ finish_lookup (GETKEY_CTX ctx)
KBNODE k; KBNODE k;
KBNODE foundk = NULL; KBNODE foundk = NULL;
PKT_user_id *foundu = NULL; PKT_user_id *foundu = NULL;
#define USAGE_MASK (PUBKEY_USAGE_SIG|PUBKEY_USAGE_ENC) #define USAGE_MASK (PUBKEY_USAGE_SIG|PUBKEY_USAGE_ENC|PUBKEY_USAGE_CERT)
unsigned int req_usage = ( ctx->req_usage & USAGE_MASK ); unsigned int req_usage = ( ctx->req_usage & USAGE_MASK );
/* Request the primary if we're certifying another key, and also /* Request the primary if we're certifying another key, and also
if signing data while --pgp6 or --pgp7 is on since pgp 6 and 7 if signing data while --pgp6 or --pgp7 is on since pgp 6 and 7

8
g10/keyedit.c
View File

@ -3380,9 +3380,11 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive )
goto fail; goto fail;
} }
/* Note that I'm requesting SIG here and not CERT. We're making /* Note that I'm requesting CERT here, which usually implies
a certification, but it is okay to be a subkey. */ primary keys only, but some casual testing shows that PGP and
revoker_pk->req_usage=PUBKEY_USAGE_SIG; GnuPG both can handle a designated revokation from a
subkey. */
revoker_pk->req_usage=PUBKEY_USAGE_CERT;
rc=get_pubkey_byname(revoker_pk,answer,NULL,NULL,1); rc=get_pubkey_byname(revoker_pk,answer,NULL,NULL,1);
if(rc) if(rc)
{ {