From 385bab141d5c59585cba2e338d0566907eaee459 Mon Sep 17 00:00:00 2001 From: AngusMcGyver <56880439+AngusMcGyver@users.noreply.github.com> Date: Fri, 7 Aug 2020 09:49:15 +0200 Subject: [PATCH] change for issue 46 see https://github.com/OpenSC/pam_pkcs11/issues/46 --- src/common/pkcs11_lib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/pkcs11_lib.c b/src/common/pkcs11_lib.c index f5a2b7bf..8c6fce77 100644 --- a/src/common/pkcs11_lib.c +++ b/src/common/pkcs11_lib.c @@ -522,7 +522,7 @@ find_slot_by_slotlabel(pkcs11_handle_t *h, const char *wanted_slot_label, slot = PK11_ReferenceSlot(module->slots[i]); slot_label = PK11_GetSlotName(slot); if (memcmp_pad_max((void *)slot_label, strlen(slot_label), - (void *)wanted_slot_label, strlen(wanted_slot_label), 64) == 0) { + (void *)wanted_slot_label, strlen(wanted_slot_label), strlen(wanted_slot_label)) == 0) { h->slot = slot; *slotID = PK11_GetSlotID(slot); return 0; @@ -1303,7 +1303,7 @@ find_slot_by_slotlabel(pkcs11_handle_t *h, const char *wanted_slot_label, for (idx = 0; idx < h->slot_count; idx++) { if (h->slots[idx].token_present && memcmp_pad_max(h->slots[idx].slotDescription, 64, - (void *)wanted_slot_label, len, 64) == 0) { + (void *)wanted_slot_label, len, len) == 0) { *slot_num = idx; return (0); } @@ -1347,7 +1347,7 @@ find_slot_by_slotlabel_and_tokenlabel(pkcs11_handle_t *h, const char *token_label = h->slots[i].label; if ((memcmp_pad_max((void *)slot_label, strlen(slot_label), - (void *)wanted_slot_label, strlen(wanted_slot_label), 64) == 0) && + (void *)wanted_slot_label, strlen(wanted_slot_label), strlen(wanted_slot_label)) == 0) && (memcmp_pad_max((void *)token_label, strlen(token_label), (void *)wanted_token_label, strlen(wanted_token_label), 33) == 0)) {