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:59:05 +02:00
parent 8fa6ff8edb
commit 2420874125
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
@@ -591,7 +591,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_CloseSession)(
return CKR_SESSION_HANDLE_INVALID;
}
free(session.slot->token->objects); // TODO: make objects survive a session so there is no need to get them again?
free(session.slot->token->objects);
session.slot->token->objects = NULL;
memset(&session, 0, sizeof(ykcs11_session_t));
@@ -613,8 +613,10 @@ CK_DEFINE_FUNCTION(CK_RV, C_CloseAllSessions)(
return CKR_CRYPTOKI_NOT_INITIALIZED;
}
if (session.slot != slots + slotID)
if (session.slot != slots + slotID) {
DBG(("Invalid slot ID %lu", slotID));
return CKR_SLOT_ID_INVALID;
}
rv = C_CloseSession(session.handle);
@@ -634,11 +636,15 @@ CK_DEFINE_FUNCTION(CK_RV, C_GetSessionInfo)(
return CKR_CRYPTOKI_NOT_INITIALIZED;
}
if (pInfo == NULL)
if (pInfo == NULL) {
DBG(("Wrong/Missing parameter"));
return CKR_ARGUMENTS_BAD;
}
if (hSession != session.handle)
if (hSession != session.handle) {
DBG(("Unknown session %lu", hSession));
return CKR_SESSION_HANDLE_INVALID;
}
memcpy(pInfo, &session.info, sizeof(CK_SESSION_INFO));
@@ -699,8 +705,9 @@ CK_DEFINE_FUNCTION(CK_RV, C_Login)(
return CKR_SESSION_CLOSED;
}
if (hSession != session.handle)
if (hSession != session.handle) {
return CKR_SESSION_HANDLE_INVALID;
}
if ((session.info.flags & CKF_RW_SESSION) == 0) { // TODO: make macros for these?
DBG(("Tried to log-in to a read-only session"));