* gpg.c (main): Restore convert-sk-to-pk as programs rely on it.
authorDavid Shaw <dshaw@jabberwocky.com>
Mon, 19 Dec 2005 01:51:31 +0000 (01:51 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Mon, 19 Dec 2005 01:51:31 +0000 (01:51 +0000)
* keyid.c (usagestr_from_pk): Remove special PUBKEY_USAGE_CERT flag.
It's no longer needed.

g10/ChangeLog
g10/gpg.c
g10/keyid.c

index d0f1ffb..62d27b7 100644 (file)
@@ -1,3 +1,10 @@
+2005-12-18  David Shaw  <dshaw@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@jabberwocky.com>
 
        * gpg.c (main): Don't default to import-options convert-sk-to-pk.
index 6d211de..81bf454 100644 (file)
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1693,6 +1693,7 @@ main (int argc, char **argv )
     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;
index 7c2bd3b..86a204f 100644 (file)
@@ -543,13 +543,9 @@ usagestr_from_pk( PKT_public_key *pk )
   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';