diff options
| author | Werner Koch <[email protected]> | 2012-01-06 12:33:10 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2012-01-06 12:36:47 +0000 |
| commit | 372fb4fc0661014ccd9275c89e6da2208f87155f (patch) | |
| tree | c267b65ff61151163931f1d38a9b31fb6f45b538 /common/userids.c | |
| parent | Merge ccid_driver_improvement branch. (diff) | |
| download | gnupg-372fb4fc0661014ccd9275c89e6da2208f87155f.tar.gz gnupg-372fb4fc0661014ccd9275c89e6da2208f87155f.zip | |
gpg: Allow use of a standard space separated fingerprint.
* common/userids.c (classify_user_id): Check for space separated GPG
fingerprint.
Diffstat (limited to 'common/userids.c')
| -rw-r--r-- | common/userids.c | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/common/userids.c b/common/userids.c index 8c89c3284..2b134451c 100644 --- a/common/userids.c +++ b/common/userids.c @@ -308,6 +308,46 @@ classify_user_id (const char *name, KEYDB_SEARCH_DESC *desc, int openpgp_hack) if (i == 20) mode = KEYDB_SEARCH_MODE_FPR20; } + if (!mode) + { + /* Still not found. Now check for a space separated + OpenPGP v4 fingerprint like: + 8061 5870 F5BA D690 3336 86D0 F2AD 85AC 1E42 B367 + */ + hexlength = strspn (s, " 0123456789abcdefABCDEF"); + if (s[hexlength] && s[hexlength] != ' ') + hexlength = 0; /* Followed by non-space. */ + while (hexlength && s[hexlength-1] == ' ') + hexlength--; /* Trim trailing spaces. */ + if (hexlength == 50 && (!s[hexlength] || s[hexlength] == ' ')) + { + int i, c; + + for (i=0; i < 20; i++) + { + if (i && !(i % 2)) + { + if (*s != ' ') + break; + s++; + if (i == 10) + { + if (*s != ' ') + break; + s++; + } + } + + c = hextobyte(s); + if (c == -1) + break; + desc->u.fpr[i] = c; + s += 2; + } + if (i == 20) + mode = KEYDB_SEARCH_MODE_FPR20; + } + } if (!mode) /* Default to substring search. */ { desc->exact = 0; |