Skip to content

Commit a0b1c8c

Browse files
build: Remove CTR_DRBG 128 bits key warnings
Signed-off-by: Ronald Cron <[email protected]>
1 parent aad5f1b commit a0b1c8c

File tree

2 files changed

+0
-40
lines changed

2 files changed

+0
-40
lines changed

CMakeLists.txt

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -100,17 +100,6 @@ option(USE_SHARED_MBEDTLS_LIBRARY "Build Mbed TLS shared library." OFF)
100100
option(LINK_WITH_PTHREAD "Explicitly link Mbed TLS library to pthread." OFF)
101101
option(LINK_WITH_TRUSTED_STORAGE "Explicitly link Mbed TLS library to trusted_storage." OFF)
102102

103-
# Warning string - created as a list for compatibility with CMake 2.8
104-
set(CTR_DRBG_128_BIT_KEY_WARN_L1 "**** WARNING! MBEDTLS_CTR_DRBG_USE_128_BIT_KEY defined!\n")
105-
set(CTR_DRBG_128_BIT_KEY_WARN_L2 "**** Using 128-bit keys for CTR_DRBG limits the security of generated\n")
106-
set(CTR_DRBG_128_BIT_KEY_WARN_L3 "**** keys and operations that use random values generated to 128-bit security\n")
107-
108-
set(CTR_DRBG_128_BIT_KEY_WARNING "${WARNING_BORDER}"
109-
"${CTR_DRBG_128_BIT_KEY_WARN_L1}"
110-
"${CTR_DRBG_128_BIT_KEY_WARN_L2}"
111-
"${CTR_DRBG_128_BIT_KEY_WARN_L3}"
112-
"${WARNING_BORDER}")
113-
114103
# Python 3 is only needed here to check for configuration warnings.
115104
if(NOT CMAKE_VERSION VERSION_LESS 3.15.0)
116105
set(Python3_FIND_STRATEGY LOCATION)
@@ -124,16 +113,6 @@ else()
124113
set(MBEDTLS_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})
125114
endif()
126115
endif()
127-
if(MBEDTLS_PYTHON_EXECUTABLE)
128-
129-
# If 128-bit keys are configured for CTR_DRBG, display an appropriate warning
130-
execute_process(COMMAND ${MBEDTLS_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/config.py -f ${CMAKE_CURRENT_SOURCE_DIR}/include/mbedtls/mbedtls_config.h get MBEDTLS_CTR_DRBG_USE_128_BIT_KEY
131-
RESULT_VARIABLE result)
132-
if(${result} EQUAL 0)
133-
message(WARNING ${CTR_DRBG_128_BIT_KEY_WARNING})
134-
endif()
135-
136-
endif()
137116

138117
# We now potentially need to link all executables against PThreads, if available
139118
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)

Makefile

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ endif
2626
.PHONY: all no_test programs lib tests install uninstall clean test check lcov apidoc apidoc_clean
2727

2828
all: programs tests
29-
$(MAKE) post_build
3029

3130
no_test: programs
3231

@@ -146,24 +145,6 @@ uninstall:
146145
done
147146
endif
148147

149-
150-
WARNING_BORDER_LONG =**********************************************************************************\n
151-
CTR_DRBG_128_BIT_KEY_WARN_L1=**** WARNING! MBEDTLS_CTR_DRBG_USE_128_BIT_KEY defined! ****\n
152-
CTR_DRBG_128_BIT_KEY_WARN_L2=**** Using 128-bit keys for CTR_DRBG limits the security of generated ****\n
153-
CTR_DRBG_128_BIT_KEY_WARN_L3=**** keys and operations that use random values generated to 128-bit security ****\n
154-
155-
CTR_DRBG_128_BIT_KEY_WARNING=\n$(WARNING_BORDER_LONG)$(CTR_DRBG_128_BIT_KEY_WARN_L1)$(CTR_DRBG_128_BIT_KEY_WARN_L2)$(CTR_DRBG_128_BIT_KEY_WARN_L3)$(WARNING_BORDER_LONG)
156-
157-
# Post build steps
158-
post_build:
159-
ifndef WINDOWS
160-
161-
# If 128-bit keys are configured for CTR_DRBG, display an appropriate warning
162-
-scripts/config.py get MBEDTLS_CTR_DRBG_USE_128_BIT_KEY && ([ $$? -eq 0 ]) && \
163-
echo '$(CTR_DRBG_128_BIT_KEY_WARNING)'
164-
165-
endif
166-
167148
clean: clean_more_on_top
168149
$(MAKE) -C library clean
169150
$(MAKE) -C programs clean

0 commit comments

Comments
 (0)