Skip to content

Commit 2d0236b

Browse files
committed
Revert "[zep noup][tfm] Exclude built-in definitions for PSA Crypto client"
This creates issues with the Zephyr build This reverts commit 487233c. The TF-M PR that's trying to upstream this change has change-id: Ib3dd8a40bff2587d1703219cd303630ce06addac
1 parent 4f98386 commit 2d0236b

2 files changed

Lines changed: 0 additions & 8 deletions

File tree

include/psa/crypto_struct.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,9 @@ extern "C" {
5656

5757
#include "tf-psa-crypto/build_info.h"
5858

59-
#if defined(MBEDTLS_PSA_CRYPTO_C)
6059
/* Include the context definition for the compiled-in drivers for the primitive
6160
* algorithms. */
6261
#include "psa/crypto_driver_contexts_primitives.h"
63-
#endif
6462

6563
struct psa_hash_operation_s {
6664
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) && !defined(MBEDTLS_PSA_CRYPTO_C)
@@ -155,11 +153,9 @@ static inline struct psa_cipher_operation_s psa_cipher_operation_init(void)
155153
return v;
156154
}
157155

158-
#if defined(MBEDTLS_PSA_CRYPTO_C)
159156
/* Include the context definition for the compiled-in drivers for the composite
160157
* algorithms. */
161158
#include "psa/crypto_driver_contexts_composites.h"
162-
#endif
163159

164160
/* Include context definitions from the PQCP driver.
165161
* (There are none yet at the time of writing, that will come with multipart
@@ -236,11 +232,9 @@ static inline struct psa_aead_operation_s psa_aead_operation_init(void)
236232
return v;
237233
}
238234

239-
#if defined(MBEDTLS_PSA_CRYPTO_C)
240235
/* Include the context definition for the compiled-in drivers for the key
241236
* derivation algorithms. */
242237
#include "psa/crypto_driver_contexts_key_derivation.h"
243-
#endif
244238

245239
struct psa_key_derivation_s {
246240
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) && !defined(MBEDTLS_PSA_CRYPTO_C)

include/tf-psa-crypto/build_info.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,8 @@
169169
/* Define additional symbols used by support modules. */
170170
#include "tf-psa-crypto/private/crypto_adjust_config_support.h"
171171

172-
#if defined(MBEDTLS_PSA_CRYPTO_C)
173172
/* Define additional symbols used by built-in crypto modules. */
174173
#include "mbedtls/private/crypto_adjust_config_tweak_builtins.h"
175-
#endif
176174

177175
#if defined(TF_PSA_CRYPTO_TEST_LIBTESTDRIVER1)
178176
#include "mbedtls/private/libtestdriver1-crypto_adjust_config_tweak_builtins.h"

0 commit comments

Comments
 (0)