commit 8cf2f5e4666074ed3599be375aba17a10155f969
author Hanno Becker <hanno.becker@arm.com> Wed Aug 21 11:51:53 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Wed Sep 04 16:17:25 2019 +0100
tree b8e678a957dc120a4df51257523f24ca5571ff56
parent 3bef643987cab1d431dc2d8ea991ecce39f671f1

TinyCrypt PK parse: Move TC-based EC public key parsing code-block

Keep code-paths handling legacy-ECC vs. TinyCrypt together
for better readability.

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 92aed59..79b06c7 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -718,18 +718,18 @@
     if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 )
         return( ret );
 
-#if defined(MBEDTLS_USE_TINYCRYPT)
-    if( pk_alg == MBEDTLS_PK_ECKEY )
-    {
-        ret = pk_get_ueccpubkey( p, end, (uint8_t*) pk->pk_ctx );
-    } else
-#endif /* MBEDTLS_USE_TINYCRYPT */
 #if defined(MBEDTLS_RSA_C)
     if( pk_alg == MBEDTLS_PK_RSA )
     {
         ret = pk_get_rsapubkey( p, end, mbedtls_pk_rsa( *pk ) );
     } else
 #endif /* MBEDTLS_RSA_C */
+#if defined(MBEDTLS_USE_TINYCRYPT)
+    if( pk_alg == MBEDTLS_PK_ECKEY )
+    {
+        ret = pk_get_ueccpubkey( p, end, (uint8_t*) pk->pk_ctx );
+    } else
+#else /* MBEDTLS_USE_TINYCRYPT */
 #if defined(MBEDTLS_ECP_C)
     if( pk_alg == MBEDTLS_PK_ECKEY_DH || pk_alg == MBEDTLS_PK_ECKEY )
     {
@@ -738,6 +738,7 @@
             ret = pk_get_ecpubkey( p, end, mbedtls_pk_ec( *pk ) );
     } else
 #endif /* MBEDTLS_ECP_C */
+#endif /* MBEDTLS_USE_TINYCRYPT */
         ret = MBEDTLS_ERR_PK_UNKNOWN_PK_ALG;
 
     if( ret == 0 && *p != end )