Fix bug 998.
authorWerner Koch <wk@gnupg.org>
Mon, 9 Feb 2009 11:14:42 +0000 (11:14 +0000)
committerWerner Koch <wk@gnupg.org>
Mon, 9 Feb 2009 11:14:42 +0000 (11:14 +0000)
g10/ChangeLog
g10/keylist.c

index c3f9deb..f3ef355 100644 (file)
@@ -1,3 +1,8 @@
+2009-02-09  Werner Koch  <wk@g10code.com>
+
+       * keylist.c (print_capabilities): Take care of cert-only keys.
+       Fixes bug#998.
+
 2009-02-03  David Shaw  <dshaw@jabberwocky.com>
 
        * keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as
index fa730bf..7f72426 100644 (file)
@@ -547,7 +547,8 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
   if(pk || (sk && sk->protect.s2k.mode!=1001))
     {
       unsigned int use = pk? pk->pubkey_usage : sk->pubkey_usage;
-    
+          int c_printed = 0;
+
       if ( use & PUBKEY_USAGE_ENC )
         putchar ('e');
 
@@ -555,9 +556,19 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
        {
          putchar ('s');
          if( pk? pk->is_primary : sk->is_primary )
-           putchar ('c');
+            {
+              putchar ('c');
+              /* The PUBKEY_USAGE_CERT flag was introduced later and
+                 we used to always print 'c' for a primary key.  To
+                 avoid any regression here we better track whether we
+                 printed 'c' already.  */
+              c_printed = 1;
+            }
        }
 
+      if ( (use & PUBKEY_USAGE_CERT) && !c_printed )
+        putchar ('c');
+
       if ( (use & PUBKEY_USAGE_AUTH) )
         putchar ('a');
     }
@@ -583,6 +594,8 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
                        if(pk->is_primary)
                          cert = 1;
                      }
+                    if ( pk->pubkey_usage & PUBKEY_USAGE_CERT )
+                      cert = 1;
                     if ( (pk->pubkey_usage & PUBKEY_USAGE_AUTH) )
                       auth = 1;
                 }
@@ -600,6 +613,8 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
                        if(sk->is_primary)
                          cert = 1;
                      }
+                    if ( (sk->pubkey_usage & PUBKEY_USAGE_CERT) )
+                        cert = 1;
                     if ( (sk->pubkey_usage & PUBKEY_USAGE_AUTH) )
                         auth = 1;
                 }