From 153d9df0592c78481c4203e138aef109b06ec1b9 Mon Sep 17 00:00:00 2001 From: Ingo Franzki Date: Fri, 8 Apr 2022 10:39:38 +0200 Subject: [PATCH 05/11] Add other SHA variants, also for RSA and EC signatures Signed-off-by: Ingo Franzki --- p11-kit/rpc-message.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/p11-kit/rpc-message.c b/p11-kit/rpc-message.c index cedda03..40a4d9f 100644 --- a/p11-kit/rpc-message.c +++ b/p11-kit/rpc-message.c @@ -1554,6 +1554,11 @@ p11_rpc_buffer_get_ibm_attrbound_wrap_mechanism_value (p11_buffer *buffer, static p11_rpc_mechanism_serializer p11_rpc_mechanism_serializers[] = { { CKM_RSA_PKCS_PSS, p11_rpc_buffer_add_rsa_pkcs_pss_mechanism_value, p11_rpc_buffer_get_rsa_pkcs_pss_mechanism_value }, + { CKM_SHA1_RSA_PKCS_PSS, p11_rpc_buffer_add_rsa_pkcs_pss_mechanism_value, p11_rpc_buffer_get_rsa_pkcs_pss_mechanism_value }, + { CKM_SHA224_RSA_PKCS_PSS, p11_rpc_buffer_add_rsa_pkcs_pss_mechanism_value, p11_rpc_buffer_get_rsa_pkcs_pss_mechanism_value }, + { CKM_SHA256_RSA_PKCS_PSS, p11_rpc_buffer_add_rsa_pkcs_pss_mechanism_value, p11_rpc_buffer_get_rsa_pkcs_pss_mechanism_value }, + { CKM_SHA384_RSA_PKCS_PSS, p11_rpc_buffer_add_rsa_pkcs_pss_mechanism_value, p11_rpc_buffer_get_rsa_pkcs_pss_mechanism_value }, + { CKM_SHA512_RSA_PKCS_PSS, p11_rpc_buffer_add_rsa_pkcs_pss_mechanism_value, p11_rpc_buffer_get_rsa_pkcs_pss_mechanism_value }, { CKM_RSA_PKCS_OAEP, p11_rpc_buffer_add_rsa_pkcs_oaep_mechanism_value, p11_rpc_buffer_get_rsa_pkcs_oaep_mechanism_value }, { CKM_ECDH1_DERIVE, p11_rpc_buffer_add_ecdh1_derive_mechanism_value, p11_rpc_buffer_get_ecdh1_derive_mechanism_value }, { CKM_IBM_ATTRIBUTEBOUND_WRAP, p11_rpc_buffer_add_ibm_attrbound_wrap_mechanism_value, p11_rpc_buffer_get_ibm_attrbound_wrap_mechanism_value }, @@ -1603,6 +1608,7 @@ mechanism_has_no_parameters (CK_MECHANISM_TYPE mech) case CKM_MD2_RSA_PKCS: case CKM_MD5_RSA_PKCS: case CKM_SHA1_RSA_PKCS: + case CKM_SHA224_RSA_PKCS: case CKM_SHA256_RSA_PKCS: case CKM_SHA384_RSA_PKCS: case CKM_SHA512_RSA_PKCS: @@ -1617,6 +1623,10 @@ mechanism_has_no_parameters (CK_MECHANISM_TYPE mech) case CKM_EC_KEY_PAIR_GEN: case CKM_ECDSA: case CKM_ECDSA_SHA1: + case CKM_ECDSA_SHA224: + case CKM_ECDSA_SHA256: + case CKM_ECDSA_SHA384: + case CKM_ECDSA_SHA512: case CKM_DH_PKCS_KEY_PAIR_GEN: case CKM_DH_PKCS_PARAMETER_GEN: case CKM_X9_42_DH_KEY_PAIR_GEN: @@ -1671,12 +1681,28 @@ mechanism_has_no_parameters (CK_MECHANISM_TYPE mech) case CKM_MD5_HMAC: case CKM_SHA_1: case CKM_SHA_1_HMAC: + case CKM_SHA1_KEY_DERIVATION: + case CKM_SHA224: + case CKM_SHA224_HMAC: + case CKM_SHA224_KEY_DERIVATION: case CKM_SHA256: case CKM_SHA256_HMAC: + case CKM_SHA256_KEY_DERIVATION: case CKM_SHA384: case CKM_SHA384_HMAC: + case CKM_SHA384_KEY_DERIVATION: case CKM_SHA512: case CKM_SHA512_HMAC: + case CKM_SHA512_KEY_DERIVATION: + case CKM_SHA512_T: + case CKM_SHA512_T_HMAC: + case CKM_SHA512_T_KEY_DERIVATION: + case CKM_SHA512_224: + case CKM_SHA512_224_HMAC: + case CKM_SHA512_224_KEY_DERIVATION: + case CKM_SHA512_256: + case CKM_SHA512_256_HMAC: + case CKM_SHA512_256_KEY_DERIVATION: case CKM_FASTHASH: case CKM_RIPEMD128: case CKM_RIPEMD128_HMAC: -- 2.38.1