* getkey.c (merge_selfsigs_main): All primary keys can certify.
authorDavid Shaw <dshaw@jabberwocky.com>
Mon, 19 Dec 2005 22:10:20 +0000 (22:10 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Mon, 19 Dec 2005 22:10:20 +0000 (22:10 +0000)
g10/ChangeLog
g10/getkey.c

index 62d27b7..a108ed3 100644 (file)
@@ -1,3 +1,7 @@
+2005-12-19  David Shaw  <dshaw@jabberwocky.com>
+
+       * getkey.c (merge_selfsigs_main): All primary keys can certify.
+
 2005-12-18  David Shaw  <dshaw@jabberwocky.com>
 
        * gpg.c (main): Restore convert-sk-to-pk as programs rely on it.
index 48c881b..07efdc1 100644 (file)
@@ -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