From 555cb7361551b36930fa5293c6b4f661875d1713 Mon Sep 17 00:00:00 2001 From: Zoltan Kelemen Date: Sat, 4 Jul 2020 11:57:06 +0200 Subject: [PATCH] Fix for using the correct info for PIN/PUK (before they were switched). --- src/libopensc/pkcs15-pin.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libopensc/pkcs15-pin.c b/src/libopensc/pkcs15-pin.c index fbd0792d..2710bba2 100644 --- a/src/libopensc/pkcs15-pin.c +++ b/src/libopensc/pkcs15-pin.c @@ -632,16 +632,16 @@ int sc_pkcs15_unblock_pin(struct sc_pkcs15_card *p15card, data.puk_reference = pukref; data.pin1.data = puk; data.pin1.len = puklen; - data.pin1.pad_char = auth_info->attrs.pin.pad_char; - data.pin1.min_length = auth_info->attrs.pin.min_length; - data.pin1.max_length = auth_info->attrs.pin.max_length; - data.pin1.pad_length = auth_info->attrs.pin.stored_length; + data.pin1.pad_char = puk_info->attrs.pin.pad_char; + data.pin1.min_length = puk_info->attrs.pin.min_length; + data.pin1.max_length = puk_info->attrs.pin.max_length; + data.pin1.pad_length = puk_info->attrs.pin.stored_length; data.pin2.data = newpin; data.pin2.len = newpinlen; - data.pin2.pad_char = puk_info->attrs.pin.pad_char; - data.pin2.min_length = puk_info->attrs.pin.min_length; - data.pin2.max_length = puk_info->attrs.pin.max_length; - data.pin2.pad_length = puk_info->attrs.pin.stored_length; + data.pin2.pad_char = auth_info->attrs.pin.pad_char; + data.pin2.min_length = auth_info->attrs.pin.min_length; + data.pin2.max_length = auth_info->attrs.pin.max_length; + data.pin2.pad_length = auth_info->attrs.pin.stored_length; if (auth_info->attrs.pin.flags & SC_PKCS15_PIN_FLAG_NEEDS_PADDING) data.flags |= SC_PIN_CMD_NEED_PADDING;