security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

gpg,sm: Add STATUS_ERROR keydb_search and keydb_add-resource.

Browse source 
* 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 <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-11-10 17:01:19 +01:00
parent c8044c6e33
commit 5d13581f47
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
17 changed files with 163 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sm/gpgsm.c
View file

@ -1616,7 +1616,7 @@ main ( int argc, char **argv)
{
int created;
keydb_add_resource ("pubring.kbx", 0, &created);
keydb_add_resource (&ctrl, "pubring.kbx", 0, &created);
if (created && !no_common_certs_import)
{
/* Import the standard certificates for a new default keybox. */
@ -1634,7 +1634,7 @@ main ( int argc, char **argv)
}
}
for (sl = nrings; sl; sl = sl->next)
keydb_add_resource (sl->d, 0, NULL);
keydb_add_resource (&ctrl, sl->d, 0, NULL);
FREE_STRLIST(nrings);
@ -1996,7 +1996,7 @@ main ( int argc, char **argv)
ksba_cert_t cert = NULL;
char *grip = NULL;
rc = gpgsm_find_cert (*argv, NULL, &cert);
rc = gpgsm_find_cert (&ctrl, *argv, NULL, &cert);
if (rc)
;
else if (!(grip = gpgsm_get_keygrip_hexstring (cert)))