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/keydb.h | |
| 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/keydb.h')
| -rw-r--r-- | sm/keydb.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/sm/keydb.h b/sm/keydb.h index bdf4a2de7..623462553 100644 --- a/sm/keydb.h +++ b/sm/keydb.h @@ -31,7 +31,8 @@ typedef struct keydb_handle *KEYDB_HANDLE; /*-- keydb.c --*/ -gpg_error_t keydb_add_resource (const char *url, int force, int *auto_created); +gpg_error_t keydb_add_resource (ctrl_t ctrl, const char *url, + int force, int *auto_created); KEYDB_HANDLE keydb_new (void); void keydb_release (KEYDB_HANDLE hd); int keydb_set_ephemeral (KEYDB_HANDLE hd, int yes); @@ -54,18 +55,20 @@ int keydb_locate_writable (KEYDB_HANDLE hd, const char *reserved); void keydb_rebuild_caches (void); gpg_error_t keydb_search_reset (KEYDB_HANDLE hd); -int keydb_search (KEYDB_HANDLE hd, KEYDB_SEARCH_DESC *desc, size_t ndesc); -int keydb_search_first (KEYDB_HANDLE hd); -int keydb_search_next (KEYDB_HANDLE hd); -int keydb_search_kid (KEYDB_HANDLE hd, u32 *kid); -int keydb_search_fpr (KEYDB_HANDLE hd, const byte *fpr); -int keydb_search_issuer (KEYDB_HANDLE hd, const char *issuer); -int keydb_search_issuer_sn (KEYDB_HANDLE hd, +int keydb_search (ctrl_t ctrl, KEYDB_HANDLE hd, + KEYDB_SEARCH_DESC *desc, size_t ndesc); +int keydb_search_first (ctrl_t ctrl, KEYDB_HANDLE hd); +int keydb_search_next (ctrl_t ctrl, KEYDB_HANDLE hd); +int keydb_search_kid (ctrl_t ctrl, KEYDB_HANDLE hd, u32 *kid); +int keydb_search_fpr (ctrl_t ctrl, KEYDB_HANDLE hd, const byte *fpr); +int keydb_search_issuer (ctrl_t ctrl, KEYDB_HANDLE hd, const char *issuer); +int keydb_search_issuer_sn (ctrl_t ctrl, KEYDB_HANDLE hd, const char *issuer, const unsigned char *serial); -int keydb_search_subject (KEYDB_HANDLE hd, const char *issuer); +int keydb_search_subject (ctrl_t ctrl, KEYDB_HANDLE hd, const char *issuer); -int keydb_store_cert (ksba_cert_t cert, int ephemeral, int *existed); -gpg_error_t keydb_set_cert_flags (ksba_cert_t cert, int ephemeral, +int keydb_store_cert (ctrl_t ctrl, ksba_cert_t cert, int ephemeral, + int *existed); +gpg_error_t keydb_set_cert_flags (ctrl_t ctrl, ksba_cert_t cert, int ephemeral, int which, int idx, unsigned int mask, unsigned int value); |