diff options
Diffstat (limited to 'tests/pkcs11/pkcs11-mock.c')
| -rw-r--r-- | tests/pkcs11/pkcs11-mock.c | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/tests/pkcs11/pkcs11-mock.c b/tests/pkcs11/pkcs11-mock.c index de265bf5d0..98d6af80f9 100644 --- a/tests/pkcs11/pkcs11-mock.c +++ b/tests/pkcs11/pkcs11-mock.c @@ -15,6 +15,7 @@ #include "pkcs11-mock.h" #include "pkcs11-mock-ext.h" +#include <string.h> #include <stdlib.h> unsigned int pkcs11_mock_flags = 0; @@ -191,6 +192,25 @@ CK_FUNCTION_LIST pkcs11_mock_functions = &C_WaitForSlotEvent }; +#if defined(HAVE___REGISTER_ATFORK) +extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *); +extern void *__dso_handle; +static unsigned registered_fork_handler = 0; + +static void fork_handler(void) +{ + pkcs11_mock_initialized = CK_FALSE; + pkcs11_mock_session_opened = CK_FALSE; + if (mock_session) { + mock_session->state = CKS_RO_PUBLIC_SESSION; + mock_session->find_op.active_operation = PKCS11_MOCK_CK_OPERATION_NONE; + free(mock_session->find_label); + } + free(mock_session); + mock_session = NULL; +} +#endif + CK_DEFINE_FUNCTION(CK_RV, C_Initialize)(CK_VOID_PTR pInitArgs) { @@ -199,6 +219,12 @@ CK_DEFINE_FUNCTION(CK_RV, C_Initialize)(CK_VOID_PTR pInitArgs) IGNORE(pInitArgs); +#if defined(HAVE___REGISTER_ATFORK) + if (registered_fork_handler == 0) { + __register_atfork(NULL, NULL, fork_handler, __dso_handle); + registered_fork_handler = 1; + } +#endif pkcs11_mock_initialized = CK_TRUE; return CKR_OK; @@ -534,7 +560,6 @@ CK_DEFINE_FUNCTION(CK_RV, C_OpenSession)(CK_SLOT_ID slotID, CK_FLAGS flags, CK_V { if (CK_FALSE == pkcs11_mock_initialized) return CKR_CRYPTOKI_NOT_INITIALIZED; - if (CK_TRUE == pkcs11_mock_session_opened) return CKR_SESSION_COUNT; @@ -583,6 +608,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_CloseSession)(CK_SESSION_HANDLE hSession) mock_session->find_op.active_operation = PKCS11_MOCK_CK_OPERATION_NONE; free(mock_session->find_label); free(mock_session); + mock_session = NULL; return CKR_OK; } @@ -895,6 +921,15 @@ CK_DEFINE_FUNCTION(CK_RV, C_GetAttributeValue)(CK_SESSION_HANDLE hSession, CK_OB pTemplate[i].ulValueLen = strlen(PKCS11_MOCK_CK_OBJECT_CKA_LABEL); } + else if (CKA_KEY_TYPE == pTemplate[i].type) + { + CK_KEY_TYPE t; + if (pTemplate[i].ulValueLen != sizeof(CK_KEY_TYPE)) + return CKR_ARGUMENTS_BAD; + + t = CKK_RSA; + memcpy(pTemplate[i].pValue, &t, sizeof(CK_KEY_TYPE)); + } else if (CKA_ID == pTemplate[i].type) { if (NULL != pTemplate[i].pValue) |