summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2023-11-22 15:49:47 +0000
committertb <>2023-11-22 15:49:47 +0000
commit4c0a26334ce1124fb6f4671a6e30c9ac2b1e2d12 (patch)
tree6da9f4f4cf2f236750e1b27cd17c27eb66cfa0f4
parentb5304ec46136934578ac0067cc6dbb300eb75fbd (diff)
downloadopenbsd-4c0a26334ce1124fb6f4671a6e30c9ac2b1e2d12.tar.gz
openbsd-4c0a26334ce1124fb6f4671a6e30c9ac2b1e2d12.tar.bz2
openbsd-4c0a26334ce1124fb6f4671a6e30c9ac2b1e2d12.zip
Stop calling SSL_library_init() from OPENSSL_init_ssl_internal()
It's pointless: all the ciphers and digests added by SSL_library_init() are already added by OPENSSL_init_crypto(), which was already called at that point. ok jsing
-rw-r--r--src/lib/libssl/ssl_init.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_init.c b/src/lib/libssl/ssl_init.c
index a8646cc092..7df48fb6a0 100644
--- a/src/lib/libssl/ssl_init.c
+++ b/src/lib/libssl/ssl_init.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_init.c,v 1.4 2023/07/08 16:40:13 beck Exp $ */ 1/* $OpenBSD: ssl_init.c,v 1.5 2023/11/22 15:49:47 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2018 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2018 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -31,7 +31,6 @@ OPENSSL_init_ssl_internal(void)
31{ 31{
32 ssl_init_thread = pthread_self(); 32 ssl_init_thread = pthread_self();
33 SSL_load_error_strings(); 33 SSL_load_error_strings();
34 SSL_library_init();
35} 34}
36 35
37int 36int