diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/getkey.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 6110066c3..293e2973a 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2006-10-20 Werner Koch <[email protected]> + + * getkey.c (classify_user_id): Reserve '&' for search by keygrip. + 2006-10-19 Werner Koch <[email protected]> * keygen.c (get_parameter_algo): Add special case for ELG_E which diff --git a/g10/getkey.c b/g10/getkey.c index 002197071..d526398c6 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -578,6 +578,7 @@ seckey_available( u32 *keyid ) * Words are delimited by white space or "()<>[]{}.@-+_,;/&!" * (note that you can't search for these characters). Compare * is not case sensitive. + * - If the userid starts with a '&' a 40 hex digits keygrip is expected. */ int @@ -644,7 +645,7 @@ classify_user_id( const char *name, KEYDB_SEARCH_DESC *desc ) #endif case '#': /* local user id */ - return 0; /* This is now obsolete and van't not be used anymore*/ + return 0; /* This is now obsolete and can't not be used anymore*/ case ':': /*Unified fingerprint */ { @@ -669,6 +670,9 @@ classify_user_id( const char *name, KEYDB_SEARCH_DESC *desc ) } break; + case '&': /* keygrip */ + return 0; /* Not yet implememted. */ + default: if (s[0] == '0' && s[1] == 'x') { hexprefix = 1; |