From 85174bf88c0fe3675b3125c2254f8d3389babca0 Mon Sep 17 00:00:00 2001
From: Joel Sing <jsing@cvs.openbsd.org>
Date: Sat, 7 Apr 2018 16:31:00 +0000
Subject: Switch to OPENSSL_init_ssl() and prevent an openssl configuration
 file from being loaded behind our back, at a later point.

ok beck@
---
 lib/libtls/tls.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/libtls/tls.c b/lib/libtls/tls.c
index 467db164d5d..6033e846ba5 100644
--- a/lib/libtls/tls.c
+++ b/lib/libtls/tls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls.c,v 1.79 2018/03/19 16:34:47 jsing Exp $ */
+/* $OpenBSD: tls.c,v 1.80 2018/04/07 16:30:59 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -41,8 +41,7 @@ static int tls_init_rv = -1;
 static void
 tls_do_init(void)
 {
-	SSL_load_error_strings();
-	SSL_library_init();
+	OPENSSL_init_ssl(OPENSSL_INIT_NO_LOAD_CONFIG, NULL);
 
 	if (BIO_sock_init() != 1)
 		return;
-- 
cgit v1.2.3