diff options
| author | Gilles Peskine <Gilles.Peskine@arm.com> | 2018-03-13 17:15:34 +0100 |
|---|---|---|
| committer | Gilles Peskine <Gilles.Peskine@arm.com> | 2018-03-13 17:15:34 +0100 |
| commit | 553a06f08a4ece8c4276336e999e7e4a6ac5f464 (patch) | |
| tree | 9d0405476e496b7863dc156a9b387b9ca26aaff9 /scripts | |
| parent | f3ada4adb00723a540a77de88a2831313b443190 (diff) | |
| parent | 6f486a6fb5c7311a8d07913778b53f128ec37cd8 (diff) | |
Merge remote-tracking branch 'upstream-restricted/pr/351' into development-restricted-proposed
Move the added ChangeLog entry to the bottom so that the list remains
in merge order.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/config.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/config.pl b/scripts/config.pl index 76ca4709..5bf27859 100755 --- a/scripts/config.pl +++ b/scripts/config.pl @@ -17,7 +17,7 @@ # # Full usage description provided below. # -# Things that shouldn't be enabled with "full". +# The following options are disabled instead of enabled with "full". # # MBEDTLS_TEST_NULL_ENTROPY # MBEDTLS_DEPRECATED_REMOVED @@ -30,6 +30,7 @@ # MBEDTLS_NO_PLATFORM_ENTROPY # MBEDTLS_REMOVE_ARC4_CIPHERSUITES # MBEDTLS_SSL_HW_RECORD_ACCEL +# MBEDTLS_RSA_NO_CRT # MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3 # MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION # - this could be enabled if the respective tests were adapted @@ -86,6 +87,7 @@ MBEDTLS_ECP_DP_M383_ENABLED MBEDTLS_ECP_DP_M511_ENABLED MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES MBEDTLS_NO_PLATFORM_ENTROPY +MBEDTLS_RSA_NO_CRT MBEDTLS_REMOVE_ARC4_CIPHERSUITES MBEDTLS_SSL_HW_RECORD_ACCEL MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3 |