mirror of
https://github.com/Mbed-TLS/mbedtls-framework.git
synced 2026-09-17 23:59:55 +00:00
Merge pull request #10309 from bensze01/rename-tf-psa-crypto-common.h
Rename tf-psa-crypto/core/common.h
This commit is contained in:
+1
-1
Submodule framework updated: 893ad9e845...df3307f2b4
+1
-1
@@ -10,7 +10,7 @@
|
|||||||
#ifndef MBEDTLS_SSL_MISC_H
|
#ifndef MBEDTLS_SSL_MISC_H
|
||||||
#define MBEDTLS_SSL_MISC_H
|
#define MBEDTLS_SSL_MISC_H
|
||||||
|
|
||||||
#include "common.h"
|
#include "tf_psa_crypto_common.h"
|
||||||
#include "mbedtls/build_info.h"
|
#include "mbedtls/build_info.h"
|
||||||
|
|
||||||
#include "mbedtls/error.h"
|
#include "mbedtls/error.h"
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
#ifndef MBEDTLS_X509_INTERNAL_H
|
#ifndef MBEDTLS_X509_INTERNAL_H
|
||||||
#define MBEDTLS_X509_INTERNAL_H
|
#define MBEDTLS_X509_INTERNAL_H
|
||||||
|
|
||||||
#include "common.h"
|
#include "tf_psa_crypto_common.h"
|
||||||
#include "mbedtls/build_info.h"
|
#include "mbedtls/build_info.h"
|
||||||
#include "mbedtls/private_access.h"
|
#include "mbedtls/private_access.h"
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
|
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common.h"
|
#include "tf_psa_crypto_common.h"
|
||||||
|
|
||||||
#include "mbedtls/error.h"
|
#include "mbedtls/error.h"
|
||||||
|
|
||||||
|
|||||||
@@ -12,13 +12,13 @@
|
|||||||
* -I$(MBEDTLS_ROOT_PATH)/tf-psa-crypto/drivers/builtin/include
|
* -I$(MBEDTLS_ROOT_PATH)/tf-psa-crypto/drivers/builtin/include
|
||||||
* None of those cover tf-psa-crypto/core, so we rely on the
|
* None of those cover tf-psa-crypto/core, so we rely on the
|
||||||
* “-I$(MBEDTLS_ROOT_PATH)/include” entry plus a parent-relative
|
* “-I$(MBEDTLS_ROOT_PATH)/include” entry plus a parent-relative
|
||||||
* include "../tf-psa-crypto/core/common.h" in order to pull in common.h here,
|
* include "../tf-psa-crypto/core/tf_psa_crypto_common.h" in order to pull in tf_psa_crypto_common.h here,
|
||||||
* which in turn gets MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING (to silence the
|
* which in turn gets MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING (to silence the
|
||||||
* new GCC-15 unterminated-string-initialization warning).
|
* new GCC-15 unterminated-string-initialization warning).
|
||||||
* See GitHub issue #10223 for the proper long-term fix.
|
* See GitHub issue #10223 for the proper long-term fix.
|
||||||
* https://github.com/Mbed-TLS/mbedtls/issues/10223
|
* https://github.com/Mbed-TLS/mbedtls/issues/10223
|
||||||
*/
|
*/
|
||||||
#include "../tf-psa-crypto/core/common.h"
|
#include "../tf-psa-crypto/core/tf_psa_crypto_common.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "psa/crypto.h"
|
#include "psa/crypto.h"
|
||||||
#include "../tf-psa-crypto/core/common.h"
|
#include "../tf-psa-crypto/core/tf_psa_crypto_common.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@
|
|||||||
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
|
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common.h"
|
#include "tf_psa_crypto_common.h"
|
||||||
|
|
||||||
#include <test/certs.h>
|
#include <test/certs.h>
|
||||||
|
|
||||||
|
|||||||
+1
-1
Submodule tf-psa-crypto updated: b1c98ebee8...a0ff5d6483
Reference in New Issue
Block a user