commit 625b01c9c3ba8e3b52c75336d6d41f43d960af46
author Gilles Peskine <Gilles.Peskine@arm.com> Fri Jun 08 17:43:16 2018 +0200
committer itayzafrir <itay.zafrir@arm.com> Wed Sep 05 12:44:17 2018 +0300
tree c20f82c55067e2d4ab6d36d848e5ff66985a8b8f
parent 8b18a4fef304f5baca485af7600a18ec9deb0f8c

Add OAEP placeholders in asymmetric encrypt/decrypt

Replace PSS placeholders by OAEP placeholders. PSS is a signature
algorithm, not an encryption algorithm.

Fix typo in PSA_ALG_IS_RSA_OAEP_MGF1.

include/psa/crypto.h

diff --git a/include/psa/crypto.h b/include/psa/crypto.h
index 0840494..db5b5f6 100755
--- a/include/psa/crypto.h
+++ b/include/psa/crypto.h
@@ -336,7 +336,7 @@
 #define PSA_ALG_RSA_OAEP_MGF1(hash_alg)                             \
     (PSA_ALG_RSA_OAEP_MGF1_RAW | ((hash_alg) & PSA_ALG_HASH_MASK))
 #define PSA_ALG_IS_RSA_OAEP_MGF1(alg)                               \
-    (((alg) & ~PSA_ALG_HASH_MASK) == PSA_ALG_RSA_OAEP_MGF1_RAW)
+    (((alg) & ~PSA_ALG_HASH_MASK) == PSA_ALG_RSA_OAEP_MGF1_BASE)
 #define PSA_ALG_RSA_GET_HASH(alg)                                       \
     (((alg) & PSA_ALG_HASH_MASK) | PSA_ALG_CATEGORY_HASH)
 

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 2a0d59c..cd20738 100755
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1458,7 +1458,7 @@
         else
 #endif /* MBEDTLS_PKCS1_V15 */
 #if defined(MBEDTLS_PKCS1_V21)
-        if( alg == PSA_ALG_RSA_PSS_MGF1 )
+        if( PSA_ALG_IS_RSA_OAEP_MGF1( alg ) )
         {
             return( PSA_ERROR_NOT_SUPPORTED );
         }
@@ -1535,7 +1535,7 @@
         else
 #endif /* MBEDTLS_PKCS1_V15 */
 #if defined(MBEDTLS_PKCS1_V21)
-        if( alg == PSA_ALG_RSA_PSS_MGF1 )
+        if( PSA_ALG_IS_RSA_OAEP_MGF1( alg ) )
         {
             return( PSA_ERROR_NOT_SUPPORTED );
         }