summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2018-04-07 16:30:59 +0000
committerjsing <>2018-04-07 16:30:59 +0000
commit9e6acdbfc336b22b66a0a01c53019f7f4ac612d9 (patch)
treeb6959166713de0497637ac2bc86b5a2164b2734e
parenta5bcb2846f05215006fdce3aae62b3b36e6795da (diff)
downloadopenbsd-9e6acdbfc336b22b66a0a01c53019f7f4ac612d9.tar.gz
openbsd-9e6acdbfc336b22b66a0a01c53019f7f4ac612d9.tar.bz2
openbsd-9e6acdbfc336b22b66a0a01c53019f7f4ac612d9.zip
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--src/lib/libtls/tls.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c
index 467db164d5..6033e846ba 100644
--- a/src/lib/libtls/tls.c
+++ b/src/lib/libtls/tls.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls.c,v 1.79 2018/03/19 16:34:47 jsing Exp $ */ 1/* $OpenBSD: tls.c,v 1.80 2018/04/07 16:30:59 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -41,8 +41,7 @@ static int tls_init_rv = -1;
41static void 41static void
42tls_do_init(void) 42tls_do_init(void)
43{ 43{
44 SSL_load_error_strings(); 44 OPENSSL_init_ssl(OPENSSL_INIT_NO_LOAD_CONFIG, NULL);
45 SSL_library_init();
46 45
47 if (BIO_sock_init() != 1) 46 if (BIO_sock_init() != 1)
48 return; 47 return;