pkcs15-pin: sc_pkcs15_unblock_pin: avoid to ask the PUK twice

This commit is contained in:
vletoux 2015-04-18 22:13:12 +02:00 committed by Viktor Tarasov
parent 3e0356b170
commit f154cdcaa4
1 changed files with 3 additions and 8 deletions

View File

@ -500,15 +500,10 @@ int sc_pkcs15_unblock_pin(struct sc_pkcs15_card *p15card,
if (!puk_info) {
sc_log(ctx, "Unable to get puk object, using pin object instead!");
puk_info = auth_info;
/* make sure the puk is in valid range */
r = _validate_pin(p15card, puk_info, puklen);
LOG_TEST_RET(ctx, r, "PIN do not conforms PIN policy");
}
else {
r = sc_pkcs15_verify_pin(p15card, puk_obj, puk, puklen);
LOG_TEST_RET(ctx, r, "cannot verify PUK");
}
/* make sure the puk is in valid range */
r = _validate_pin(p15card, puk_info, puklen);
LOG_TEST_RET(ctx, r, "PIN do not conforms PIN policy");
r = sc_lock(card);
LOG_TEST_RET(ctx, r, "sc_lock() failed");