From 40c41cee0c71b9361bdea91c58bbda04a15a875a Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Tue, 13 Aug 2019 15:31:40 +0200 Subject: [PATCH] pkcs11-tool: Make the SHA256 default for OAEP decryption It is already default in all the other functions and it really makes sense since the SHA1 is being obsoleted --- src/tools/pkcs11-tool.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c index 92c8d8a5..6a8e27ee 100644 --- a/src/tools/pkcs11-tool.c +++ b/src/tools/pkcs11-tool.c @@ -2127,9 +2127,15 @@ static void decrypt_data(CK_SLOT_ID slot, CK_SESSION_HANDLE session, case CKM_RSA_PKCS_OAEP: oaep_params.hashAlg = opt_hash_alg; switch (opt_hash_alg) { + case CKM_SHA_1: + oaep_params.mgf = CKG_MGF1_SHA1; + break; case CKM_SHA224: oaep_params.mgf = CKG_MGF1_SHA224; break; + default: + oaep_params.hashAlg = CKM_SHA256; + /* fall through */ case CKM_SHA256: oaep_params.mgf = CKG_MGF1_SHA256; break; @@ -2139,12 +2145,6 @@ static void decrypt_data(CK_SLOT_ID slot, CK_SESSION_HANDLE session, case CKM_SHA512: oaep_params.mgf = CKG_MGF1_SHA512; break; - default: - oaep_params.hashAlg = CKM_SHA_1; - /* fall through */ - case CKM_SHA_1: - oaep_params.mgf = CKG_MGF1_SHA1; - break; } break; case CKM_RSA_X_509: