summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2018-04-07 16:31:00 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2018-04-07 16:31:00 +0000
commit85174bf88c0fe3675b3125c2254f8d3389babca0 (patch)
treeaab43ab5d7e29a5162793d209bd4d456d3770505
parent0766dce9cec6a92ecc2fb77c23132fec169b746f (diff)
Switch to OPENSSL_init_ssl() and prevent an openssl configuration file from
being loaded behind our back, at a later point. ok beck@
-rw-r--r--lib/libtls/tls.c5
1 files 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;