diff options
author | jsing <> | 2018-04-07 16:30:59 +0000 |
---|---|---|
committer | jsing <> | 2018-04-07 16:30:59 +0000 |
commit | 769107a3cc2677b916ec7283d1b1c89df9fbb318 (patch) | |
tree | b6959166713de0497637ac2bc86b5a2164b2734e /src | |
parent | 17090ee069575edabdb214399223ac32ebe4fa6b (diff) | |
download | openbsd-769107a3cc2677b916ec7283d1b1c89df9fbb318.tar.gz openbsd-769107a3cc2677b916ec7283d1b1c89df9fbb318.tar.bz2 openbsd-769107a3cc2677b916ec7283d1b1c89df9fbb318.zip |
Switch to OPENSSL_init_ssl() and prevent an openssl configuration file from
being loaded behind our back, at a later point.
ok beck@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libtls/tls.c | 5 |
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; | |||
41 | static void | 41 | static void |
42 | tls_do_init(void) | 42 | tls_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; |