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

More debug messages and precondition checks.

Browse Source
This commit is contained in:
Alessio Di Mauro
2015-08-20 16:39:44 +02:00
parent 255815d78f
commit 6cbdbc3c14
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ykcs11/ykcs11.c
+12 -5
View File
@@ -439,8 +439,15 @@ CK_DEFINE_FUNCTION(CK_RV, C_OpenSession)(
return CKR_CRYPTOKI_NOT_INITIALIZED; return CKR_CRYPTOKI_NOT_INITIALIZED;
} }
if (slotID >= n_slots || phSession == NULL) if (slotID >= n_slots) {
DBG(("Invalid slot ID %lu, slotID"));
return CKR_SLOT_ID_INVALID;
}
if (phSession == NULL_PTR) {
DBG(("Wrong/Missing parameter"));
return CKR_ARGUMENTS_BAD; return CKR_ARGUMENTS_BAD;
}
if (slots[slotID].vid == UNKNOWN) { if (slots[slotID].vid == UNKNOWN) {
DBG(("No support for slot %lu", slotID)); DBG(("No support for slot %lu", slotID));
@@ -462,7 +469,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_OpenSession)(
return CKR_SESSION_COUNT; return CKR_SESSION_COUNT;
} }
if ((flags & CKF_SERIAL_SESSION) == 0) { // TODO: check more error conditions if ((flags & CKF_SERIAL_SESSION) == 0) {
DBG(("Open session called without CKF_SERIAL_SESSION set")); // Reuired by specs DBG(("Open session called without CKF_SERIAL_SESSION set")); // Reuired by specs
return CKR_SESSION_PARALLEL_NOT_SUPPORTED; return CKR_SESSION_PARALLEL_NOT_SUPPORTED;
} }
@@ -478,11 +485,11 @@ CK_DEFINE_FUNCTION(CK_RV, C_OpenSession)(
if ((flags & CKF_RW_SESSION)) { if ((flags & CKF_RW_SESSION)) {
// R/W Session // R/W Session
session.info.state = CKS_RW_PUBLIC_SESSION; // Nobody has logged in, default session session.info.state = CKS_RW_PUBLIC_SESSION; // Nobody has logged in, default RO session
} }
else { else {
// R/O Session // R/O Session
session.info.state = CKS_RO_PUBLIC_SESSION; // Nobody has logged in, default session session.info.state = CKS_RO_PUBLIC_SESSION; // Nobody has logged in, default RW session
} }
session.info.flags = flags; session.info.flags = flags;
@@ -517,7 +524,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_OpenSession)(
} }
// Get a list of object ids for available certificates object from the session // Get a list of object ids for available certificates object from the session
rv = get_available_certificate_ids(&session, cert_ids, session.slot->token->n_certs); // TODO: better to get this from token? how? rv = get_available_certificate_ids(&session, cert_ids, session.slot->token->n_certs);
if (rv != CKR_OK) { if (rv != CKR_OK) {
DBG(("Unable to retrieve certificate ids from the session")); DBG(("Unable to retrieve certificate ids from the session"));
goto failure; goto failure;