From 8eae4bf15956958f6f3d7a1891ba9b65f362a3d4 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 22 Jul 2024 17:10:44 -0700 Subject: TLS: Stop making the licensing message a warning - notice is sufficient. Also, while here, prepare for PSK support to be conditional -- it is not necessarily on by default in all future engines (e.g. WolfSSL.) --- src/supplemental/tls/mbedtls/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/supplemental/tls/mbedtls/CMakeLists.txt b/src/supplemental/tls/mbedtls/CMakeLists.txt index 7e24e299..27cf8927 100644 --- a/src/supplemental/tls/mbedtls/CMakeLists.txt +++ b/src/supplemental/tls/mbedtls/CMakeLists.txt @@ -8,7 +8,7 @@ # if (NNG_TLS_ENGINE STREQUAL "mbed") - message(WARNING " + message(NOTICE " ************************************************************ Linking against Mbed TLS may change license terms. Consult a lawyer and the license files for details. @@ -17,6 +17,9 @@ if (NNG_TLS_ENGINE STREQUAL "mbed") nng_defines(NNG_TLS_ENGINE_INIT=nng_tls_engine_init_mbed) nng_defines(NNG_TLS_ENGINE_FINI=nng_tls_engine_fini_mbed) nng_defines(NNG_SUPP_TLS) + # For now Mbed TLS has PSK unconditionally + nng_defines(NNG_SUPP_TLS_PSK) + nng_defines(NNG_TLS_ENGINE_MBEDTLS) # If Mbed TLS was added by a consuming project, then we should use that # instance of it, instead of configuring our own. -- cgit v1.2.3-70-g09d2