commit b95a6c5de200b12b985daab883edcfe0918be097
author Summer Qin <summer.qin@arm.com> Fri Dec 15 11:27:56 2017 +0800
committer Jérôme Forissier <jerome.forissier@linaro.org> Fri Mar 29 13:18:57 2019 +0100
tree 592f29b147c0477fd0b7891996b8be7e160f1cbb
parent ac34734ac2c8b23fb8f4ac89430c168e96501e7a

libmbedtls: fix no CRT issue

In NO_CRT mode, Q and P may be invalid. But Q and P will be re-filled
again if PRNG function is valid. So add judgement process if it is
in NO_CRT mode.

Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Summer Qin <summer.qin@arm.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

lib/libmbedtls/mbedtls/library/rsa.c

diff --git a/lib/libmbedtls/mbedtls/library/rsa.c b/lib/libmbedtls/mbedtls/library/rsa.c
index 4ee7565..a8ec485 100644
--- a/lib/libmbedtls/mbedtls/library/rsa.c
+++ b/lib/libmbedtls/mbedtls/library/rsa.c
@@ -1361,9 +1361,14 @@
     /*
      * RSA operation
      */
-    ret = ( mode == MBEDTLS_RSA_PUBLIC )
-          ? mbedtls_rsa_public(  ctx, input, buf )
-          : mbedtls_rsa_private( ctx, f_rng, p_rng, input, buf );
+    if( ctx->P.n == 0 )
+        ret = ( mode == MBEDTLS_RSA_PUBLIC )
+              ? mbedtls_rsa_public(  ctx, input, buf )
+              : mbedtls_rsa_private( ctx, NULL, NULL, input, buf );
+    else
+        ret = ( mode == MBEDTLS_RSA_PUBLIC )
+              ? mbedtls_rsa_public(  ctx, input, buf )
+              : mbedtls_rsa_private( ctx, f_rng, p_rng, input, buf );
 
     if( ret != 0 )
         goto cleanup;
@@ -1867,9 +1872,14 @@
     if( ret != 0 )
         return( ret );
 
-    return( ( mode == MBEDTLS_RSA_PUBLIC )
-            ? mbedtls_rsa_public(  ctx, sig, sig )
-            : mbedtls_rsa_private( ctx, f_rng, p_rng, sig, sig ) );
+    if( ctx->P.n == 0)
+        return( ( mode == MBEDTLS_RSA_PUBLIC )
+                ? mbedtls_rsa_public(  ctx, sig, sig )
+                : mbedtls_rsa_private( ctx, NULL, NULL, sig, sig ) );
+    else
+        return( ( mode == MBEDTLS_RSA_PUBLIC )
+                ? mbedtls_rsa_public(  ctx, sig, sig )
+                : mbedtls_rsa_private( ctx, f_rng, p_rng, sig, sig ) );
 }
 #endif /* MBEDTLS_PKCS1_V21 */