diff options
| author | Gilles Peskine <Gilles.Peskine@arm.com> | 2021-05-20 10:40:48 +0200 |
|---|---|---|
| committer | Gilles Peskine <Gilles.Peskine@arm.com> | 2021-05-20 10:40:48 +0200 |
| commit | eb30b0cc3918cb100b180f43d4bc0ff22b9d834f (patch) | |
| tree | 9962ffce718ca340254a3d71e146da425a9aa3f5 /Makefile | |
| parent | a13deaf98610c1d3c24549fb9d30476171501143 (diff) | |
| parent | 729fa5be886b7d3b7e9cef883ad553dff97f10d4 (diff) | |
| download | mbedtls-eb30b0cc3918cb100b180f43d4bc0ff22b9d834f.zip mbedtls-eb30b0cc3918cb100b180f43d4bc0ff22b9d834f.tar.gz mbedtls-eb30b0cc3918cb100b180f43d4bc0ff22b9d834f.tar.bz2 | |
Merge remote-tracking branch 'upstream-public/development' into no-generated-files-3.0
Conflicts: generated files that are removed in this branch and have
changed in development. Resolved by keeping the files removed.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 0 insertions, 9 deletions
@@ -91,12 +91,6 @@ uninstall: done endif -WARNING_BORDER =*******************************************************\n -NULL_ENTROPY_WARN_L1=**** WARNING! MBEDTLS_TEST_NULL_ENTROPY defined! ****\n -NULL_ENTROPY_WARN_L2=**** THIS BUILD HAS NO DEFINED ENTROPY SOURCES ****\n -NULL_ENTROPY_WARN_L3=**** AND IS *NOT* SUITABLE FOR PRODUCTION USE ****\n - -NULL_ENTROPY_WARNING=\n$(WARNING_BORDER)$(NULL_ENTROPY_WARN_L1)$(NULL_ENTROPY_WARN_L2)$(NULL_ENTROPY_WARN_L3)$(WARNING_BORDER) WARNING_BORDER_LONG =**********************************************************************************\n CTR_DRBG_128_BIT_KEY_WARN_L1=**** WARNING! MBEDTLS_CTR_DRBG_USE_128_BIT_KEY defined! ****\n @@ -113,9 +107,6 @@ ifndef WINDOWS -scripts/config.py get MBEDTLS_CTR_DRBG_USE_128_BIT_KEY && ([ $$? -eq 0 ]) && \ echo '$(CTR_DRBG_128_BIT_KEY_WARNING)' - # If NULL Entropy is configured, display an appropriate warning - -scripts/config.py get MBEDTLS_TEST_NULL_ENTROPY && ([ $$? -eq 0 ]) && \ - echo '$(NULL_ENTROPY_WARNING)' endif clean: clean_more_on_top |