security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-10 23:49:50 +02:00
Code Activity

common: Add constant KEYGRIP_LEN.

Browse Source 
* common/util.h (KEYGRIP_LEN): New.
* g10/call-agent.c (agent_probe_any_secret_key): Use that constant.
* g10/keyid.c (keygrip_from_pk): Ditto.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-09-27 09:33:14 +02:00
parent 6aa4478c78
commit 76c80021d4
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/util.h
View File

@ -59,6 +59,11 @@
/* Hash function used with libksba. */ /* Hash function used with libksba. */
#define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write) #define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write)
/* The length of the keygrip. This is a SHA-1 hash of the key
* parameters as generated by gcry_pk_get_keygrip. */
#define KEYGRIP_LEN 20
/* Get all the stuff from jnlib. */ /* Get all the stuff from jnlib. */
#include "../common/logging.h" #include "../common/logging.h"
#include "../common/argparse.h" #include "../common/argparse.h"

2
g10/call-agent.c
View File

@ -1474,7 +1474,7 @@ agent_probe_any_secret_key (ctrl_t ctrl, kbnode_t keyblock)
char *p; char *p;
kbnode_t kbctx, node; kbnode_t kbctx, node;
int nkeys; int nkeys;
unsigned char grip[20]; unsigned char grip[KEYGRIP_LEN];
err = start_agent (ctrl, 0); err = start_agent (ctrl, 0);
if (err) if (err)

6
g10/keyid.c
View File

@ -959,18 +959,18 @@ gpg_error_t
hexkeygrip_from_pk (PKT_public_key *pk, char **r_grip) hexkeygrip_from_pk (PKT_public_key *pk, char **r_grip)
{ {
gpg_error_t err; gpg_error_t err;
unsigned char grip[20]; unsigned char grip[KEYGRIP_LEN];
*r_grip = NULL; *r_grip = NULL;
err = keygrip_from_pk (pk, grip); err = keygrip_from_pk (pk, grip);
if (!err) if (!err)
{ {
char * buf = xtrymalloc (20*2+1); char * buf = xtrymalloc (KEYGRIP_LEN * 2 + 1);
if (!buf) if (!buf)
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
else else
{ {
bin2hex (grip, 20, buf); bin2hex (grip, KEYGRIP_LEN, buf);
*r_grip = buf; *r_grip = buf;
} }
} }