diff options
| author | Andre Heinecke <[email protected]> | 2018-06-08 12:52:41 +0000 |
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2018-06-08 12:52:41 +0000 |
| commit | 54146d90dd5518c24c30e6d2ebeb7f47ed4eb29e (patch) | |
| tree | 9c99a06fc7b4cd301167cb5c43a04bc18d17411d | |
| parent | json: Add op_createkey (diff) | |
| download | gpgme-54146d90dd5518c24c30e6d2ebeb7f47ed4eb29e.tar.gz gpgme-54146d90dd5518c24c30e6d2ebeb7f47ed4eb29e.zip | |
json: Return fingerprint as createkey result
* src/gpgme-json.c (op_createkey): Return fingerprint of new key.
| -rw-r--r-- | src/gpgme-json.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/gpgme-json.c b/src/gpgme-json.c index 598c587d..ae878bd0 100644 --- a/src/gpgme-json.c +++ b/src/gpgme-json.c @@ -2778,7 +2778,7 @@ static const char hlp_createkey[] = "expires: Seconds since epoch to expiry as Number. 0 means no expiry.\n" "\n" "Response on success:\n" - "success: Boolean true.\n" + "fingerprint: The fingerprint of the created key.\n" "\n" "Note: This interface does not allow key generation if the userid\n" "of the new key already exists in the keyring.\n"; @@ -2792,6 +2792,7 @@ op_createkey (cjson_t request, cjson_t result) cjson_t j_tmp; const char *algo = "default"; const char *userid; + gpgme_genkey_result_t res; #ifdef GPG_AGENT_ALLOWS_KEYGEN_TRHOUGH_BROWSER /* GnuPG forbids keygen through the browser socket so for @@ -2838,7 +2839,14 @@ op_createkey (cjson_t request, cjson_t result) if ((err = gpgme_op_createkey (ctx, userid, algo, 0, expires, NULL, flags))) goto leave; - xjson_AddBoolToObject (result, "success", 1); + res = gpgme_op_genkey_result (ctx); + if (!res) + { + err = gpg_error (GPG_ERR_GENERAL); + goto leave; + } + + xjson_AddStringToObject0 (result, "fingerprint", res->fpr); leave: #ifdef GPG_AGENT_ALLOWS_KEYGEN_TRHOUGH_BROWSER |