commit d58ed587fda2059fc30a56e140de2d654b4d5637
author Thomas Daubney <thomas.daubney@arm.com> Fri May 21 11:50:39 2021 +0100
committer Thomas Daubney <thomas.daubney@arm.com> Fri May 21 11:50:39 2021 +0100
tree c9b832f385731526b0dbd4d14301057b4aebc31d
parent 2c65db96553e15438b8a7c43ea3d76aaa68f5643

Restores erroneously removed checks

Some padding checks in rsa.c were
erroneously removed in a previous
commit and are restored in this
commit.

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

library/rsa.c

diff --git a/library/rsa.c b/library/rsa.c
index c3b54af..36424bd 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -1764,6 +1764,9 @@
                       hash != NULL );
     RSA_VALIDATE_RET( sig != NULL );
 
+    if( ctx->padding != MBEDTLS_RSA_PKCS_V21 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
     if( f_rng == NULL )
         return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
 
@@ -2054,6 +2057,9 @@
                       hash != NULL );
     RSA_VALIDATE_RET( sig != NULL );
 
+    if( ctx->padding != MBEDTLS_RSA_PKCS_V15 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
     /*
      * Prepare PKCS1-v1.5 encoding (padding and hash identifier)
      */