commit 6345dd33b9e8996a4face60a7960ed078c1f9d10
author Hanno Becker <hanno.becker@arm.com> Wed Aug 23 06:59:48 2017 +0100
committer Hanno Becker <hanno.becker@arm.com> Wed Aug 23 16:17:28 2017 +0100
tree f82df20e1250f7c8cb38bff68075e9b6f0d3e395
parent bee3aaeb5068b6fa3f072c82574c612abc8b07b0

Adapt rsa_check_privkey to deal with NO_CRT option

library/rsa.c

diff --git a/library/rsa.c b/library/rsa.c
index 78814bb..dc1fae5 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -1025,9 +1025,10 @@
     if( !ctx->P.p || !ctx->Q.p || !ctx->D.p )
         return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
 
-    mbedtls_mpi_init( &PQ ); mbedtls_mpi_init( &DE ); mbedtls_mpi_init( &P1 ); mbedtls_mpi_init( &Q1 );
-    mbedtls_mpi_init( &H  ); mbedtls_mpi_init( &I  ); mbedtls_mpi_init( &G  ); mbedtls_mpi_init( &G2 );
-    mbedtls_mpi_init( &L1 ); mbedtls_mpi_init( &L2 ); mbedtls_mpi_init( &DP ); mbedtls_mpi_init( &DQ );
+    mbedtls_mpi_init( &PQ ); mbedtls_mpi_init( &DE ); mbedtls_mpi_init( &P1 );
+    mbedtls_mpi_init( &Q1 ); mbedtls_mpi_init( &H  ); mbedtls_mpi_init( &I  );
+    mbedtls_mpi_init( &G  ); mbedtls_mpi_init( &G2 ); mbedtls_mpi_init( &L1 );
+    mbedtls_mpi_init( &L2 ); mbedtls_mpi_init( &DP ); mbedtls_mpi_init( &DQ );
     mbedtls_mpi_init( &QP );
 
     MBEDTLS_MPI_CHK( mbedtls_mpi_mul_mpi( &PQ, &ctx->P, &ctx->Q ) );
@@ -1041,27 +1042,33 @@
     MBEDTLS_MPI_CHK( mbedtls_mpi_div_mpi( &L1, &L2, &H, &G2 ) );
     MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &I, &DE, &L1  ) );
 
+#if !defined(MBEDTLS_RSA_NO_CRT)
     MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &DP, &ctx->D, &P1 ) );
     MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( &DQ, &ctx->D, &Q1 ) );
     MBEDTLS_MPI_CHK( mbedtls_mpi_inv_mod( &QP, &ctx->Q, &ctx->P ) );
+#endif
+
     /*
      * Check for a valid PKCS1v2 private key
      */
-    if( mbedtls_mpi_cmp_mpi( &PQ, &ctx->N ) != 0 ||
+    if( mbedtls_mpi_cmp_mpi( &PQ, &ctx->N ) != 0  ||
+#if !defined(MBEDTLS_RSA_NO_CRT)
         mbedtls_mpi_cmp_mpi( &DP, &ctx->DP ) != 0 ||
         mbedtls_mpi_cmp_mpi( &DQ, &ctx->DQ ) != 0 ||
         mbedtls_mpi_cmp_mpi( &QP, &ctx->QP ) != 0 ||
+#endif
         mbedtls_mpi_cmp_int( &L2, 0 ) != 0 ||
-        mbedtls_mpi_cmp_int( &I, 1 ) != 0 ||
+        mbedtls_mpi_cmp_int( &I, 1 ) != 0  ||
         mbedtls_mpi_cmp_int( &G, 1 ) != 0 )
     {
         ret = MBEDTLS_ERR_RSA_KEY_CHECK_FAILED;
     }
 
 cleanup:
-    mbedtls_mpi_free( &PQ ); mbedtls_mpi_free( &DE ); mbedtls_mpi_free( &P1 ); mbedtls_mpi_free( &Q1 );
-    mbedtls_mpi_free( &H  ); mbedtls_mpi_free( &I  ); mbedtls_mpi_free( &G  ); mbedtls_mpi_free( &G2 );
-    mbedtls_mpi_free( &L1 ); mbedtls_mpi_free( &L2 ); mbedtls_mpi_free( &DP ); mbedtls_mpi_free( &DQ );
+    mbedtls_mpi_free( &PQ ); mbedtls_mpi_free( &DE ); mbedtls_mpi_free( &P1 );
+    mbedtls_mpi_free( &Q1 ); mbedtls_mpi_free( &H  ); mbedtls_mpi_free( &I  );
+    mbedtls_mpi_free( &G  ); mbedtls_mpi_free( &G2 ); mbedtls_mpi_free( &L1 );
+    mbedtls_mpi_free( &L2 ); mbedtls_mpi_free( &DP ); mbedtls_mpi_free( &DQ );
     mbedtls_mpi_free( &QP );
 
     if( ret == MBEDTLS_ERR_RSA_KEY_CHECK_FAILED )