aboutsummaryrefslogtreecommitdiff
path: root/src/supplemental
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2024-07-22 17:10:44 -0700
committerGarrett D'Amore <garrett@damore.org>2024-07-22 17:10:44 -0700
commit8eae4bf15956958f6f3d7a1891ba9b65f362a3d4 (patch)
treebff9740aa8dcc283e2e9d597ad7b1b7f44577fd5 /src/supplemental
parenteca19fc3d48728ea5c239964684c2afbe1cccdcf (diff)
downloadnng-8eae4bf15956958f6f3d7a1891ba9b65f362a3d4.tar.gz
nng-8eae4bf15956958f6f3d7a1891ba9b65f362a3d4.tar.bz2
nng-8eae4bf15956958f6f3d7a1891ba9b65f362a3d4.zip
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.)
Diffstat (limited to 'src/supplemental')
-rw-r--r--src/supplemental/tls/mbedtls/CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
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.