commit e82fcd9c9e01cd3b63c76e792b9136834cc38f34
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Wed Jul 26 10:53:25 2023 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Oct 16 10:27:22 2023 +0200
tree 16812ef61aa54be6102fe5bf92fce66b8c3d7869
parent 116175c5d7f2b44f5d3186e845b9881d519d53d6

Avoid nested #ifs in body of pk_get_ecpubkey()

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 3f67786..72eed09 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -675,7 +675,7 @@
 }
 #endif /* MBEDTLS_PK_HAVE_RFC8410_CURVES */
 
-#if defined(MBEDTLS_PK_USE_PSA_EC_DATA) && defined(MBEDTLS_PK_PARSE_EC_COMPRESSED)
+#if defined(MBEDTLS_PK_USE_PSA_EC_DATA)
 /*
  * Create a temporary ecp_keypair for converting an EC point in compressed
  * format to an uncompressed one
@@ -685,6 +685,7 @@
                                     size_t *out_buf_len, unsigned char *out_buf,
                                     size_t out_buf_size)
 {
+#if defined(MBEDTLS_PK_PARSE_EC_COMPRESSED)
     mbedtls_ecp_keypair ecp_key;
     mbedtls_ecp_group_id ecp_group_id;
     int ret;
@@ -708,8 +709,11 @@
 exit:
     mbedtls_ecp_keypair_free(&ecp_key);
     return ret;
+#else /* MBEDTLS_PK_PARSE_EC_COMPRESSED */
+    return MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE;
+#endif /* MBEDTLS_PK_PARSE_EC_COMPRESSED */
 }
-#endif /* MBEDTLS_PK_USE_PSA_EC_DATA && MBEDTLS_PK_PARSE_EC_COMPRESSED */
+#endif /* MBEDTLS_PK_USE_PSA_EC_DATA */
 
 /*
  * EC public key is an EC point
@@ -732,20 +736,15 @@
         return MBEDTLS_ERR_PK_BAD_INPUT_DATA;
     }
 
-    /* Compressed point format are not supported yet by PSA crypto. As a
-     * consequence ecp functions are used to "convert" the point to
-     * uncompressed format */
     if ((**p == 0x02) || (**p == 0x03)) {
-#if defined(MBEDTLS_PK_PARSE_EC_COMPRESSED)
+        /* Compressed format, not supported by PSA Crypto.
+         * Try converting using functions from ECP_LIGHT. */
         ret = pk_convert_compressed_ec(pk, *p, len,
                                        &(pk->pub_raw_len), pk->pub_raw,
                                        PSA_EXPORT_PUBLIC_KEY_MAX_SIZE);
         if (ret != 0) {
             return ret;
         }
-#else /* MBEDTLS_PK_PARSE_EC_COMPRESSED */
-        return MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE;
-#endif /* MBEDTLS_PK_PARSE_EC_COMPRESSED */
     } else {
         /* Uncompressed format */
         if ((size_t) (end - *p) > MBEDTLS_PK_MAX_EC_PUBKEY_RAW_LEN) {