coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-07-30 16:26:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0d16cb158b654287a8c0e204b6a44cfefe415c3a into f4a1aceb8ca7198b11447d6e1885ce70feb2dcc6

Browse Source
This commit is contained in:
tfloch 2026-07-27 21:03:59 +01:00 committed by GitHub
commit 25c9b9aa53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/mbedtls/config_adjust_legacy_from_psa.h
View File

@ -859,6 +859,12 @@
#endif
#endif /* PSA_WANT_ALG_GCM */
#if defined(PSA_WANT_ALG_XTS)
#if !defined(MBEDTLS_PSA_ACCEL_ALG_XTS)
#define MBEDTLS_PSA_BUILTIN_ALG_XTS 1
#endif
#endif /* PSA_WANT_ALG_XTS */
#if defined(PSA_WANT_ALG_CHACHA20_POLY1305)
#if !defined(MBEDTLS_PSA_ACCEL_ALG_CHACHA20_POLY1305)
#if defined(PSA_WANT_KEY_TYPE_CHACHA20)

1
include/psa/crypto_config.h
View File

@ -79,6 +79,7 @@
#define PSA_WANT_ALG_TLS12_PRF 1
#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1
#define PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS 1
#define PSA_WANT_ALG_XTS 1
#define PSA_WANT_ECC_BRAINPOOL_P_R1_256 1
#define PSA_WANT_ECC_BRAINPOOL_P_R1_384 1

5
library/psa_crypto_cipher.c
View File

@ -175,6 +175,11 @@ psa_status_t mbedtls_cipher_values_from_psa(
*mode = MBEDTLS_MODE_CBC;
break;
#endif
#if defined(MBEDTLS_PSA_BUILTIN_ALG_XTS)
case PSA_ALG_XTS:
*mode = MBEDTLS_MODE_XTS;
break;
#endif
#if defined(MBEDTLS_PSA_BUILTIN_ALG_CCM_STAR_NO_TAG)
case PSA_ALG_CCM_STAR_NO_TAG:
*mode = MBEDTLS_MODE_CCM_STAR_NO_TAG;