From 8943efa13654ae87a7465cfcf9829a3843deb3d3 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Mon, 15 Sep 2025 15:22:51 +0200
Subject: [PATCH] Save config information about TF-PSA-Crypto 1.0 and Mbed TLS
 4.0

Use today's `development` head and the crypto submodule there.

We may update this again before the release. Once the release is out, we
should update to the release tags.

```
scripts/save_config_history.sh 06bae1e110ce71b44c3f4d17974d24feea4d2a92 1.0
scripts/save_config_history.sh 07912c9e3693d7ae5d62bfcbb8aef4daa9e3cafc 4.0
```

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
---
 history/config-adjust-mbedtls-4.0.txt      |   3 +
 history/config-adjust-tfpsacrypto-1.0.txt  | 318 +++++++++++++++++++++
 history/config-options-mbedtls-4.0.txt     |  78 +++++
 history/config-options-tfpsacrypto-1.0.txt | 242 ++++++++++++++++
 4 files changed, 641 insertions(+)
 create mode 100644 history/config-adjust-mbedtls-4.0.txt
 create mode 100644 history/config-adjust-tfpsacrypto-1.0.txt
 create mode 100644 history/config-options-mbedtls-4.0.txt
 create mode 100644 history/config-options-tfpsacrypto-1.0.txt

diff --git a/history/config-adjust-mbedtls-4.0.txt b/history/config-adjust-mbedtls-4.0.txt
new file mode 100644
index 000000000..ef0c69363
--- /dev/null
+++ b/history/config-adjust-mbedtls-4.0.txt
@@ -0,0 +1,3 @@
+MBEDTLS_CONFIG_ADJUST_SSL_H
+MBEDTLS_CONFIG_ADJUST_X509_H
+MBEDTLS_SSL_TLS1_2_SOME_ECC
diff --git a/history/config-adjust-tfpsacrypto-1.0.txt b/history/config-adjust-tfpsacrypto-1.0.txt
new file mode 100644
index 000000000..09766414d
--- /dev/null
+++ b/history/config-adjust-tfpsacrypto-1.0.txt
@@ -0,0 +1,318 @@
+MBEDTLS_AES_C
+MBEDTLS_ARIA_C
+MBEDTLS_ASN1_PARSE_C
+MBEDTLS_ASN1_WRITE_C
+MBEDTLS_BIGNUM_C
+MBEDTLS_BLOCK_CIPHER_AES_VIA_LEGACY
+MBEDTLS_BLOCK_CIPHER_AES_VIA_PSA
+MBEDTLS_BLOCK_CIPHER_ARIA_VIA_LEGACY
+MBEDTLS_BLOCK_CIPHER_ARIA_VIA_PSA
+MBEDTLS_BLOCK_CIPHER_C
+MBEDTLS_BLOCK_CIPHER_CAMELLIA_VIA_LEGACY
+MBEDTLS_BLOCK_CIPHER_CAMELLIA_VIA_PSA
+MBEDTLS_BLOCK_CIPHER_CAN_AES
+MBEDTLS_BLOCK_CIPHER_CAN_ARIA
+MBEDTLS_BLOCK_CIPHER_CAN_CAMELLIA
+MBEDTLS_BLOCK_CIPHER_SOME_PSA
+MBEDTLS_CAMELLIA_C
+MBEDTLS_CAN_ECDH
+MBEDTLS_CCM_C
+MBEDTLS_CCM_GCM_CAN_AES
+MBEDTLS_CCM_GCM_CAN_ARIA
+MBEDTLS_CCM_GCM_CAN_CAMELLIA
+MBEDTLS_CHACHA20_C
+MBEDTLS_CHACHAPOLY_C
+MBEDTLS_CIPHER_C
+MBEDTLS_CIPHER_MODE_CBC
+MBEDTLS_CIPHER_MODE_CFB
+MBEDTLS_CIPHER_MODE_CTR
+MBEDTLS_CIPHER_MODE_OFB
+MBEDTLS_CIPHER_MODE_XTS
+MBEDTLS_CIPHER_PADDING_PKCS7
+MBEDTLS_CMAC_C
+MBEDTLS_CONFIG_ADJUST_LEGACY_CRYPTO_H
+MBEDTLS_CONFIG_ADJUST_LEGACY_FROM_PSA_H
+MBEDTLS_CONFIG_ADJUST_PSA_SUPERSET_LEGACY_H
+MBEDTLS_CONFIG_ADJUST_TEST_ACCELERATORS_H
+MBEDTLS_DES_C
+MBEDTLS_ECDH_C
+MBEDTLS_ECDSA_C
+MBEDTLS_ECDSA_DETERMINISTIC
+MBEDTLS_ECJPAKE_C
+MBEDTLS_ECP_C
+MBEDTLS_ECP_DP_BP256R1_ENABLED
+MBEDTLS_ECP_DP_BP384R1_ENABLED
+MBEDTLS_ECP_DP_BP512R1_ENABLED
+MBEDTLS_ECP_DP_CURVE25519_ENABLED
+MBEDTLS_ECP_DP_CURVE448_ENABLED
+MBEDTLS_ECP_DP_SECP192K1_ENABLED
+MBEDTLS_ECP_DP_SECP192R1_ENABLED
+MBEDTLS_ECP_DP_SECP256K1_ENABLED
+MBEDTLS_ECP_DP_SECP256R1_ENABLED
+MBEDTLS_ECP_DP_SECP384R1_ENABLED
+MBEDTLS_ECP_DP_SECP521R1_ENABLED
+MBEDTLS_ECP_LIGHT
+MBEDTLS_ENTROPY_C
+MBEDTLS_ENTROPY_HAVE_SOURCES
+MBEDTLS_ENTROPY_TRUE_SOURCES
+MBEDTLS_GCM_C
+MBEDTLS_GENPRIME
+MBEDTLS_HMAC_DRBG_C
+MBEDTLS_MD5_C
+MBEDTLS_MD_C
+MBEDTLS_MD_LIGHT
+MBEDTLS_MD_MD5_VIA_PSA
+MBEDTLS_MD_RIPEMD160_VIA_PSA
+MBEDTLS_MD_SHA1_VIA_PSA
+MBEDTLS_MD_SHA224_VIA_PSA
+MBEDTLS_MD_SHA256_VIA_PSA
+MBEDTLS_MD_SHA384_VIA_PSA
+MBEDTLS_MD_SHA3_224_VIA_PSA
+MBEDTLS_MD_SHA3_256_VIA_PSA
+MBEDTLS_MD_SHA3_384_VIA_PSA
+MBEDTLS_MD_SHA3_512_VIA_PSA
+MBEDTLS_MD_SHA512_VIA_PSA
+MBEDTLS_MD_SOME_LEGACY
+MBEDTLS_MD_SOME_PSA
+MBEDTLS_PKCS1_V15
+MBEDTLS_PKCS1_V21
+MBEDTLS_PK_PARSE_EC_COMPRESSED
+MBEDTLS_PLATFORM_SNPRINTF_ALT
+MBEDTLS_PLATFORM_VSNPRINTF_ALT
+MBEDTLS_POLY1305_C
+MBEDTLS_PSA_ACCEL_ALG_CBC_NO_PADDING
+MBEDTLS_PSA_ACCEL_ALG_CBC_PKCS7
+MBEDTLS_PSA_ACCEL_ALG_CCM
+MBEDTLS_PSA_ACCEL_ALG_CCM_STAR_NO_TAG
+MBEDTLS_PSA_ACCEL_ALG_CFB
+MBEDTLS_PSA_ACCEL_ALG_CHACHA20_POLY1305
+MBEDTLS_PSA_ACCEL_ALG_CMAC
+MBEDTLS_PSA_ACCEL_ALG_CTR
+MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA
+MBEDTLS_PSA_ACCEL_ALG_ECB_NO_PADDING
+MBEDTLS_PSA_ACCEL_ALG_ECDH
+MBEDTLS_PSA_ACCEL_ALG_ECDSA
+MBEDTLS_PSA_ACCEL_ALG_FFDH
+MBEDTLS_PSA_ACCEL_ALG_GCM
+MBEDTLS_PSA_ACCEL_ALG_HKDF
+MBEDTLS_PSA_ACCEL_ALG_HKDF_EXPAND
+MBEDTLS_PSA_ACCEL_ALG_HKDF_EXTRACT
+MBEDTLS_PSA_ACCEL_ALG_HMAC
+MBEDTLS_PSA_ACCEL_ALG_JPAKE
+MBEDTLS_PSA_ACCEL_ALG_MD5
+MBEDTLS_PSA_ACCEL_ALG_OFB
+MBEDTLS_PSA_ACCEL_ALG_PBKDF2_AES_CMAC_PRF_128
+MBEDTLS_PSA_ACCEL_ALG_PBKDF2_HMAC
+MBEDTLS_PSA_ACCEL_ALG_RIPEMD160
+MBEDTLS_PSA_ACCEL_ALG_RSA_OAEP
+MBEDTLS_PSA_ACCEL_ALG_RSA_PKCS1V15_CRYPT
+MBEDTLS_PSA_ACCEL_ALG_RSA_PKCS1V15_SIGN
+MBEDTLS_PSA_ACCEL_ALG_RSA_PSS
+MBEDTLS_PSA_ACCEL_ALG_SHA3_224
+MBEDTLS_PSA_ACCEL_ALG_SHA3_256
+MBEDTLS_PSA_ACCEL_ALG_SHA3_384
+MBEDTLS_PSA_ACCEL_ALG_SHA3_512
+MBEDTLS_PSA_ACCEL_ALG_SHA_1
+MBEDTLS_PSA_ACCEL_ALG_SHA_224
+MBEDTLS_PSA_ACCEL_ALG_SHA_256
+MBEDTLS_PSA_ACCEL_ALG_SHA_384
+MBEDTLS_PSA_ACCEL_ALG_SHA_512
+MBEDTLS_PSA_ACCEL_ALG_STREAM_CIPHER
+MBEDTLS_PSA_ACCEL_ALG_TLS12_ECJPAKE_TO_PMS
+MBEDTLS_PSA_ACCEL_ALG_TLS12_PRF
+MBEDTLS_PSA_ACCEL_ALG_TLS12_PSK_TO_MS
+MBEDTLS_PSA_ACCEL_ECC_SECP_R1_256
+MBEDTLS_PSA_ACCEL_KEY_TYPE_AES
+MBEDTLS_PSA_ACCEL_KEY_TYPE_ARIA
+MBEDTLS_PSA_ACCEL_KEY_TYPE_CAMELLIA
+MBEDTLS_PSA_ACCEL_KEY_TYPE_CHACHA20
+MBEDTLS_PSA_ACCEL_KEY_TYPE_DERIVE
+MBEDTLS_PSA_ACCEL_KEY_TYPE_DES
+MBEDTLS_PSA_ACCEL_KEY_TYPE_DH_KEY_PAIR_BASIC
+MBEDTLS_PSA_ACCEL_KEY_TYPE_DH_KEY_PAIR_EXPORT
+MBEDTLS_PSA_ACCEL_KEY_TYPE_DH_KEY_PAIR_GENERATE
+MBEDTLS_PSA_ACCEL_KEY_TYPE_DH_KEY_PAIR_IMPORT
+MBEDTLS_PSA_ACCEL_KEY_TYPE_DH_PUBLIC_KEY
+MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR_BASIC
+MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR_DERIVE
+MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR_EXPORT
+MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR_GENERATE
+MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR_IMPORT
+MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY
+MBEDTLS_PSA_ACCEL_KEY_TYPE_HMAC
+MBEDTLS_PSA_ACCEL_KEY_TYPE_PASSWORD
+MBEDTLS_PSA_ACCEL_KEY_TYPE_PASSWORD_HASH
+MBEDTLS_PSA_ACCEL_KEY_TYPE_RAW_DATA
+MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR_BASIC
+MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR_EXPORT
+MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR_GENERATE
+MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR_IMPORT
+MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY
+MBEDTLS_PSA_BUILTIN_ALG_CBC_NO_PADDING
+MBEDTLS_PSA_BUILTIN_ALG_CBC_PKCS7
+MBEDTLS_PSA_BUILTIN_ALG_CCM
+MBEDTLS_PSA_BUILTIN_ALG_CCM_STAR_NO_TAG
+MBEDTLS_PSA_BUILTIN_ALG_CFB
+MBEDTLS_PSA_BUILTIN_ALG_CHACHA20_POLY1305
+MBEDTLS_PSA_BUILTIN_ALG_CMAC
+MBEDTLS_PSA_BUILTIN_ALG_CTR
+MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA
+MBEDTLS_PSA_BUILTIN_ALG_ECB_NO_PADDING
+MBEDTLS_PSA_BUILTIN_ALG_ECDH
+MBEDTLS_PSA_BUILTIN_ALG_ECDSA
+MBEDTLS_PSA_BUILTIN_ALG_FFDH
+MBEDTLS_PSA_BUILTIN_ALG_GCM
+MBEDTLS_PSA_BUILTIN_ALG_HKDF
+MBEDTLS_PSA_BUILTIN_ALG_HKDF_EXPAND
+MBEDTLS_PSA_BUILTIN_ALG_HKDF_EXTRACT
+MBEDTLS_PSA_BUILTIN_ALG_HMAC
+MBEDTLS_PSA_BUILTIN_ALG_JPAKE
+MBEDTLS_PSA_BUILTIN_ALG_MD5
+MBEDTLS_PSA_BUILTIN_ALG_OFB
+MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_AES_CMAC_PRF_128
+MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC
+MBEDTLS_PSA_BUILTIN_ALG_RIPEMD160
+MBEDTLS_PSA_BUILTIN_ALG_RSA_OAEP
+MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_CRYPT
+MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_SIGN
+MBEDTLS_PSA_BUILTIN_ALG_RSA_PSS
+MBEDTLS_PSA_BUILTIN_ALG_SHA3_224
+MBEDTLS_PSA_BUILTIN_ALG_SHA3_256
+MBEDTLS_PSA_BUILTIN_ALG_SHA3_384
+MBEDTLS_PSA_BUILTIN_ALG_SHA3_512
+MBEDTLS_PSA_BUILTIN_ALG_SHA_1
+MBEDTLS_PSA_BUILTIN_ALG_SHA_224
+MBEDTLS_PSA_BUILTIN_ALG_SHA_256
+MBEDTLS_PSA_BUILTIN_ALG_SHA_384
+MBEDTLS_PSA_BUILTIN_ALG_SHA_512
+MBEDTLS_PSA_BUILTIN_ALG_STREAM_CIPHER
+MBEDTLS_PSA_BUILTIN_ALG_TLS12_ECJPAKE_TO_PMS
+MBEDTLS_PSA_BUILTIN_ALG_TLS12_PRF
+MBEDTLS_PSA_BUILTIN_ALG_TLS12_PSK_TO_MS
+MBEDTLS_PSA_BUILTIN_ALG_XTS
+MBEDTLS_PSA_BUILTIN_DH_RFC7919_2048
+MBEDTLS_PSA_BUILTIN_DH_RFC7919_3072
+MBEDTLS_PSA_BUILTIN_DH_RFC7919_4096
+MBEDTLS_PSA_BUILTIN_DH_RFC7919_6144
+MBEDTLS_PSA_BUILTIN_DH_RFC7919_8192
+MBEDTLS_PSA_BUILTIN_ECC_BRAINPOOL_P_R1_256
+MBEDTLS_PSA_BUILTIN_ECC_BRAINPOOL_P_R1_384
+MBEDTLS_PSA_BUILTIN_ECC_BRAINPOOL_P_R1_512
+MBEDTLS_PSA_BUILTIN_ECC_MONTGOMERY_255
+MBEDTLS_PSA_BUILTIN_ECC_MONTGOMERY_448
+MBEDTLS_PSA_BUILTIN_ECC_SECP_K1_192
+MBEDTLS_PSA_BUILTIN_ECC_SECP_K1_256
+MBEDTLS_PSA_BUILTIN_ECC_SECP_R1_192
+MBEDTLS_PSA_BUILTIN_ECC_SECP_R1_256
+MBEDTLS_PSA_BUILTIN_ECC_SECP_R1_384
+MBEDTLS_PSA_BUILTIN_ECC_SECP_R1_521
+MBEDTLS_PSA_BUILTIN_GET_ENTROPY_DEFINED
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_AES
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_ARIA
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_CAMELLIA
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_CHACHA20
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_DES
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_BASIC
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_EXPORT
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_GENERATE
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_IMPORT
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR_BASIC
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR_DERIVE
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR_EXPORT
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR_GENERATE
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR_IMPORT
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_PUBLIC_KEY
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR_BASIC
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR_EXPORT
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR_GENERATE
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR_IMPORT
+MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_PUBLIC_KEY
+MBEDTLS_PSA_BUILTIN_PAKE
+MBEDTLS_PSA_CRYPTO_CLIENT
+MBEDTLS_PSA_CRYPTO_RNG_HASH
+MBEDTLS_PSA_CRYPTO_RNG_STRENGTH
+MBEDTLS_PSA_DH_ACCEL_INCOMPLETE_ALGS
+MBEDTLS_PSA_DH_ACCEL_INCOMPLETE_GROUPS
+MBEDTLS_PSA_DH_ACCEL_INCOMPLETE_KEY_TYPES
+MBEDTLS_PSA_DRIVER_GET_ENTROPY
+MBEDTLS_PSA_DRIVER_GET_ENTROPY_DEFINED
+MBEDTLS_PSA_ECC_ACCEL_INCOMPLETE_ALGS
+MBEDTLS_PSA_ECC_ACCEL_INCOMPLETE_CURVES
+MBEDTLS_PSA_ECC_ACCEL_INCOMPLETE_KEY_TYPES
+MBEDTLS_PSA_ECC_ACCEL_INCOMPLETE_KEY_TYPES_BASIC
+MBEDTLS_PSA_ECC_ACCEL_INCOMPLETE_WEIERSTRASS_CURVES
+MBEDTLS_RIPEMD160_C
+MBEDTLS_RSA_C
+MBEDTLS_SHA1_C
+MBEDTLS_SHA224_C
+MBEDTLS_SHA256_C
+MBEDTLS_SHA256_USE_ARMV8_A_CRYPTO_IF_PRESENT
+MBEDTLS_SHA256_USE_ARMV8_A_CRYPTO_ONLY
+MBEDTLS_SHA384_C
+MBEDTLS_SHA512_C
+MBEDTLS_SSL_HAVE_AEAD
+MBEDTLS_USE_PSA_CRYPTO
+PSA_CRYPTO_ADJUST_AUTO_ENABLED_H
+PSA_CRYPTO_ADJUST_CONFIG_DEPENDENCIES_H
+PSA_CRYPTO_ADJUST_CONFIG_DERIVED_H
+PSA_CRYPTO_ADJUST_CONFIG_SYNONYMS_H
+PSA_CRYPTO_ADJUST_KEYPAIR_TYPES_H
+PSA_HAVE_ALG_ECDSA_SIGN
+PSA_HAVE_ALG_ECDSA_VERIFY
+PSA_HAVE_ALG_SOME_ECDSA
+PSA_HAVE_SOFT_BLOCK_CIPHER
+PSA_HAVE_SOFT_BLOCK_MODE
+PSA_HAVE_SOFT_KEY_TYPE_AES
+PSA_HAVE_SOFT_KEY_TYPE_ARIA
+PSA_HAVE_SOFT_KEY_TYPE_CAMELLIA
+PSA_HAVE_SOFT_KEY_TYPE_DES
+PSA_HAVE_SOFT_PBKDF2
+PSA_HAVE_SOFT_PBKDF2_CMAC
+PSA_HAVE_SOFT_PBKDF2_HMAC
+PSA_WANT_ALG_CMAC
+PSA_WANT_ALG_ECB_NO_PADDING
+PSA_WANT_ALG_ECDSA
+PSA_WANT_ALG_ECDSA_ANY
+PSA_WANT_ALG_HMAC
+PSA_WANT_ALG_MD5
+PSA_WANT_ALG_RIPEMD160
+PSA_WANT_ALG_RSA_PKCS1V15_SIGN
+PSA_WANT_ALG_RSA_PKCS1V15_SIGN_RAW
+PSA_WANT_ALG_RSA_PSS
+PSA_WANT_ALG_RSA_PSS_ANY_SALT
+PSA_WANT_ALG_SHA_1
+PSA_WANT_ALG_SHA_224
+PSA_WANT_ALG_SHA_256
+PSA_WANT_ALG_SHA_384
+PSA_WANT_ALG_SHA_512
+PSA_WANT_ALG_SOME_PAKE
+PSA_WANT_ECC_BRAINPOOL_P_R1_256
+PSA_WANT_ECC_BRAINPOOL_P_R1_384
+PSA_WANT_ECC_BRAINPOOL_P_R1_512
+PSA_WANT_ECC_MONTGOMERY_255
+PSA_WANT_ECC_MONTGOMERY_448
+PSA_WANT_ECC_SECP_K1_192
+PSA_WANT_ECC_SECP_K1_256
+PSA_WANT_ECC_SECP_R1_192
+PSA_WANT_ECC_SECP_R1_256
+PSA_WANT_ECC_SECP_R1_384
+PSA_WANT_ECC_SECP_R1_521
+PSA_WANT_KEY_TYPE_AES
+PSA_WANT_KEY_TYPE_DERIVE
+PSA_WANT_KEY_TYPE_DH_KEY_PAIR_BASIC
+PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT
+PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT
+PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY
+PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC
+PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT
+PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT
+PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
+PSA_WANT_KEY_TYPE_HMAC
+PSA_WANT_KEY_TYPE_PASSWORD
+PSA_WANT_KEY_TYPE_PASSWORD_HASH
+PSA_WANT_KEY_TYPE_RAW_DATA
+PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
+PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT
+PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT
+PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
diff --git a/history/config-options-mbedtls-4.0.txt b/history/config-options-mbedtls-4.0.txt
new file mode 100644
index 000000000..cadd768dc
--- /dev/null
+++ b/history/config-options-mbedtls-4.0.txt
@@ -0,0 +1,78 @@
+MBEDTLS_CONFIG_FILE
+MBEDTLS_CONFIG_VERSION
+MBEDTLS_DEBUG_C
+MBEDTLS_ERROR_C
+MBEDTLS_ERROR_STRERROR_DUMMY
+MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
+MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
+MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
+MBEDTLS_NET_C
+MBEDTLS_PKCS7_C
+MBEDTLS_PSK_MAX_LEN
+MBEDTLS_SSL_ALL_ALERT_MESSAGES
+MBEDTLS_SSL_ALPN
+MBEDTLS_SSL_ASYNC_PRIVATE
+MBEDTLS_SSL_CACHE_C
+MBEDTLS_SSL_CACHE_DEFAULT_MAX_ENTRIES
+MBEDTLS_SSL_CACHE_DEFAULT_TIMEOUT
+MBEDTLS_SSL_CID_IN_LEN_MAX
+MBEDTLS_SSL_CID_OUT_LEN_MAX
+MBEDTLS_SSL_CID_TLS1_3_PADDING_GRANULARITY
+MBEDTLS_SSL_CIPHERSUITES
+MBEDTLS_SSL_CLI_C
+MBEDTLS_SSL_CONTEXT_SERIALIZATION
+MBEDTLS_SSL_COOKIE_C
+MBEDTLS_SSL_COOKIE_TIMEOUT
+MBEDTLS_SSL_DEBUG_ALL
+MBEDTLS_SSL_DTLS_ANTI_REPLAY
+MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE
+MBEDTLS_SSL_DTLS_CONNECTION_ID
+MBEDTLS_SSL_DTLS_HELLO_VERIFY
+MBEDTLS_SSL_DTLS_MAX_BUFFERING
+MBEDTLS_SSL_DTLS_SRTP
+MBEDTLS_SSL_EARLY_DATA
+MBEDTLS_SSL_ENCRYPT_THEN_MAC
+MBEDTLS_SSL_EXTENDED_MASTER_SECRET
+MBEDTLS_SSL_IN_CONTENT_LEN
+MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
+MBEDTLS_SSL_KEYING_MATERIAL_EXPORT
+MBEDTLS_SSL_MAX_EARLY_DATA_SIZE
+MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
+MBEDTLS_SSL_OUT_CONTENT_LEN
+MBEDTLS_SSL_PROTO_DTLS
+MBEDTLS_SSL_PROTO_TLS1_2
+MBEDTLS_SSL_PROTO_TLS1_3
+MBEDTLS_SSL_RECORD_SIZE_LIMIT
+MBEDTLS_SSL_RENEGOTIATION
+MBEDTLS_SSL_SERVER_NAME_INDICATION
+MBEDTLS_SSL_SESSION_TICKETS
+MBEDTLS_SSL_SRV_C
+MBEDTLS_SSL_TICKET_C
+MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
+MBEDTLS_SSL_TLS1_3_DEFAULT_NEW_SESSION_TICKETS
+MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED
+MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED
+MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED
+MBEDTLS_SSL_TLS1_3_TICKET_AGE_TOLERANCE
+MBEDTLS_SSL_TLS1_3_TICKET_NONCE_LENGTH
+MBEDTLS_SSL_TLS_C
+MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH
+MBEDTLS_TIMING_ALT
+MBEDTLS_TIMING_C
+MBEDTLS_USER_CONFIG_FILE
+MBEDTLS_VERSION_C
+MBEDTLS_VERSION_FEATURES
+MBEDTLS_X509_CREATE_C
+MBEDTLS_X509_CRL_PARSE_C
+MBEDTLS_X509_CRT_PARSE_C
+MBEDTLS_X509_CRT_WRITE_C
+MBEDTLS_X509_CSR_PARSE_C
+MBEDTLS_X509_CSR_WRITE_C
+MBEDTLS_X509_MAX_FILE_PATH_LEN
+MBEDTLS_X509_MAX_INTERMEDIATE_CA
+MBEDTLS_X509_REMOVE_INFO
+MBEDTLS_X509_RSASSA_PSS_SUPPORT
+MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK
+MBEDTLS_X509_USE_C
diff --git a/history/config-options-tfpsacrypto-1.0.txt b/history/config-options-tfpsacrypto-1.0.txt
new file mode 100644
index 000000000..d8458a8ff
--- /dev/null
+++ b/history/config-options-tfpsacrypto-1.0.txt
@@ -0,0 +1,242 @@
+MBEDTLS_AESCE_C
+MBEDTLS_AESNI_C
+MBEDTLS_AES_FEWER_TABLES
+MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH
+MBEDTLS_AES_ROM_TABLES
+MBEDTLS_AES_USE_HARDWARE_ONLY
+MBEDTLS_ASN1_PARSE_C
+MBEDTLS_ASN1_WRITE_C
+MBEDTLS_BASE64_C
+MBEDTLS_BIGNUM_C
+MBEDTLS_BLOCK_CIPHER_NO_DECRYPT
+MBEDTLS_CAMELLIA_SMALL_MEMORY
+MBEDTLS_CHECK_RETURN
+MBEDTLS_CHECK_RETURN_WARNING
+MBEDTLS_CIPHER_NULL_CIPHER
+MBEDTLS_CTR_DRBG_C
+MBEDTLS_DEPRECATED_REMOVED
+MBEDTLS_DEPRECATED_WARNING
+MBEDTLS_ECDH_C
+MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED
+MBEDTLS_ECDSA_C
+MBEDTLS_ECJPAKE_C
+MBEDTLS_ECP_C
+MBEDTLS_ECP_DP_BP256R1_ENABLED
+MBEDTLS_ECP_DP_BP384R1_ENABLED
+MBEDTLS_ECP_DP_BP512R1_ENABLED
+MBEDTLS_ECP_DP_CURVE25519_ENABLED
+MBEDTLS_ECP_DP_CURVE448_ENABLED
+MBEDTLS_ECP_DP_SECP192K1_ENABLED
+MBEDTLS_ECP_DP_SECP192R1_ENABLED
+MBEDTLS_ECP_DP_SECP256K1_ENABLED
+MBEDTLS_ECP_DP_SECP256R1_ENABLED
+MBEDTLS_ECP_DP_SECP384R1_ENABLED
+MBEDTLS_ECP_DP_SECP521R1_ENABLED
+MBEDTLS_ECP_FIXED_POINT_OPTIM
+MBEDTLS_ECP_NIST_OPTIM
+MBEDTLS_ECP_RESTARTABLE
+MBEDTLS_ECP_WINDOW_SIZE
+MBEDTLS_ECP_WITH_MPI_UINT
+MBEDTLS_ENTROPY_NO_SOURCES_OK
+MBEDTLS_ENTROPY_NV_SEED
+MBEDTLS_FS_IO
+MBEDTLS_GCM_LARGE_TABLE
+MBEDTLS_HAVE_ASM
+MBEDTLS_HAVE_SSE2
+MBEDTLS_HAVE_TIME
+MBEDTLS_HAVE_TIME_DATE
+MBEDTLS_HMAC_DRBG_C
+MBEDTLS_IGNORE_RETURN
+MBEDTLS_LMS_C
+MBEDTLS_LMS_PRIVATE
+MBEDTLS_MD_C
+MBEDTLS_MEMORY_ALIGN_MULTIPLE
+MBEDTLS_MEMORY_BACKTRACE
+MBEDTLS_MEMORY_BUFFER_ALLOC_C
+MBEDTLS_MEMORY_DEBUG
+MBEDTLS_MPI_MAX_SIZE
+MBEDTLS_MPI_WINDOW_SIZE
+MBEDTLS_NIST_KW_C
+MBEDTLS_NO_64BIT_MULTIPLICATION
+MBEDTLS_NO_UDBL_DIVISION
+MBEDTLS_PEM_PARSE_C
+MBEDTLS_PEM_WRITE_C
+MBEDTLS_PKCS5_C
+MBEDTLS_PK_C
+MBEDTLS_PK_PARSE_C
+MBEDTLS_PK_PARSE_EC_COMPRESSED
+MBEDTLS_PK_PARSE_EC_EXTENDED
+MBEDTLS_PK_WRITE_C
+MBEDTLS_PLATFORM_C
+MBEDTLS_PLATFORM_CALLOC_MACRO
+MBEDTLS_PLATFORM_EXIT_ALT
+MBEDTLS_PLATFORM_EXIT_MACRO
+MBEDTLS_PLATFORM_FPRINTF_ALT
+MBEDTLS_PLATFORM_FPRINTF_MACRO
+MBEDTLS_PLATFORM_FREE_MACRO
+MBEDTLS_PLATFORM_GET_ENTROPY_ALT
+MBEDTLS_PLATFORM_GMTIME_R_ALT
+MBEDTLS_PLATFORM_MEMORY
+MBEDTLS_PLATFORM_MS_TIME_ALT
+MBEDTLS_PLATFORM_MS_TIME_TYPE_MACRO
+MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+MBEDTLS_PLATFORM_NV_SEED_ALT
+MBEDTLS_PLATFORM_NV_SEED_READ_MACRO
+MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO
+MBEDTLS_PLATFORM_PRINTF_ALT
+MBEDTLS_PLATFORM_PRINTF_MACRO
+MBEDTLS_PLATFORM_SETBUF_ALT
+MBEDTLS_PLATFORM_SETBUF_MACRO
+MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT
+MBEDTLS_PLATFORM_SNPRINTF_ALT
+MBEDTLS_PLATFORM_SNPRINTF_MACRO
+MBEDTLS_PLATFORM_STD_CALLOC
+MBEDTLS_PLATFORM_STD_EXIT
+MBEDTLS_PLATFORM_STD_EXIT_FAILURE
+MBEDTLS_PLATFORM_STD_EXIT_SUCCESS
+MBEDTLS_PLATFORM_STD_FPRINTF
+MBEDTLS_PLATFORM_STD_FREE
+MBEDTLS_PLATFORM_STD_MEM_HDR
+MBEDTLS_PLATFORM_STD_NV_SEED_FILE
+MBEDTLS_PLATFORM_STD_NV_SEED_READ
+MBEDTLS_PLATFORM_STD_NV_SEED_WRITE
+MBEDTLS_PLATFORM_STD_PRINTF
+MBEDTLS_PLATFORM_STD_SETBUF
+MBEDTLS_PLATFORM_STD_SNPRINTF
+MBEDTLS_PLATFORM_STD_TIME
+MBEDTLS_PLATFORM_TIME_ALT
+MBEDTLS_PLATFORM_TIME_MACRO
+MBEDTLS_PLATFORM_TIME_TYPE_MACRO
+MBEDTLS_PLATFORM_VSNPRINTF_ALT
+MBEDTLS_PLATFORM_VSNPRINTF_MACRO
+MBEDTLS_PLATFORM_ZEROIZE_ALT
+MBEDTLS_PRINTF_MS_TIME
+MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS
+MBEDTLS_PSA_BUILTIN_GET_ENTROPY
+MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS
+MBEDTLS_PSA_CRYPTO_C
+MBEDTLS_PSA_CRYPTO_CLIENT
+MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
+MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER
+MBEDTLS_PSA_CRYPTO_PLATFORM_FILE
+MBEDTLS_PSA_CRYPTO_RNG_HASH
+MBEDTLS_PSA_CRYPTO_RNG_STRENGTH
+MBEDTLS_PSA_CRYPTO_SPM
+MBEDTLS_PSA_CRYPTO_STORAGE_C
+MBEDTLS_PSA_CRYPTO_STRUCT_FILE
+MBEDTLS_PSA_DRIVER_GET_ENTROPY
+MBEDTLS_PSA_ITS_FILE_C
+MBEDTLS_PSA_KEY_SLOT_COUNT
+MBEDTLS_PSA_KEY_STORE_DYNAMIC
+MBEDTLS_PSA_P256M_DRIVER_ENABLED
+MBEDTLS_PSA_RNG_RESEED_INTERVAL
+MBEDTLS_PSA_STATIC_KEY_SLOTS
+MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE
+MBEDTLS_RSA_GEN_KEY_MIN_BITS
+MBEDTLS_RSA_NO_CRT
+MBEDTLS_SELF_TEST
+MBEDTLS_SHA256_SMALLER
+MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT
+MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY
+MBEDTLS_SHA256_USE_ARMV8_A_CRYPTO_IF_PRESENT
+MBEDTLS_SHA256_USE_ARMV8_A_CRYPTO_ONLY
+MBEDTLS_SHA512_SMALLER
+MBEDTLS_SHA512_USE_A64_CRYPTO_IF_PRESENT
+MBEDTLS_SHA512_USE_A64_CRYPTO_ONLY
+MBEDTLS_TEST_CONSTANT_FLOW_MEMSAN
+MBEDTLS_TEST_CONSTANT_FLOW_VALGRIND
+MBEDTLS_TEST_HOOKS
+MBEDTLS_THREADING_ALT
+MBEDTLS_THREADING_C
+MBEDTLS_THREADING_PTHREAD
+PSA_CRYPTO_CONFIG_H
+PSA_WANT_ALG_CBC_NO_PADDING
+PSA_WANT_ALG_CBC_PKCS7
+PSA_WANT_ALG_CCM
+PSA_WANT_ALG_CCM_STAR_NO_TAG
+PSA_WANT_ALG_CFB
+PSA_WANT_ALG_CHACHA20_POLY1305
+PSA_WANT_ALG_CMAC
+PSA_WANT_ALG_CTR
+PSA_WANT_ALG_DETERMINISTIC_ECDSA
+PSA_WANT_ALG_ECB_NO_PADDING
+PSA_WANT_ALG_ECDH
+PSA_WANT_ALG_ECDSA
+PSA_WANT_ALG_FFDH
+PSA_WANT_ALG_GCM
+PSA_WANT_ALG_HKDF
+PSA_WANT_ALG_HKDF_EXPAND
+PSA_WANT_ALG_HKDF_EXTRACT
+PSA_WANT_ALG_HMAC
+PSA_WANT_ALG_JPAKE
+PSA_WANT_ALG_MD5
+PSA_WANT_ALG_OFB
+PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
+PSA_WANT_ALG_PBKDF2_HMAC
+PSA_WANT_ALG_RIPEMD160
+PSA_WANT_ALG_RSA_OAEP
+PSA_WANT_ALG_RSA_PKCS1V15_CRYPT
+PSA_WANT_ALG_RSA_PKCS1V15_SIGN
+PSA_WANT_ALG_RSA_PSS
+PSA_WANT_ALG_SHA3_224
+PSA_WANT_ALG_SHA3_256
+PSA_WANT_ALG_SHA3_384
+PSA_WANT_ALG_SHA3_512
+PSA_WANT_ALG_SHA_1
+PSA_WANT_ALG_SHA_224
+PSA_WANT_ALG_SHA_256
+PSA_WANT_ALG_SHA_384
+PSA_WANT_ALG_SHA_512
+PSA_WANT_ALG_STREAM_CIPHER
+PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS
+PSA_WANT_ALG_TLS12_PRF
+PSA_WANT_ALG_TLS12_PSK_TO_MS
+PSA_WANT_DH_RFC7919_2048
+PSA_WANT_DH_RFC7919_3072
+PSA_WANT_DH_RFC7919_4096
+PSA_WANT_DH_RFC7919_6144
+PSA_WANT_DH_RFC7919_8192
+PSA_WANT_ECC_BRAINPOOL_P_R1_256
+PSA_WANT_ECC_BRAINPOOL_P_R1_384
+PSA_WANT_ECC_BRAINPOOL_P_R1_512
+PSA_WANT_ECC_MONTGOMERY_255
+PSA_WANT_ECC_MONTGOMERY_448
+PSA_WANT_ECC_SECP_K1_192
+PSA_WANT_ECC_SECP_K1_256
+PSA_WANT_ECC_SECP_R1_192
+PSA_WANT_ECC_SECP_R1_256
+PSA_WANT_ECC_SECP_R1_384
+PSA_WANT_ECC_SECP_R1_521
+PSA_WANT_KEY_TYPE_AES
+PSA_WANT_KEY_TYPE_ARIA
+PSA_WANT_KEY_TYPE_CAMELLIA
+PSA_WANT_KEY_TYPE_CHACHA20
+PSA_WANT_KEY_TYPE_DERIVE
+PSA_WANT_KEY_TYPE_DES
+PSA_WANT_KEY_TYPE_DH_KEY_PAIR_BASIC
+PSA_WANT_KEY_TYPE_DH_KEY_PAIR_DERIVE
+PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT
+PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE
+PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT
+PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY
+PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
+PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC
+PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
+PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT
+PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE
+PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT
+PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
+PSA_WANT_KEY_TYPE_HMAC
+PSA_WANT_KEY_TYPE_PASSWORD
+PSA_WANT_KEY_TYPE_PASSWORD_HASH
+PSA_WANT_KEY_TYPE_RAW_DATA
+PSA_WANT_KEY_TYPE_RSA_KEY_PAIR
+PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
+PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE
+PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT
+PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
+PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT
+PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
+TF_PSA_CRYPTO_CONFIG_FILE
+TF_PSA_CRYPTO_USER_CONFIG_FILE
+TF_PSA_CRYPTO_VERSION