From 7a090b994e70a63a59825142dd6182332931bcdd Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Wed, 20 Jan 2021 00:55:27 +0100 Subject: [PATCH] essentially revert 1bb2547 fixes #2199 returns not allowed PKCS#11 codes to applications, however --- src/pkcs11/misc.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/pkcs11/misc.c b/src/pkcs11/misc.c index 9b1bffc4..c3f5bb4e 100644 --- a/src/pkcs11/misc.c +++ b/src/pkcs11/misc.c @@ -37,21 +37,6 @@ static struct sc_to_cryptoki_error_conversion sc_to_cryptoki_error_map[] = { { "C_GenerateKeyPair", SC_ERROR_INVALID_PIN_LENGTH, CKR_GENERAL_ERROR }, { "C_Sign", SC_ERROR_NOT_ALLOWED, CKR_FUNCTION_FAILED}, { "C_Decrypt", SC_ERROR_NOT_ALLOWED, CKR_FUNCTION_FAILED}, - { "C_GetTokenInfo", SC_ERROR_INVALID_CARD, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_GetTokenInfo", SC_ERROR_WRONG_CARD, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_GetTokenInfo", SC_ERROR_NO_CARD_SUPPORT, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_GetMechanismList", SC_ERROR_INVALID_CARD, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_GetMechanismList", SC_ERROR_WRONG_CARD, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_GetMechanismList", SC_ERROR_NO_CARD_SUPPORT, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_GetMechanismInfo", SC_ERROR_INVALID_CARD, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_GetMechanismInfo", SC_ERROR_WRONG_CARD, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_GetMechanismInfo", SC_ERROR_NO_CARD_SUPPORT, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_InitToken", SC_ERROR_INVALID_CARD, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_InitToken", SC_ERROR_WRONG_CARD, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_InitToken", SC_ERROR_NO_CARD_SUPPORT, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_OpenSession", SC_ERROR_INVALID_CARD, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_OpenSession", SC_ERROR_WRONG_CARD, CKR_TOKEN_NOT_RECOGNIZED}, - { "C_OpenSession", SC_ERROR_NO_CARD_SUPPORT, CKR_TOKEN_NOT_RECOGNIZED}, {NULL, 0, 0} }; @@ -102,8 +87,7 @@ static CK_RV sc_to_cryptoki_error_common(int rc) case SC_ERROR_INVALID_CARD: case SC_ERROR_WRONG_CARD: case SC_ERROR_NO_CARD_SUPPORT: - /* CKR_TOKEN_NOT_RECOGNIZED is handled in sc_to_cryptoki_error() */ - return CKR_FUNCTION_NOT_SUPPORTED; + return CKR_TOKEN_NOT_RECOGNIZED; case SC_ERROR_WRONG_LENGTH: return CKR_DATA_LEN_RANGE; case SC_ERROR_INVALID_PIN_LENGTH: