[svn] gpgme - r1360 - in trunk: . doc src

[svn author wk]

Author: wk
Date: 2009-03-18 12:19:29 +0100 (Wed, 18 Mar 2009)
New Revision: 1360

Modified:
   trunk/NEWS
   trunk/doc/gpgme.texi
   trunk/src/ChangeLog
   trunk/src/engine-gpgsm.c
   trunk/src/gpgme.h.in
Log:
Add GPGME_KEYLIST_MODE_EPHEMERAL.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-03-13 14:19:55 UTC (rev 1359)
+++ trunk/src/ChangeLog	2009-03-18 11:19:29 UTC (rev 1360)
@@ -1,3 +1,8 @@
+2009-03-18  Werner Koch  <wk at g10code.com>
+
+	* gpgme.h.in (GPGME_KEYLIST_MODE_EPHEMERAL): New.
+	* engine-gpgsm.c (gpgsm_keylist): Send new option.
+
 2009-03-13  Werner Koch  <wk at g10code.com>
 
 	* gpgme-config.in: Make sure locale is set to C.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-03-13 14:19:55 UTC (rev 1359)
+++ trunk/NEWS	2009-03-18 11:19:29 UTC (rev 1360)
@@ -3,6 +3,7 @@
 
  * Interface changes relative to the 1.1.7 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ GPGME_KEYLIST_MODE_EPHEMERAL   NEW.
  GPGME_PROTOCOL_ASSUAN          NEW.
  gpgme_assuan_data_cb_t         NEW.
  gpgme_assuan_inquire_cb_t      NEW.

Modified: trunk/doc/gpgme.texi
===================================================================
--- trunk/doc/gpgme.texi	2009-03-13 14:19:55 UTC (rev 1359)
+++ trunk/doc/gpgme.texi	2009-03-18 11:19:29 UTC (rev 1360)
@@ -2208,6 +2208,10 @@
 keys.  This only works if @code{GPGME_KEYLIST_MODE_SIGS} is also
 enabled.
 
+ at item GPGME_KEYLIST_MODE_EPHEMERAL
+The @code{GPGME_KEYLIST_MODE_EPHEMERAL} symbol specifies that keys
+flagged as ephemeral are included in the listing.
+
 @item GPGME_KEYLIST_MODE_VALIDATE
 The @code{GPGME_KEYLIST_MODE_VALIDATE} symbol specifies that the
 backend should do key or certificate validation and not just get the

Modified: trunk/src/engine-gpgsm.c
===================================================================
--- trunk/src/engine-gpgsm.c	2009-03-13 14:19:55 UTC (rev 1359)
+++ trunk/src/engine-gpgsm.c	2009-03-18 11:19:29 UTC (rev 1360)
@@ -1,6 +1,6 @@
 /* engine-gpgsm.c - GpgSM engine.
    Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007 g10 Code GmbH
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009 g10 Code GmbH
  
    This file is part of GPGME.
 
@@ -1575,13 +1575,20 @@
 
   /* Always send key validation because RESET does not reset it.  */
 
-  /* Use the validation mode if required.  We don't check for an error
+  /* Use the validation mode if requested.  We don't check for an error
      yet because this is a pretty fresh gpgsm features. */
   gpgsm_assuan_simple_command (gpgsm->assuan_ctx, 
                                (mode & GPGME_KEYLIST_MODE_VALIDATE)?
                                "OPTION with-validation=1":
                                "OPTION with-validation=0" ,
                                NULL, NULL);
+  /* Include the ephemeral keys if requested.  We don't check for an error
+     yet because this is a pretty fresh gpgsm features. */
+  gpgsm_assuan_simple_command (gpgsm->assuan_ctx, 
+                               (mode & GPGME_KEYLIST_MODE_EPHEMERAL)?
+                               "OPTION with-ephemeral-keys=1":
+                               "OPTION with-ephemeral-keys=0" ,
+                               NULL, NULL);
 
 
   /* Length is "LISTSECRETKEYS " + p + '\0'.  */

Modified: trunk/src/gpgme.h.in
===================================================================
--- trunk/src/gpgme.h.in	2009-03-13 14:19:55 UTC (rev 1359)
+++ trunk/src/gpgme.h.in	2009-03-18 11:19:29 UTC (rev 1360)
@@ -312,6 +312,7 @@
 #define GPGME_KEYLIST_MODE_EXTERN		2
 #define GPGME_KEYLIST_MODE_SIGS			4
 #define GPGME_KEYLIST_MODE_SIG_NOTATIONS	8
+#define GPGME_KEYLIST_MODE_EPHEMERAL            128
 #define GPGME_KEYLIST_MODE_VALIDATE		256
 
 typedef unsigned int gpgme_keylist_mode_t;