From f154cdcaa4ac3bb4a53b3ed9a886cd23d4ef4ec4 Mon Sep 17 00:00:00 2001 From: vletoux Date: Sat, 18 Apr 2015 22:13:12 +0200 Subject: [PATCH] pkcs15-pin: sc_pkcs15_unblock_pin: avoid to ask the PUK twice --- src/libopensc/pkcs15-pin.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/libopensc/pkcs15-pin.c b/src/libopensc/pkcs15-pin.c index d73915a0..6f0239bd 100644 --- a/src/libopensc/pkcs15-pin.c +++ b/src/libopensc/pkcs15-pin.c @@ -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");