From 2ee085002b665833eb73d4b00c3209d312f201d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Meuter?= <cedric.meuter@worldline.com>
Date: Mon, 28 Dec 2020 14:34:29 +0100
Subject: [PATCH] Restored check on salt length to the original
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Following code review by Manuel Pégourié-Gonnard

Signed-off-by: Cédric Meuter <cedric.meuter@worldline.com>
---
 library/rsa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/rsa.c b/library/rsa.c
index 7e75b2be6..4958cad30 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -1856,7 +1856,7 @@ static int rsa_rsassa_pss_sign( mbedtls_rsa_context *ctx,
         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 );
     }