[svn] GnuPG - r3970 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2005-12-19 23:10:20 +0100 (Mon, 19 Dec 2005)
New Revision: 3970

Modified:
   trunk/g10/ChangeLog
   trunk/g10/getkey.c
Log:
* getkey.c (merge_selfsigs_main): All primary keys can certify.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2005-12-19 19:39:32 UTC (rev 3969)
+++ trunk/g10/ChangeLog	2005-12-19 22:10:20 UTC (rev 3970)
@@ -1,3 +1,7 @@
+2005-12-19  David Shaw  <dshaw at jabberwocky.com>
+
+	* getkey.c (merge_selfsigs_main): All primary keys can certify.
+
 2005-12-18  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpg.c (main): Restore convert-sk-to-pk as programs rely on it.

Modified: trunk/g10/getkey.c
===================================================================
--- trunk/g10/getkey.c	2005-12-19 19:39:32 UTC (rev 3969)
+++ trunk/g10/getkey.c	2005-12-19 22:10:20 UTC (rev 3970)
@@ -1812,8 +1812,10 @@
         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 
          * Note, that this may be a different one from the above because