Make legacy_or_psa.h public.

As a public header, it should no longer include common.h, just use build_info.h which is what we actually need anyway. Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
2022-09-15 11:29:35 +02:00 · 2022-09-15 11:29:35 +02:00 · 07018f97d2
commit 07018f97d2
parent c42c7e660e
25 changed files with 25 additions and 25 deletions
--- a/include/mbedtls/legacy_or_psa.h
+++ b/include/mbedtls/legacy_or_psa.h
@ -96,7 +96,7 @@
 #ifndef MBEDTLS_OR_PSA_HELPERS_H
 #define MBEDTLS_OR_PSA_HELPERS_H

-#include "common.h"
+#include "mbedtls/build_info.h"
 #if defined(MBEDTLS_PSA_CRYPTO_C)
 #include "psa/crypto.h"
 #endif /* MBEDTLS_PSA_CRYPTO_C */
--- a/library/hash_info.c
+++ b/library/hash_info.c
@ -21,7 +21,7 @@
 */

 #include "hash_info.h"
-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"
 #include "mbedtls/error.h"

 typedef struct
--- a/library/oid.c
+++ b/library/oid.c
@ -27,7 +27,7 @@
 #include "mbedtls/rsa.h"
 #include "mbedtls/error.h"

-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 #include <stdio.h>
 #include <string.h>
--- a/library/pem.c
+++ b/library/pem.c
@ -45,7 +45,7 @@
 #include "psa/crypto.h"
 #endif

-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 #if defined(MBEDTLS_HAS_ALG_MD5_VIA_MD_OR_PSA_BASED_ON_USE_PSA) &&  \
    defined(MBEDTLS_CIPHER_MODE_CBC) &&                             \
--- a/library/ssl_ciphersuites.c
+++ b/library/ssl_ciphersuites.c
@ -33,7 +33,7 @@
 #include "mbedtls/ssl.h"
 #include "ssl_misc.h"

-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 #include <string.h>

--- a/library/ssl_cookie.c
+++ b/library/ssl_cookie.c
@ -38,7 +38,7 @@
 #include "mbedtls/platform_util.h"
 #include "mbedtls/constant_time.h"

-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 #include <string.h>

--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@ -32,7 +32,7 @@
 #include "mbedtls/psa_util.h"
 #include "hash_info.h"
 #endif
-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 #if defined(MBEDTLS_MD5_C)
 #include "mbedtls/md5.h"
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@ -54,7 +54,7 @@
 #include "mbedtls/psa_util.h"
 #include "psa/crypto.h"
 #endif
-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 #if defined(MBEDTLS_X509_CRT_PARSE_C)
 #include "mbedtls/oid.h"
--- a/library/x509.c
+++ b/library/x509.c
@ -62,7 +62,7 @@
 #include <time.h>
 #endif

-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 #define CHECK(code) if( ( ret = ( code ) ) != 0 ){ return( ret ); }
 #define CHECK_RANGE(min, max, val)                      \
--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@ -46,7 +46,7 @@
 #endif /* MBEDTLS_USE_PSA_CRYPTO */

 #include "hash_info.h"
-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 void mbedtls_x509write_crt_init( mbedtls_x509write_cert *ctx )
 {
--- a/tests/src/certs.c
+++ b/tests/src/certs.c
@ -23,7 +23,7 @@

 #include "mbedtls/build_info.h"

-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 /*
 * Test CA Certificates
--- a/tests/suites/test_suite_ecdsa.function
+++ b/tests/suites/test_suite_ecdsa.function
@ -1,7 +1,7 @@
 /* BEGIN_HEADER */
 #include "mbedtls/ecdsa.h"
 #include "hash_info.h"
-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"
 #if ( defined(MBEDTLS_ECDSA_DETERMINISTIC) && defined(MBEDTLS_SHA256_C) ) || \
    ( !defined(MBEDTLS_ECDSA_DETERMINISTIC) && defined(MBEDTLS_HAS_ALG_SHA_256_VIA_LOWLEVEL_OR_PSA) )
 #define MBEDTLS_HAS_ALG_SHA_256_VIA_MD_IF_DETERMINISTIC
--- a/tests/suites/test_suite_ecjpake.function
+++ b/tests/suites/test_suite_ecjpake.function
@ -1,6 +1,6 @@
 /* BEGIN_HEADER */
 #include "mbedtls/ecjpake.h"
-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 #if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) && defined(MBEDTLS_HAS_ALG_SHA_256_VIA_MD_OR_PSA)
 static const unsigned char ecjpake_test_x1[] = {
--- a/tests/suites/test_suite_oid.function
+++ b/tests/suites/test_suite_oid.function
@ -3,7 +3,7 @@
 #include "mbedtls/asn1.h"
 #include "mbedtls/asn1write.h"
 #include "string.h"
-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"
 /* END_HEADER */

 /* BEGIN_DEPENDENCIES
--- a/tests/suites/test_suite_pem.function
+++ b/tests/suites/test_suite_pem.function
@ -3,7 +3,7 @@
 #include "mbedtls/pem.h"
 #include "mbedtls/des.h"
 #include "mbedtls/aes.h"
-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 /* END_HEADER */

--- a/tests/suites/test_suite_pk.function
+++ b/tests/suites/test_suite_pk.function
@ -8,7 +8,7 @@
 #include "mbedtls/rsa.h"

 #include "hash_info.h"
-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 #include <limits.h>
 #include <stdint.h>
--- a/tests/suites/test_suite_pkcs12.function
+++ b/tests/suites/test_suite_pkcs12.function
@ -2,7 +2,7 @@
 #include "mbedtls/pkcs12.h"
 #include "common.h"

-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 typedef enum
 {
--- a/tests/suites/test_suite_pkcs1_v15.function
+++ b/tests/suites/test_suite_pkcs1_v15.function
@ -2,7 +2,7 @@
 #include "mbedtls/rsa.h"
 #include "mbedtls/md.h"

-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"
 /* END_HEADER */

 /* BEGIN_DEPENDENCIES
--- a/tests/suites/test_suite_pkcs1_v21.function
+++ b/tests/suites/test_suite_pkcs1_v21.function
@ -1,6 +1,6 @@
 /* BEGIN_HEADER */
 #include "mbedtls/rsa.h"
-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"
 /* END_HEADER */

 /* BEGIN_DEPENDENCIES
--- a/tests/suites/test_suite_pkcs5.function
+++ b/tests/suites/test_suite_pkcs5.function
@ -1,6 +1,6 @@
 /* BEGIN_HEADER */
 #include "mbedtls/pkcs5.h"
-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"
 /* END_HEADER */

 /* BEGIN_DEPENDENCIES
--- a/tests/suites/test_suite_pkparse.function
+++ b/tests/suites/test_suite_pkparse.function
@ -2,7 +2,7 @@
 #include "mbedtls/pk.h"
 #include "mbedtls/pem.h"
 #include "mbedtls/oid.h"
-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"
 /* END_HEADER */

 /* BEGIN_DEPENDENCIES
--- a/tests/suites/test_suite_rsa.function
+++ b/tests/suites/test_suite_rsa.function
@ -2,7 +2,7 @@
 #include "mbedtls/rsa.h"
 #include "rsa_alt_helpers.h"

-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"
 /* END_HEADER */

 /* BEGIN_DEPENDENCIES
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@ -11,7 +11,7 @@
 #include "mbedtls/ssl_cache.h"
 #endif

-#include <legacy_or_psa.h>
+#include <mbedtls/legacy_or_psa.h>
 #include "hash_info.h"

 #include <constant_time_internal.h>
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@ -10,7 +10,7 @@
 #include "mbedtls/error.h"
 #include "string.h"

-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 #if MBEDTLS_X509_MAX_INTERMEDIATE_CA > 19
 #error "The value of MBEDTLS_X509_MAX_INTERMEDIATE_C is larger \
--- a/tests/suites/test_suite_x509write.function
+++ b/tests/suites/test_suite_x509write.function
@ -7,7 +7,7 @@
 #include "mbedtls/rsa.h"

 #include "hash_info.h"
-#include "legacy_or_psa.h"
+#include "mbedtls/legacy_or_psa.h"

 #if defined(MBEDTLS_RSA_C)
 int mbedtls_rsa_decrypt_func( void *ctx, size_t *olen,