From 1a583e755965e51e7fd763d9110fce2f6639b4c4 Mon Sep 17 00:00:00 2001 From: Krzysztof Jackiewicz Date: Fri, 17 May 2019 14:23:00 +0200 Subject: [PATCH] Don't pass public key for RSA decryption Change-Id: Id90f67c03fb1f3f83d06e66bf86e48b3f50cc98c --- ssflib/src/ssf_crypto.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ssflib/src/ssf_crypto.cpp b/ssflib/src/ssf_crypto.cpp index 31a17ea..bbd5233 100644 --- a/ssflib/src/ssf_crypto.cpp +++ b/ssflib/src/ssf_crypto.cpp @@ -2528,14 +2528,11 @@ TEE_Result TEE_AsymmetricDecrypt(TEE_OperationHandle operation, const TEE_Attrib crypto_internal_keystruct key; unsigned char module_buf[512] = {0x0, }; - unsigned char pub_buf[512] = {0x0, }; unsigned char priv_buf[512] = {0x0, }; memset(&key, 0x00, sizeof(crypto_internal_keystruct)); key.rsa_modulus.size = sizeof(module_buf); key.rsa_modulus.buffer = module_buf; - key.rsa_public.size = sizeof(pub_buf); - key.rsa_public.buffer = pub_buf; key.rsa_private.size = sizeof(priv_buf); key.rsa_private.buffer = priv_buf; @@ -2552,10 +2549,6 @@ TEE_Result TEE_AsymmetricDecrypt(TEE_OperationHandle operation, const TEE_Attrib (void*)key.rsa_modulus.buffer, (size_t*)&key.rsa_modulus.size) != TEE_SUCCESS) { CRYPTO_PANIC; } - if (TEE_GetObjectBufferAttribute(op->key1, TEE_ATTR_RSA_PUBLIC_EXPONENT, - (void*)key.rsa_public.buffer, (size_t*)&key.rsa_public.size) != TEE_SUCCESS) { - CRYPTO_PANIC; - } if (TEE_GetObjectBufferAttribute(op->key1, TEE_ATTR_RSA_PRIVATE_EXPONENT, (void*)key.rsa_private.buffer, (size_t*)&key.rsa_private.size) != TEE_SUCCESS) { CRYPTO_PANIC; @@ -2582,8 +2575,8 @@ TEE_Result TEE_AsymmetricDecrypt(TEE_OperationHandle operation, const TEE_Attrib CRYPTO_PANIC; } #endif - if(!key.rsa_modulus.buffer || !key.rsa_public.buffer || !key.rsa_private.buffer - /*|| !key.rsa_prime1.buffer || !key.rsa_prime2.buffer || !key.rsa_exponent1.buffer + if(!key.rsa_modulus.buffer || !key.rsa_private.buffer /*|| !key.rsa_public.buffer + || !key.rsa_prime1.buffer || !key.rsa_prime2.buffer || !key.rsa_exponent1.buffer || !key.rsa_exponent2.buffer || !key.rsa_coefficient.buffer*/) { CRYPTO_PANIC; } -- 2.34.1