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

json: Add with-secret without secret only

Browse Source 
* src/gpgme-json.c (op_keylist, hlp_keylist): Add "with-secret"
as a flag to do a public keylist with secret information.
This commit is contained in:
Andre Heinecke 2018-07-09 11:36:28 +02:00
parent c287f09ac0
commit 40471ec12f
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gpgme-json.c
View File

@ -2117,7 +2117,8 @@ static const char hlp_keylist[] =
"protocol: Either \"openpgp\" (default) or \"cms\".\n" "protocol: Either \"openpgp\" (default) or \"cms\".\n"
"\n" "\n"
"Optional boolean flags (default is false):\n" "Optional boolean flags (default is false):\n"
"secret: List secret keys.\n" "secret: List only secret keys.\n"
"with-secret: Add KEYLIST_MODE_WITH_SECRET.\n"
"extern: Add KEYLIST_MODE_EXTERN.\n" "extern: Add KEYLIST_MODE_EXTERN.\n"
"local: Add KEYLIST_MODE_LOCAL. (default mode).\n" "local: Add KEYLIST_MODE_LOCAL. (default mode).\n"
"sigs: Add KEYLIST_MODE_SIGS.\n" "sigs: Add KEYLIST_MODE_SIGS.\n"
@ -2242,6 +2243,7 @@ op_keylist (cjson_t request, cjson_t result)
gpgme_protocol_t protocol; gpgme_protocol_t protocol;
char **patterns = NULL; char **patterns = NULL;
int abool; int abool;
int secret_only = 0;
gpgme_keylist_mode_t mode = 0; gpgme_keylist_mode_t mode = 0;
gpgme_key_t key = NULL; gpgme_key_t key = NULL;
cjson_t keyarray = xjson_CreateArray (); cjson_t keyarray = xjson_CreateArray ();
@ -2253,9 +2255,15 @@ op_keylist (cjson_t request, cjson_t result)
/* Handle the various keylist mode bools. */ /* Handle the various keylist mode bools. */
if ((err = get_boolean_flag (request, "secret", 0, &abool))) if ((err = get_boolean_flag (request, "secret", 0, &abool)))
goto leave; goto leave;
if (abool)
{
mode |= GPGME_KEYLIST_MODE_WITH_SECRET;
secret_only = 1;
}
if ((err = get_boolean_flag (request, "with-secret", 0, &abool)))
goto leave;
if (abool) if (abool)
mode |= GPGME_KEYLIST_MODE_WITH_SECRET; mode |= GPGME_KEYLIST_MODE_WITH_SECRET;
if ((err = get_boolean_flag (request, "extern", 0, &abool))) if ((err = get_boolean_flag (request, "extern", 0, &abool)))
goto leave; goto leave;
if (abool) if (abool)
@ -2309,8 +2317,7 @@ op_keylist (cjson_t request, cjson_t result)
gpgme_set_keylist_mode (ctx, mode); gpgme_set_keylist_mode (ctx, mode);
err = gpgme_op_keylist_ext_start (ctx, (const char **) patterns, err = gpgme_op_keylist_ext_start (ctx, (const char **) patterns,
(mode & GPGME_KEYLIST_MODE_WITH_SECRET), secret_only, 0);
0);
if (err) if (err)
{ {
gpg_error_object (result, err, "Error listing keys: %s", gpg_error_object (result, err, "Error listing keys: %s",