* engine-gpgsm.c (_gpgme_gpgsm_op_keylist): Implement secret only mode.

* keylist.c (keylist_colon_handler): Add support for the new "crs"
record type.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 1dc060cb4e75e081efe07b0cc9888e08c712d9ef..7f485c0599dc5c6b93018b7688f3081638de48f3 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-29  Werner Koch  <wk@gnupg.org>
+
+       * engine-gpgsm.c (_gpgme_gpgsm_op_keylist): Implement secret only mode.
+
+       * keylist.c (keylist_colon_handler): Add support for the new "crs"
+       record type.
+
 2002-01-22  Marcus Brinkmann  <marcus@g10code.de>
 
        * engine-gpgsm.c (_gpgme_gpgsm_release): Call assuan_disconnect,

diff --git a/trunk/gpgme/engine-gpgsm.c b/trunk/gpgme/engine-gpgsm.c
index b66ceaa6732af5bfc5c7e6f7ea1bd25d16cece1d..51e62fd91ee27fef172bf05bed3f202227806d5c 100644 (file)
--- a/trunk/gpgme/engine-gpgsm.c
+++ b/trunk/gpgme/engine-gpgsm.c
@@ -433,11 +433,19 @@ _gpgme_gpgsm_op_keylist (GpgsmObject gpgsm, const char *pattern,
   if (!pattern)
     pattern = "";
 
-  line = xtrymalloc (9 + strlen (pattern) + 1);        /* "LISTKEYS " + p + '\0'.  */
+  line = xtrymalloc (15 + strlen (pattern) + 1); /* "LISTSECRETKEYS "+p+'\0'.*/
   if (!line)
     return mk_error (Out_Of_Core);
-  strcpy (line, "LISTKEYS ");
-  strcpy (&line[9], pattern);
+  if (secret_only)
+    {
+      strcpy (line, "LISTSECRETKEYS ");
+      strcpy (&line[15], pattern);
+    }
+  else
+    {
+      strcpy (line, "LISTKEYS ");
+      strcpy (&line[9], pattern);
+    }
 
   _gpgme_io_close (gpgsm->input_fd);
   _gpgme_io_close (gpgsm->output_fd);

diff --git a/trunk/gpgme/keylist.c b/trunk/gpgme/keylist.c
index b9907a47761e697ad311bb563b6e8d6bb5bd4520..133da5ddba06fafd8f53c7db6c55d77f2499b4da 100644 (file)
--- a/trunk/gpgme/keylist.c
+++ b/trunk/gpgme/keylist.c
@@ -146,7 +146,8 @@ keylist_colon_handler ( GpgmeCtx ctx, char *line )
     char *p, *pend;
     int field = 0;
     enum {
-      RT_NONE, RT_SIG, RT_UID, RT_SUB, RT_PUB, RT_FPR, RT_SSB, RT_SEC, RT_CRT
+      RT_NONE, RT_SIG, RT_UID, RT_SUB, RT_PUB, RT_FPR, RT_SSB, RT_SEC,
+      RT_CRT, RT_CRS
     } rectype = RT_NONE;
     GpgmeKey key = ctx->tmp_key;
     int i;
@@ -223,13 +224,26 @@ keylist_colon_handler ( GpgmeCtx ctx, char *line )
                 assert ( !ctx->tmp_key );
                 ctx->tmp_key = key;
             }
+            else if ( !strcmp (p, "crs") ) {
+                /* start a new certificate */
+                if ( _gpgme_key_new_secret ( &key ) ) {
+                    ctx->out_of_core=1; /* the only kind of error we can get*/
+                    return;
+                }
+                key->x509 = 1;
+                rectype = RT_CRS;
+                finish_key ( ctx );
+                assert ( !ctx->tmp_key );
+                ctx->tmp_key = key;
+            }
             else if ( !strcmp ( p, "fpr" ) && key ) 
                 rectype = RT_FPR;
             else 
                 rectype = RT_NONE;
             
         }
-        else if ( rectype == RT_PUB || rectype == RT_SEC || rectype == RT_CRT)
+        else if ( rectype == RT_PUB || rectype == RT_SEC
+                  || rectype == RT_CRT || rectype == RT_CRS)
           {
             switch (field) {
               case 2: /* trust info */