oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Merge pull request #136 from HenryJacques/pkinit_improvements

Browse Source 
PK-INIT improvements
This commit is contained in:
Love Hörnquist Åstrand
2015-07-24 12:04:47 +02:00
parent be63a2914a 5a4e9d1539
commit db4175c225
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/hx509/hx509_err.et
View File

@@ -100,4 +100,10 @@ error_code OPEN_SESSION, "Failed to open session to slot"
error_code LOGIN, "Failed to login to slot" error_code LOGIN, "Failed to login to slot"
error_code LOAD, "Failed to load PKCS module" error_code LOAD, "Failed to load PKCS module"
# pkinit related errors
error_code PIN_INCORRECT, "Incorrect User PIN"
error_code PIN_LOCKED, "User PIN locked"
error_code PIN_NOT_INITIALIZED, "User PIN not initialized"
error_code PIN_EXPIRED, "User PIN expired"
end end

23
lib/hx509/ks_p11.c
View File

@@ -343,7 +343,7 @@ p11_init_slot(hx509_context context,
if (ret) { if (ret) {
hx509_set_error_string(context, 0, HX509_PKCS11_NO_TOKEN, hx509_set_error_string(context, 0, HX509_PKCS11_NO_TOKEN,
"Failed to init PKCS11 slot %d " "Failed to init PKCS11 slot %d "
"with error 0x08x", "with error 0x%08x",
num, ret); num, ret);
return HX509_PKCS11_NO_TOKEN; return HX509_PKCS11_NO_TOKEN;
} }
@@ -459,7 +459,18 @@ p11_get_session(hx509_context context,
"Failed to login on slot id %d " "Failed to login on slot id %d "
"with error: 0x%08x", "with error: 0x%08x",
(int)slot->id, ret); (int)slot->id, ret);
return HX509_PKCS11_LOGIN; switch(ret) {
case CKR_PIN_LOCKED:
return HX509_PKCS11_PIN_LOCKED;
case CKR_PIN_EXPIRED:
return HX509_PKCS11_PIN_EXPIRED;
case CKR_PIN_INCORRECT:
return HX509_PKCS11_PIN_INCORRECT;
case CKR_USER_PIN_NOT_INITIALIZED:
return HX509_PKCS11_PIN_NOT_INITIALIZED;
default:
return HX509_PKCS11_LOGIN;
}
} else } else
slot->flags |= P11_LOGIN_DONE; slot->flags |= P11_LOGIN_DONE;
@@ -920,10 +931,10 @@ p11_init(hx509_context context,
for (i = 0; i < p->num_slots; i++) { for (i = 0; i < p->num_slots; i++) {
ret = p11_init_slot(context, p, lock, slot_ids[i], i, &p->slot[i]); ret = p11_init_slot(context, p, lock, slot_ids[i], i, &p->slot[i]);
if (ret) if (!ret) {
break; if (p->slot[i].flags & P11_TOKEN_PRESENT)
if (p->slot[i].flags & P11_TOKEN_PRESENT) num_tokens++;
num_tokens++; }
} }
free(slot_ids); free(slot_ids);
if (ret) if (ret)