commit 2d9466f1db2527d63b815e70a5bdcb5b5ae7f882
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu Sep 19 10:45:14 2019 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu Sep 19 10:45:14 2019 +0200
tree f3c871dcc3423b9875dc5e25cb649fab922c1e50
parent c10f092a8722ad28d7bc314911c2d6c4a69f2be0

Minor preparatory changes in mbedtls_pk_check_pair()

1. Mark an RSA-alt-specific code path as such.
2. Move NULL check for wrapper function closer to the use of that function.

Those are in preparation of the next commit.

library/pk.c

diff --git a/library/pk.c b/library/pk.c
index 30ee275..2519d87 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -584,24 +584,25 @@
     PK_VALIDATE_RET( pub != NULL );
     PK_VALIDATE_RET( prv != NULL );
 
-    if( pub->pk_info == NULL ||
-        prv->pk_info == NULL ||
-        prv->pk_info->check_pair_func == NULL )
-    {
+    if( pub->pk_info == NULL || prv->pk_info == NULL )
         return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
-    }
 
+#if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
     if( pk_info_type( prv->pk_info ) == MBEDTLS_PK_RSA_ALT )
     {
         if( pk_info_type( pub->pk_info ) != MBEDTLS_PK_RSA )
             return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
     }
     else
+#endif /* MBEDTLS_PK_RSA_ALT_SUPPORT */
     {
         if( pub->pk_info != prv->pk_info )
             return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
     }
 
+    if( prv->pk_info->check_pair_func == NULL )
+        return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+
     return( pk_info_check_pair_func( prv->pk_info, pub->pk_ctx, prv->pk_ctx ) );
 }