Skip to content

Commit d097cdc

Browse files
valeriosettinordicjm
authored andcommitted
[nrf fromtree] md: allow dispatch to PSA whenever CRYPTO_CLIENT is enabled
Instead of allowing PSA dispatching only when CRYPTO_C is set and some MBEDTLS_PSA_ACCEL_ALG_xxx is set, we enable dispatching when CRYPTO_CLIENT and PSA_WANT_ALG_xxx are set. This makes the feature more useful in cases where the PSA support is provided externally, like for example TF-M in Zephyr. This commit also add proper guards for tests trying to use MD+PSA dispatch. Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no> (cherry picked from commit c516307ad90d24de7f6f83e6b2fd825329ce5824) Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
1 parent 4378a39 commit d097cdc

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

include/mbedtls/config_adjust_legacy_crypto.h

+13-13
Original file line numberDiff line numberDiff line change
@@ -101,64 +101,64 @@
101101
*/
102102

103103
/* PSA accelerated implementations */
104-
#if defined(MBEDTLS_PSA_CRYPTO_C)
104+
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
105105

106-
#if defined(MBEDTLS_PSA_ACCEL_ALG_MD5)
106+
#if defined(PSA_WANT_ALG_MD5)
107107
#define MBEDTLS_MD_CAN_MD5
108108
#define MBEDTLS_MD_MD5_VIA_PSA
109109
#define MBEDTLS_MD_SOME_PSA
110110
#endif
111-
#if defined(MBEDTLS_PSA_ACCEL_ALG_SHA_1)
111+
#if defined(PSA_WANT_ALG_SHA_1)
112112
#define MBEDTLS_MD_CAN_SHA1
113113
#define MBEDTLS_MD_SHA1_VIA_PSA
114114
#define MBEDTLS_MD_SOME_PSA
115115
#endif
116-
#if defined(MBEDTLS_PSA_ACCEL_ALG_SHA_224)
116+
#if defined(PSA_WANT_ALG_SHA_224)
117117
#define MBEDTLS_MD_CAN_SHA224
118118
#define MBEDTLS_MD_SHA224_VIA_PSA
119119
#define MBEDTLS_MD_SOME_PSA
120120
#endif
121-
#if defined(MBEDTLS_PSA_ACCEL_ALG_SHA_256)
121+
#if defined(PSA_WANT_ALG_SHA_256)
122122
#define MBEDTLS_MD_CAN_SHA256
123123
#define MBEDTLS_MD_SHA256_VIA_PSA
124124
#define MBEDTLS_MD_SOME_PSA
125125
#endif
126-
#if defined(MBEDTLS_PSA_ACCEL_ALG_SHA_384)
126+
#if defined(PSA_WANT_ALG_SHA_384)
127127
#define MBEDTLS_MD_CAN_SHA384
128128
#define MBEDTLS_MD_SHA384_VIA_PSA
129129
#define MBEDTLS_MD_SOME_PSA
130130
#endif
131-
#if defined(MBEDTLS_PSA_ACCEL_ALG_SHA_512)
131+
#if defined(PSA_WANT_ALG_SHA_512)
132132
#define MBEDTLS_MD_CAN_SHA512
133133
#define MBEDTLS_MD_SHA512_VIA_PSA
134134
#define MBEDTLS_MD_SOME_PSA
135135
#endif
136-
#if defined(MBEDTLS_PSA_ACCEL_ALG_RIPEMD160)
136+
#if defined(PSA_WANT_ALG_RIPEMD160)
137137
#define MBEDTLS_MD_CAN_RIPEMD160
138138
#define MBEDTLS_MD_RIPEMD160_VIA_PSA
139139
#define MBEDTLS_MD_SOME_PSA
140140
#endif
141-
#if defined(MBEDTLS_PSA_ACCEL_ALG_SHA3_224)
141+
#if defined(PSA_WANT_ALG_SHA3_224)
142142
#define MBEDTLS_MD_CAN_SHA3_224
143143
#define MBEDTLS_MD_SHA3_224_VIA_PSA
144144
#define MBEDTLS_MD_SOME_PSA
145145
#endif
146-
#if defined(MBEDTLS_PSA_ACCEL_ALG_SHA3_256)
146+
#if defined(PSA_WANT_ALG_SHA3_256)
147147
#define MBEDTLS_MD_CAN_SHA3_256
148148
#define MBEDTLS_MD_SHA3_256_VIA_PSA
149149
#define MBEDTLS_MD_SOME_PSA
150150
#endif
151-
#if defined(MBEDTLS_PSA_ACCEL_ALG_SHA3_384)
151+
#if defined(PSA_WANT_ALG_SHA3_384)
152152
#define MBEDTLS_MD_CAN_SHA3_384
153153
#define MBEDTLS_MD_SHA3_384_VIA_PSA
154154
#define MBEDTLS_MD_SOME_PSA
155155
#endif
156-
#if defined(MBEDTLS_PSA_ACCEL_ALG_SHA3_512)
156+
#if defined(PSA_WANT_ALG_SHA3_512)
157157
#define MBEDTLS_MD_CAN_SHA3_512
158158
#define MBEDTLS_MD_SHA3_512_VIA_PSA
159159
#define MBEDTLS_MD_SOME_PSA
160160
#endif
161-
#endif /* MBEDTLS_PSA_CRYPTO_C */
161+
#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */
162162

163163
/* Built-in implementations */
164164
#if defined(MBEDTLS_MD5_C)

tests/suites/test_suite_md.function

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ exit:
423423
}
424424
/* END_CASE */
425425

426-
/* BEGIN_CASE */
426+
/* BEGIN_CASE depends_on:MBEDTLS_PSA_CRYPTO_C */
427427
void md_psa_dynamic_dispatch(int md_type, int pre_psa_ret, int post_psa_engine)
428428
{
429429
const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md_type);

0 commit comments

Comments
 (0)