commit 2177277ddab7896b295205ed5d5e15180b6aca08
author Thomas Daubney <thomas.daubney@arm.com> Thu May 13 17:30:32 2021 +0100
committer Thomas Daubney <thomas.daubney@arm.com> Mon May 17 10:11:05 2021 +0100
tree e8814c816f39155b796476bfab5fb568552c58ae
parent c32e2b0921dafb07412628ca1460a2a5999608a1

Removes mode param from mbedtls_rsa_pkcs1_encrypt

Removal of the mode parameter from
mbedtls_rsa_pkcs1_encrypt function. This change
is propagated throughout the codebase and to
relevant tests.

Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>

library/pk_wrap.c

diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index 8e4f251..e1ad507 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -149,7 +149,7 @@
     if( *olen > osize )
         return( MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE );
 
-    return( mbedtls_rsa_pkcs1_encrypt( rsa, f_rng, p_rng, MBEDTLS_RSA_PUBLIC,
+    return( mbedtls_rsa_pkcs1_encrypt( rsa, f_rng, p_rng,
                                        ilen, input, output ) );
 }
 

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 64ead5b..c4354d7 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3064,7 +3064,6 @@
                     mbedtls_rsa_pkcs1_encrypt( rsa,
                                                mbedtls_psa_get_random,
                                                MBEDTLS_PSA_RANDOM_STATE,
-                                               MBEDTLS_RSA_PUBLIC,
                                                input_length,
                                                input,
                                                output ) );

library/rsa.c

diff --git a/library/rsa.c b/library/rsa.c
index 6761fbd..5ecc778 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -1317,13 +1317,11 @@
 int mbedtls_rsa_pkcs1_encrypt( mbedtls_rsa_context *ctx,
                        int (*f_rng)(void *, unsigned char *, size_t),
                        void *p_rng,
-                       int mode, size_t ilen,
+                       size_t ilen,
                        const unsigned char *input,
                        unsigned char *output )
 {
     RSA_VALIDATE_RET( ctx != NULL );
-    RSA_VALIDATE_RET( mode == MBEDTLS_RSA_PRIVATE ||
-                      mode == MBEDTLS_RSA_PUBLIC );
     RSA_VALIDATE_RET( output != NULL );
     RSA_VALIDATE_RET( ilen == 0 || input != NULL );
 
@@ -1331,14 +1329,16 @@
     {
 #if defined(MBEDTLS_PKCS1_V15)
         case MBEDTLS_RSA_PKCS_V15:
-            return mbedtls_rsa_rsaes_pkcs1_v15_encrypt( ctx, f_rng, p_rng, mode, ilen,
-                                                input, output );
+            return mbedtls_rsa_rsaes_pkcs1_v15_encrypt( ctx, f_rng, p_rng,
+                                                        MBEDTLS_RSA_PUBLIC, ilen,
+                                                        input, output );
 #endif
 
 #if defined(MBEDTLS_PKCS1_V21)
         case MBEDTLS_RSA_PKCS_V21:
-            return mbedtls_rsa_rsaes_oaep_encrypt( ctx, f_rng, p_rng, mode, NULL, 0,
-                                           ilen, input, output );
+            return mbedtls_rsa_rsaes_oaep_encrypt( ctx, f_rng, p_rng,
+                                                   MBEDTLS_RSA_PUBLIC, NULL, 0,
+                                                   ilen, input, output );
 #endif
 
         default:
@@ -2691,7 +2691,7 @@
 
     memcpy( rsa_plaintext, RSA_PT, PT_LEN );
 
-    if( mbedtls_rsa_pkcs1_encrypt( &rsa, myrand, NULL, MBEDTLS_RSA_PUBLIC,
+    if( mbedtls_rsa_pkcs1_encrypt( &rsa, myrand, NULL,
                                    PT_LEN, rsa_plaintext,
                                    rsa_ciphertext ) != 0 )
     {