diff options
| -rw-r--r-- | scd/app-openpgp.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index 205d4e579..13fdd894f 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -2565,10 +2565,15 @@ verify_chv2 (app_t app, ctrl_t ctrl, if (app->did_chv2) return 0; /* We already verified CHV2. */ - rc = verify_a_chv (app, ctrl, pincb, pincb_arg, 2, 0, &pinvalue, &pinlen); - if (rc) - return rc; - app->did_chv2 = 1; + if (app->app_local->pk[1].key || app->app_local->pk[2].key) + { + rc = verify_a_chv (app, ctrl, pincb, pincb_arg, 2, 0, &pinvalue, &pinlen); + if (rc) + return rc; + app->did_chv2 = 1; + } + else + rc = 0; if (!app->did_chv1 && !app->force_chv1 && pinvalue) { |