diff options
| author | David Shaw <[email protected]> | 2005-12-19 22:10:20 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-12-19 22:10:20 +0000 |
| commit | 64fa7ea37ec46df0417a444f09223d44bb09c4de (patch) | |
| tree | 9be3d2a298acda1aed64c437fe213865967080e5 | |
| parent | * ksutil.h, ksutil.c (curl_armor_writer, curl_writer, (diff) | |
| download | gnupg-64fa7ea37ec46df0417a444f09223d44bb09c4de.tar.gz gnupg-64fa7ea37ec46df0417a444f09223d44bb09c4de.zip | |
* getkey.c (merge_selfsigs_main): All primary keys can certify.
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/getkey.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 62d27b72c..a108ed38c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2005-12-19 David Shaw <[email protected]> + + * getkey.c (merge_selfsigs_main): All primary keys can certify. + 2005-12-18 David Shaw <[email protected]> * gpg.c (main): Restore convert-sk-to-pk as programs rely on it. diff --git a/g10/getkey.c b/g10/getkey.c index 48c881b82..07efdc110 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -1812,7 +1812,9 @@ merge_selfsigs_main(KBNODE keyblock, int *r_revoked, struct revoke_info *rinfo) if ( x ) /* mask it down to the actual allowed usage */ key_usage &= x; } - pk->pubkey_usage = key_usage; + + /* Whatever happens, it's a primary key, so it can certify. */ + pk->pubkey_usage = key_usage|PUBKEY_USAGE_CERT; if ( !key_expire_seen ) { /* find the latest valid user ID with a key expiration set |