Gilles Peskine d3d02900f2 Restore X509 and SSL functionality ... Look for changes that remove X509/SSL functionality. ``` git diff 'HEAD^{/^Merge}~1' HEAD --diff-filter=M -- . ':!library/error.c' ':!library/version_features.c' ':!programs/test/query_config.c' ':!visualc' ':!*.pdf' ':!*.der' | grep -E "^-.*MBEDTLS_(ERR_)?(PKCS11|X509|NET|SSL)_" ``` All of these removals are in `config.h` or `check_config.h`. Selectively revert the differences in these two files. ``` git diff 'HEAD^{/^Merge}~1' 'HEAD^{/^Merge}' include/mbedtls/config.h include/mbedtls/check_config.h | git apply -p1 -R ``` * `include/mbedtls/check_config.h`: * ARIA for GCM: don't remove it. * `MBEDTLS_PSA_CRYPTO_SE_C`: don't remove it. * `MBEDTLS_SHA512_NO_SHA384`: don't remove it. * `MBEDTLS_SSL_DTLS_CONNECTION_ID`: restore it. * `include/mbedtls/config.h`: * warning about `MBEDTLS_ECDSA_SIGN_ALT`: don't remove it. * `MBEDTLS_CTR_DRBG_USE_128_BIT_KEY` full paragraph: don't remove it. * `MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER`: don't remove it. * `MBEDTLS_SHA512_SMALLER`…: don't remove it. * `MBEDTLS_SSL_RECORD_CHECKING`: restore it. * `MBEDTLS_SSL_CONTEXT_SERIALIZATION`: restore it. * `MBEDTLS_USE_PSA_CRYPTO` note: don't restore the tls version. * `MBEDTLS_USE_PSA_CRYPTO` warning: restore the tls version. * `MBEDTLS_CMAC_C`: restore it to being disabled by default. It's a minor API change in Mbed TLS because it changes the layout of `mbedtls_cipher_context_t`. * `MBEDTLS_CTR_DRBG_C`: don't restore the older version of the description from tls. * `MBEDTLS_GCM_C`: don't restore the older description from tls. * `MBEDTLS_PSA_CRYPTO_C`: don't restore `crypto/`. * `MBEDTLS_PSA_CRYPTO_SE_C`: don't remove it. * `MBEDTLS_PSA_CRYPTO_STORAGE_C`: don't restore `crypto/`. Don't disable it by default. * `MBEDTLS_PSA_ITS_FILE_C`: don't restore, like for ``MBEDTLS_PSA_CRYPTO_STORAGE_C``. * `MBEDTLS_CTR_DRBG_USE_128_BIT_KEY` single line: don't restore it since there is now a full paragraph in the proper section above. * `MBEDTLS_SSL_CID_IN_LEN_MAX`…: restore it. * `MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_CERTIFICATES`: restore the version without a space to format the line like the others.		2020-03-23 17:55:31 +01:00
..
mbedtls	Restore X509 and SSL functionality	2020-03-23 17:55:31 +01:00
psa
.gitignore
CMakeLists.txt