Allow using SHA384 & SHA512 with RSA OAEP

Change-Id: I28e8fd5285ad176765e73bb842dcb64b19727a12

diff --git a/ta/src/cmd_exec.c b/ta/src/cmd_exec.c
index 5bbde3e287947dfa882d4eb9bf290323b1d70304..058a9f171ba37563a803e0f9c2349bd692328b26 100644 (file)
--- a/ta/src/cmd_exec.c
+++ b/ta/src/cmd_exec.c
@@ -83,8 +83,8 @@ static uint32_t KM_Algo2TeeAlgoWithHash(int algo, int oaepHash)
                switch (oaepHash) {
                        case HASH_SHA1:   return TEE_ALG_RSAES_PKCS1_OAEP_MGF1_SHA1;
                        case HASH_SHA256: return TEE_ALG_RSAES_PKCS1_OAEP_MGF1_SHA256;
-                       //case HASH_SHA384: return TEE_ALG_RSAES_PKCS1_OAEP_MGF1_SHA384;
-                       //case HASH_SHA512: return TEE_ALG_RSAES_PKCS1_OAEP_MGF1_SHA512;
+                       case HASH_SHA384: return TEE_ALG_RSAES_PKCS1_OAEP_MGF1_SHA384;
+                       case HASH_SHA512: return TEE_ALG_RSAES_PKCS1_OAEP_MGF1_SHA512;
                        default: return 0;
                }
        default: return 0;
@@ -219,8 +219,8 @@ static uint32_t KM_CheckAlgoKeyType(uint32_t algo, uint32_t key_type)
        }
        case TEE_ALG_RSAES_PKCS1_OAEP_MGF1_SHA1:
        case TEE_ALG_RSAES_PKCS1_OAEP_MGF1_SHA256:
-       //case TEE_ALG_RSAES_PKCS1_OAEP_MGF1_SHA384:
-       //case TEE_ALG_RSAES_PKCS1_OAEP_MGF1_SHA512:
+       case TEE_ALG_RSAES_PKCS1_OAEP_MGF1_SHA384:
+       case TEE_ALG_RSAES_PKCS1_OAEP_MGF1_SHA512:
        {
                switch (key_type) {
                case TEE_TYPE_RSA_KEYPAIR: