diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2019-07-19 06:19:48 +0200 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2019-07-19 06:23:59 +0200 |
| commit | 57565d5f975d3c00853bb49678d63ee8b896b741 (patch) | |
| tree | 4d336368156ea9e3320660441f98ac1a1fe870bb /scd | |
| parent | card: Support disabling KDF functionality. (diff) | |
| download | gnupg2-57565d5f975d3c00853bb49678d63ee8b896b741.tar.xz gnupg2-57565d5f975d3c00853bb49678d63ee8b896b741.zip | |
scd: Support "[CHV3]" attribute for keyid string.
* scd/app-openpgp.c (check_keyidstr0: Relax the check.
Fixes-commit: b0f0791e4ade845b2a0e2a94dbda4f3bf1ceb039
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/app-openpgp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index 767f29d26..f72070448 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -4296,7 +4296,8 @@ check_against_given_fingerprint (app_t app, const char *fpr, int key) KEYIDSTR is either: (1) Serial number (2) Serial number "/" fingerprint - (3) keygrip + (3) Serial number "[CHV3]" + (4) keygrip When KEYNO is 0 and KEYIDSTR is for a keygrip, the keygrip should be to be compared is the first one (keygrip for signing). @@ -4335,8 +4336,6 @@ check_keyidstr (app_t app, const char *keyidstr, int keyno) ; /* no fingerprint given: we allow this for now. */ else if (*s == '/') fpr = s + 1; - else - return gpg_error (GPG_ERR_INV_ID); for (s=keyidstr, n=0; n < 16; s += 2, n++) tmp_sn[n] = xtoi_2 (s); |