aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2006-12-03 05:57:57 +0000
committerDavid Shaw <[email protected]>2006-12-03 05:57:57 +0000
commit928db7d34bb839fee2fa5b48adeaca71afd3ef38 (patch)
treed57b354a784532fe565a7c10bbbc8afcc42fa089
parent* NEWS: Note the CVE for bug#728, --s2k-count, --passphrase-repeat, (diff)
downloadgnupg-928db7d34bb839fee2fa5b48adeaca71afd3ef38.tar.gz
gnupg-928db7d34bb839fee2fa5b48adeaca71afd3ef38.zip
* gpgkeys_hkp.c (search_key): HKP keyservers like the 0x to be present
when searching by keyID.
-rw-r--r--keyserver/ChangeLog5
-rw-r--r--keyserver/gpgkeys_hkp.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 445319d0c..ef2004a8a 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-03 David Shaw <[email protected]>
+
+ * gpgkeys_hkp.c (search_key): HKP keyservers like the 0x to be
+ present when searching by keyID.
+
2006-11-05 David Shaw <[email protected]>
* gpgkeys_hkp.c (curl_mrindex_writer): Revert previous change.
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index 19c96bae6..e393b856c 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -426,6 +426,12 @@ search_key(const char *searchkey)
strcat(request,"11371");
strcat(request,opt->path);
append_path(request,"/pks/lookup?op=index&options=mr&search=");
+
+ /* HKP keyservers like the 0x to be present when searching by
+ keyid */
+ if(search_type==KS_SEARCH_KEYID_SHORT || search_type==KS_SEARCH_KEYID_LONG)
+ strcat(request,"0x");
+
strcat(request,searchkey_encoded);
if(search_type!=KS_SEARCH_SUBSTR)