GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add GPGME_KEYLIST_MODE_EPHEMERAL.

Browse Source
This commit is contained in:
Werner Koch 2009-03-18 11:19:29 +00:00
parent f8b80c55f4
commit aceb60d4dd
5 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -3,6 +3,7 @@ Noteworthy changes in version 1.1.9
* Interface changes relative to the 1.1.7 release: * Interface changes relative to the 1.1.7 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
GPGME_KEYLIST_MODE_EPHEMERAL NEW.
GPGME_PROTOCOL_ASSUAN NEW. GPGME_PROTOCOL_ASSUAN NEW.
gpgme_assuan_data_cb_t NEW. gpgme_assuan_data_cb_t NEW.
gpgme_assuan_inquire_cb_t NEW. gpgme_assuan_inquire_cb_t NEW.

4
doc/gpgme.texi
View File

@ -2208,6 +2208,10 @@ signature notations on key signatures should be included in the listed
keys. This only works if @code{GPGME_KEYLIST_MODE_SIGS} is also keys. This only works if @code{GPGME_KEYLIST_MODE_SIGS} is also
enabled. enabled.
@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 @item GPGME_KEYLIST_MODE_VALIDATE
The @code{GPGME_KEYLIST_MODE_VALIDATE} symbol specifies that the The @code{GPGME_KEYLIST_MODE_VALIDATE} symbol specifies that the
backend should do key or certificate validation and not just get the backend should do key or certificate validation and not just get the

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2009-03-18 Werner Koch <wk@g10code.com>
* gpgme.h.in (GPGME_KEYLIST_MODE_EPHEMERAL): New.
* engine-gpgsm.c (gpgsm_keylist): Send new option.
2009-03-13 Werner Koch <wk@g10code.com> 2009-03-13 Werner Koch <wk@g10code.com>
* gpgme-config.in: Make sure locale is set to C. * gpgme-config.in: Make sure locale is set to C.

11
src/engine-gpgsm.c
View File

@ -1,6 +1,6 @@
/* engine-gpgsm.c - GpgSM engine. /* engine-gpgsm.c - GpgSM engine.
Copyright (C) 2000 Werner Koch (dd9jn) 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. This file is part of GPGME.
@ -1575,13 +1575,20 @@ gpgsm_keylist (void *engine, const char *pattern, int secret_only,
/* Always send key validation because RESET does not reset it. */ /* 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. */ yet because this is a pretty fresh gpgsm features. */
gpgsm_assuan_simple_command (gpgsm->assuan_ctx, gpgsm_assuan_simple_command (gpgsm->assuan_ctx,
(mode & GPGME_KEYLIST_MODE_VALIDATE)? (mode & GPGME_KEYLIST_MODE_VALIDATE)?
"OPTION with-validation=1": "OPTION with-validation=1":
"OPTION with-validation=0" , "OPTION with-validation=0" ,
NULL, NULL); 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'. */ /* Length is "LISTSECRETKEYS " + p + '\0'. */

1
src/gpgme.h.in
View File

@ -312,6 +312,7 @@ gpgme_protocol_t;
#define GPGME_KEYLIST_MODE_EXTERN 2 #define GPGME_KEYLIST_MODE_EXTERN 2
#define GPGME_KEYLIST_MODE_SIGS 4 #define GPGME_KEYLIST_MODE_SIGS 4
#define GPGME_KEYLIST_MODE_SIG_NOTATIONS 8 #define GPGME_KEYLIST_MODE_SIG_NOTATIONS 8
#define GPGME_KEYLIST_MODE_EPHEMERAL 128
#define GPGME_KEYLIST_MODE_VALIDATE 256 #define GPGME_KEYLIST_MODE_VALIDATE 256
typedef unsigned int gpgme_keylist_mode_t; typedef unsigned int gpgme_keylist_mode_t;