Automatically handle library initialisation for libtls.

Now that we have tls_init() under pthread_once(), automatically initialise
libtls from the entry point functions (tls_config(), tls_client() and
tls_server()) - this makes an explicit tls_init() call no longer a
requirement.

ok bcook@ beck@ inoguchi@

1 files changed, 11 insertions, 2 deletions

diff --git a/src/lib/libtls/tls_config.c b/src/lib/libtls/tls_config.c
index 2dab4fc7d8..02f2b3c6e9 100644
--- a/src/lib/libtls/tls_config.c
+++ b/src/lib/libtls/tls_config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_config.c,v 1.49 2018/02/10 04:57:35 jsing Exp $ */
+/* $OpenBSD: tls_config.c,v 1.50 2018/03/19 16:34:47 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -77,7 +77,7 @@ tls_config_load_file(struct tls_error *error, const char *filetype,
 }
 
 struct tls_config *
-tls_config_new(void)
+tls_config_new_internal(void)
 {
         struct tls_config *config;
         unsigned char sid[TLS_MAX_SESSION_ID_LENGTH];
@@ -128,6 +128,15 @@ tls_config_new(void)
         return (NULL);
 }
 
+struct tls_config *
+tls_config_new(void)
+{
+        if (tls_init() == -1)
+                return (NULL);
+
+        return tls_config_new_internal();
+}
+
 void
 tls_config_free(struct tls_config *config)
 {