commit 178b5bdddf26ba5ee0371684a142b4ecb9fdd772
author Valerio Setti <valerio.setti@nordicsemi.no> Mon Feb 13 10:04:28 2023 +0100
committer Valerio Setti <valerio.setti@nordicsemi.no> Mon Feb 13 11:15:06 2023 +0100
tree 74ec57a9e33a4ef7d56031d1845236fdf6df54d7
parent a119cb64ef651e2562ebe61e3c53f54e2575ceae

pk: move MBEDTLS_PK_CAN_ECDSA_SOME macro to pk.h and fix tests

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>

include/mbedtls/pk.h

diff --git a/include/mbedtls/pk.h b/include/mbedtls/pk.h
index 29cac27..b5c02b0 100644
--- a/include/mbedtls/pk.h
+++ b/include/mbedtls/pk.h
@@ -177,6 +177,10 @@
 #endif /* PSA_WANT_ALG_ECDSA */
 #endif /* MBEDTLS_USE_PSA_CRYPTO */
 
+#if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY) || defined(MBEDTLS_PK_CAN_ECDSA_SIGN)
+#define MBEDTLS_PK_CAN_ECDSA_SOME
+#endif
+
 /**
  * \brief           Types for interfacing with the debug module
  */

library/oid.c

diff --git a/library/oid.c b/library/oid.c
index e532bf3..e7c1224 100644
--- a/library/oid.c
+++ b/library/oid.c
@@ -26,7 +26,7 @@
 #include "mbedtls/oid.h"
 #include "mbedtls/rsa.h"
 #include "mbedtls/error.h"
-#include "pk_wrap.h"
+#include "mbedtls/pk.h"
 
 #include "mbedtls/legacy_or_psa.h"
 

library/pk_wrap.h

diff --git a/library/pk_wrap.h b/library/pk_wrap.h
index ac5c72f..7df9608 100644
--- a/library/pk_wrap.h
+++ b/library/pk_wrap.h
@@ -31,10 +31,6 @@
 #include "psa/crypto.h"
 #endif /* MBEDTLS_PSA_CRYPTO_C */
 
-#if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY) || defined(MBEDTLS_PK_CAN_ECDSA_SIGN)
-#define MBEDTLS_PK_CAN_ECDSA_SOME
-#endif
-
 struct mbedtls_pk_info_t {
     /** Public key type */
     mbedtls_pk_type_t type;

tests/suites/test_suite_x509parse.function

diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index e7f3870..3454da3 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -8,8 +8,8 @@
 #include "mbedtls/oid.h"
 #include "mbedtls/base64.h"
 #include "mbedtls/error.h"
+#include "mbedtls/pk.h"
 #include "string.h"
-#include "pk_wrap.h"
 
 #include "mbedtls/legacy_or_psa.h"
 

tests/suites/test_suite_x509write.function

diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function
index be48c41..cd1f203 100644
--- a/tests/suites/test_suite_x509write.function
+++ b/tests/suites/test_suite_x509write.function
@@ -6,7 +6,7 @@
 #include "mbedtls/oid.h"
 #include "mbedtls/rsa.h"
 #include "mbedtls/asn1write.h"
-#include "pk_wrap.h"
+#include "mbedtls/pk.h"
 
 #include "hash_info.h"
 #include "mbedtls/legacy_or_psa.h"