commit 2ee085002b665833eb73d4b00c3209d312f201d4
author Cédric Meuter <cedric.meuter@worldline.com> Mon Dec 28 14:34:29 2020 +0100
committer Cédric Meuter <cedric.meuter@worldline.com> Mon Dec 28 14:38:59 2020 +0100
tree 5bdb2627b082065d6a6c0962b64212a0ceaeb2e5
parent d2dc1f1a8399e431ecf41ef3bf01e167f1b3a9a6

Restored check on salt length to the original

Following code review by Manuel Pégourié-Gonnard

Signed-off-by: Cédric Meuter <cedric.meuter@worldline.com>

library/rsa.c

diff --git a/library/rsa.c b/library/rsa.c
index 7e75b2b..4958cad 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -1856,7 +1856,7 @@
         else
             slen = olen - hlen - 2;
     }
-    else if ( ( (size_t) saltlen ) > olen - hlen - 2 )
+    else if ( (saltlen < 0) || ((size_t) saltlen > olen - hlen - 2) )
     {
         return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
     }