security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-09-20 14:51:42 +02:00
Code Activity

* ksutil.c (classify_ks_search): Try and recognize a key ID even

Browse Source 
without the 0x prefix.  This isn't exact (it's possible that a user ID
string happens to be 8 or 16 digits of hex), but it's extremely
unlikely.  Plus GPG itself makes the same assumption.
This commit is contained in:
David Shaw 2006-12-04 01:20:55 +00:00
parent cfa0b50dc0
commit ede66f6fb5
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keyserver/ChangeLog
View File

@ -1,5 +1,10 @@
2006-12-03 David Shaw <dshaw@jabberwocky.com> 2006-12-03 David Shaw <dshaw@jabberwocky.com>
* ksutil.c (classify_ks_search): Try and recognize a key ID even
without the 0x prefix. This isn't exact (it's possible that a
user ID string happens to be 8 or 16 digits of hex), but it's
extremely unlikely. Plus GPG itself makes the same assumption.
* gpgkeys_hkp.c (search_key): HKP keyservers like the 0x to be * gpgkeys_hkp.c (search_key): HKP keyservers like the 0x to be
present when searching by keyID. present when searching by keyID.

21
keyserver/ksutil.c
View File

@ -350,6 +350,10 @@ print_nocr(FILE *stream,const char *str)
} }
} }
#define HEX "abcdefABCDEF1234567890"
/* Return what sort of item is being searched for. *search is
permuted to remove any special indicators of a search type. */
enum ks_search_type enum ks_search_type
classify_ks_search(const char **search) classify_ks_search(const char **search)
{ {
@ -370,14 +374,12 @@ classify_ks_search(const char **search)
case '0': case '0':
if((*search)[1]=='x') if((*search)[1]=='x')
{ {
if(strlen(*search)==10 if(strlen(*search)==10 && strspn(*search,HEX"x")==10)
&& strspn(*search,"abcdefABCDEF1234567890x")==10)
{ {
(*search)+=2; (*search)+=2;
return KS_SEARCH_KEYID_SHORT; return KS_SEARCH_KEYID_SHORT;
} }
else if(strlen(*search)==18 else if(strlen(*search)==18 && strspn(*search,HEX"x")==18)
&& strspn(*search,"abcdefABCDEF1234567890x")==18)
{ {
(*search)+=2; (*search)+=2;
return KS_SEARCH_KEYID_LONG; return KS_SEARCH_KEYID_LONG;
@ -385,6 +387,17 @@ classify_ks_search(const char **search)
} }
/* fall through */ /* fall through */
default: default:
/* Try and recognize a key ID. This isn't exact (it's possible
that a user ID string happens to be 8 or 16 digits of hex),
but it's extremely unlikely. Plus the main GPG program does
this also, and consistency is good. */
if(strlen(*search)==8 && strspn(*search,HEX)==8)
return KS_SEARCH_KEYID_SHORT;
else if(strlen(*search)==16 && strspn(*search,HEX)==16)
return KS_SEARCH_KEYID_LONG;
/* Last resort */
return KS_SEARCH_SUBSTR; return KS_SEARCH_SUBSTR;
} }
} }