fixes #456 TLS configuration object hold

fixes #776 Configuration of mbedTLS should warn about license

3 files changed, 18 insertions, 1 deletions

diff --git a/src/supplemental/tls/CMakeLists.txt b/src/supplemental/tls/CMakeLists.txt
index 3d1e6d02..111ff70f 100644
--- a/src/supplemental/tls/CMakeLists.txt
+++ b/src/supplemental/tls/CMakeLists.txt
@@ -19,7 +19,13 @@ set(_HDRS supplemental/tls/tls.h)
 # For now we only support the ARM mbedTLS library.
 if (NNG_SUPP_TLS_MBEDTLS)
 
-	Find_Package(mbedTLS REQUIRED)
+    message(WARNING "
+        ************************************************************
+        Linking against mbedTLS changes license terms (Apache 2.0).
+        Consult a lawyer and the license files for details.
+        ************************************************************")
+
+	find_package(mbedTLS REQUIRED)
 	set(_LIBS ${MBEDTLS_LIBRARIES})
 	set(_INCS ${MBEDTLS_INCLUDE_DIR})
 	list(APPEND _SRCS supplemental/tls/mbedtls/tls.c)
diff --git a/src/supplemental/tls/mbedtls/tls.c b/src/supplemental/tls/mbedtls/tls.c
index 8f38df64..f7431ac6 100644
--- a/src/supplemental/tls/mbedtls/tls.c
+++ b/src/supplemental/tls/mbedtls/tls.c
@@ -1013,3 +1013,9 @@ nng_tls_config_free(nng_tls_config *cfg)
 {
 	nni_tls_config_fini(cfg);
 }
+
+void
+nng_tls_config_hold(nng_tls_config *cfg)
+{
+	nni_tls_config_hold(cfg);
+}
diff --git a/src/supplemental/tls/tls.h b/src/supplemental/tls/tls.h
index 62da9618..5983f3b6 100644
--- a/src/supplemental/tls/tls.h
+++ b/src/supplemental/tls/tls.h
@@ -41,6 +41,11 @@ typedef enum nng_tls_auth_mode {
 // with multiple pipes or services/servers.
 NNG_DECL int nng_tls_config_alloc(nng_tls_config **, nng_tls_mode);
 
+// nng_tls_config_hold increments the reference count on the TLS
+// configuration object.  The hold can be dropped by calling
+// nng_tls_config_free later.
+NNG_DECL void nng_tls_config_hold(nng_tls_config *);
+
 // nng_tls_config_free drops the reference count on the TLS
 // configuration object, and if zero, deallocates it.
 NNG_DECL void nng_tls_config_free(nng_tls_config *);