security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Adapt HKP fix for fingerprint/long keyid retrievals for dirmngr 

* dirmngr/ks-engine-hkp.c (ks_hkp_get): Use the longest valid keyid form
This commit is contained in:
David Shaw 2012-01-10 10:23:54 -05:00
parent 957fe72846
commit 3f59561cee
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dirmngr/ks-engine-hkp.c
View File

@ -1,5 +1,5 @@
/* ks-engine-hkp.c - HKP keyserver engine /* ks-engine-hkp.c - HKP keyserver engine
* Copyright (C) 2011 Free Software Foundation, Inc. * Copyright (C) 2011, 2012 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -761,7 +761,7 @@ ks_hkp_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec, estream_t *r_fp)
{ {
gpg_error_t err; gpg_error_t err;
KEYDB_SEARCH_DESC desc; KEYDB_SEARCH_DESC desc;
char kidbuf[8+1]; char kidbuf[40+1];
char *hostport = NULL; char *hostport = NULL;
char *request = NULL; char *request = NULL;
estream_t fp = NULL; estream_t fp = NULL;
@ -778,18 +778,20 @@ ks_hkp_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec, estream_t *r_fp)
switch (desc.mode) switch (desc.mode)
{ {
case KEYDB_SEARCH_MODE_SHORT_KID: case KEYDB_SEARCH_MODE_SHORT_KID:
case KEYDB_SEARCH_MODE_LONG_KID:
snprintf (kidbuf, sizeof kidbuf, "%08lX", (ulong)desc.u.kid[1]); snprintf (kidbuf, sizeof kidbuf, "%08lX", (ulong)desc.u.kid[1]);
break; break;
case KEYDB_SEARCH_MODE_LONG_KID:
snprintf (kidbuf, sizeof kidbuf, "%08lX%08lX",
(ulong)desc.u.kid[0], (ulong)desc.u.kid[1]);
break;
case KEYDB_SEARCH_MODE_FPR20: case KEYDB_SEARCH_MODE_FPR20:
case KEYDB_SEARCH_MODE_FPR: case KEYDB_SEARCH_MODE_FPR:
/* This is a v4 fingerprint. Take the last 8 hex digits from /* This is a v4 fingerprint. */
the fingerprint which is the expected short keyid. */ bin2hex (desc.u.fpr, 20, kidbuf);
bin2hex (desc.u.fpr+16, 4, kidbuf);
break; break;
case KEYDB_SEARCH_MODE_FPR16: case KEYDB_SEARCH_MODE_FPR16:
log_error ("HKP keyserver do not support v3 fingerprints\n"); log_error ("HKP keyservers do not support v3 fingerprints\n");
default: default:
return gpg_error (GPG_ERR_INV_USER_ID); return gpg_error (GPG_ERR_INV_USER_ID);
} }