diff options
| author | Werner Koch <[email protected]> | 2016-11-10 16:01:19 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-11-10 16:07:28 +0000 |
| commit | 5d13581f4737c18430f6572dd4ef486d1ad80dd1 (patch) | |
| tree | d90f1618778b7534bb195aa7c09060cb631484dd /sm/export.c | |
| parent | sm: Remove unused arg SECRET from keydb functions. (diff) | |
| download | gnupg-5d13581f4737c18430f6572dd4ef486d1ad80dd1.tar.gz gnupg-5d13581f4737c18430f6572dd4ef486d1ad80dd1.zip | |
gpg,sm: Add STATUS_ERROR keydb_search and keydb_add-resource.
* g10/keydb.c (keydb_add_resource): Make ANY_REGISTERED
file-global. Write a STATUS_ERROR.
(maybe_create_keyring_or_box): Check for non-accessible but existant
file.
(keydb_search): Write a STATUS_ERROR if no keyring has been registered
but continue to return NOT_FOUND.
* sm/keydb.c (keydb_add_resource): Rename ANY_PUBLIC to ANY_REGISTERED
and make file-global. Write a STATUS_ERROR.
(keydb_search): Write a STATUS_ERROR if no keyring has been registered
but continue to return NOT_FOUND. Also add new arg CTRL and change
all callers to pass it down.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'sm/export.c')
| -rw-r--r-- | sm/export.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sm/export.c b/sm/export.c index 4fedfa209..a32414edb 100644 --- a/sm/export.c +++ b/sm/export.c @@ -206,7 +206,7 @@ gpgsm_export (ctrl_t ctrl, strlist_t names, estream_t stream) keydb_set_ephemeral (hd, 1); } - while (!(rc = keydb_search (hd, desc, ndesc))) + while (!(rc = keydb_search (ctrl, hd, desc, ndesc))) { unsigned char fpr[20]; int exists; @@ -362,7 +362,7 @@ gpgsm_p12_export (ctrl_t ctrl, const char *name, estream_t stream, int rawmode) } /* Lookup the certificate and make sure that it is unique. */ - err = keydb_search (hd, desc, 1); + err = keydb_search (ctrl, hd, desc, 1); if (!err) { err = keydb_get_cert (hd, &cert); @@ -373,7 +373,7 @@ gpgsm_p12_export (ctrl_t ctrl, const char *name, estream_t stream, int rawmode) } next_ambiguous: - err = keydb_search (hd, desc, 1); + err = keydb_search (ctrl, hd, desc, 1); if (!err) { ksba_cert_t cert2 = NULL; |