[svn] GnuPG - r3968 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2005-12-19 02:51:31 +0100 (Mon, 19 Dec 2005)
New Revision: 3968

Modified:
   trunk/g10/ChangeLog
   trunk/g10/gpg.c
   trunk/g10/keyid.c
Log:
* gpg.c (main): Restore convert-sk-to-pk as programs rely on it.

* keyid.c (usagestr_from_pk): Remove special PUBKEY_USAGE_CERT flag.
It's no longer needed.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2005-12-16 15:52:48 UTC (rev 3967)
+++ trunk/g10/ChangeLog	2005-12-19 01:51:31 UTC (rev 3968)
@@ -1,3 +1,10 @@
+2005-12-18  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpg.c (main): Restore convert-sk-to-pk as programs rely on it.
+
+	* keyid.c (usagestr_from_pk): Remove special PUBKEY_USAGE_CERT
+	flag.  It's no longer needed.
+
 2005-12-14  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpg.c (main): Don't default to import-options convert-sk-to-pk.

Modified: trunk/g10/gpg.c
===================================================================
--- trunk/g10/gpg.c	2005-12-16 15:52:48 UTC (rev 3967)
+++ trunk/g10/gpg.c	2005-12-19 01:51:31 UTC (rev 3968)
@@ -1693,6 +1693,7 @@
     opt.pgp2_workarounds = 1;
     opt.force_v3_sigs = 1;
     opt.escape_from = 1;
+    opt.import_options=IMPORT_SK2PK;
     opt.export_options=EXPORT_ATTRIBUTES;
     opt.keyserver_options.import_options=IMPORT_REPAIR_PKS_SUBKEY_BUG;
     opt.keyserver_options.export_options=EXPORT_ATTRIBUTES;

Modified: trunk/g10/keyid.c
===================================================================
--- trunk/g10/keyid.c	2005-12-16 15:52:48 UTC (rev 3967)
+++ trunk/g10/keyid.c	2005-12-19 01:51:31 UTC (rev 3968)
@@ -543,13 +543,9 @@
   static char buffer[10];
   int i = 0;
   unsigned int use = pk->pubkey_usage;
-    
+
   if ( use & PUBKEY_USAGE_SIG )
-    {
-      if (pk->is_primary)
-        use|=PUBKEY_USAGE_CERT;
-      buffer[i++] = 'S';
-    }
+    buffer[i++] = 'S';
 
   if ( use & PUBKEY_USAGE_CERT )
     buffer[i++] = 'C';