james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed bug #39

Browse Source 
C_Login fails with CKR_PIN_INCORRECT when pin and pinLen are valid but pin is not null terminated
This commit is contained in:
Mikhail Denisenko
2015-12-01 16:24:38 -05:00
parent e949618ec2
commit 1a533ea0dc
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ykcs11/token_vendors.c
+12 -1
View File
@@ -12,12 +12,23 @@ static CK_RV COMMON_token_login(ykpiv_state *state, CK_USER_TYPE user, CK_UTF8CH
int tries = 0; // TODO: this is effectively disregarded, should we add a better value in ykpiv_verify?
unsigned char key[24];
size_t key_len = sizeof(key);
unsigned char *term_pin;
if (user == CKU_USER) {
if (ykpiv_verify(state, (char *)pin, &tries) != YKPIV_OK) {
// add null termination for the pin
term_pin = malloc(pin_len + 1);
if (term_pin == NULL) {
return CKR_HOST_MEMORY;
}
memcpy(term_pin, pin, pin_len);
term_pin[pin_len] = 0;
if (ykpiv_verify(state, (char *)term_pin, &tries) != YKPIV_OK) {
free(term_pin);
DBG("Failed to login");
return CKR_PIN_INCORRECT;
}
free(term_pin);
}
else if (user == CKU_SO) {
if(ykpiv_hex_decode((char *)pin, pin_len, key, &key_len) != YKPIV_OK) {