mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-20 01:02:44 +02:00
scd: Fix the use case of verify_chv2 by CHECKPIN.
* scd/app-openpgp.c (verify_chv2): Call verify_a_chv with chvno=1 when needed. -- Backport of master commit of:6e51f2044a
Fixes-commit:d2f1a0a791
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
a084924d07
commit
61aea64b3c
|
@ -2372,9 +2372,6 @@ verify_chv2 (app_t app,
|
|||
if (rc)
|
||||
return rc;
|
||||
app->did_chv2 = 1;
|
||||
}
|
||||
else
|
||||
rc = 0;
|
||||
|
||||
if (!app->did_chv1 && !app->force_chv1 && pinvalue)
|
||||
{
|
||||
|
@ -2393,6 +2390,13 @@ verify_chv2 (app_t app,
|
|||
else
|
||||
app->did_chv1 = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
rc = verify_a_chv (app, pincb, pincb_arg, 1, 0, &pinvalue, &pinlen);
|
||||
if (rc)
|
||||
return rc;
|
||||
}
|
||||
|
||||
xfree (pinvalue);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user