diff options
| author | beck <> | 2017-04-29 22:31:42 +0000 |
|---|---|---|
| committer | beck <> | 2017-04-29 22:31:42 +0000 |
| commit | 61198dce4d3f6c83534a2d04eb35e4228fa933df (patch) | |
| tree | 14335a8b83640c01fa5b774fb057375d4c4c0c6d /src/lib/libssl/ssl_algs.c | |
| parent | d3a2ee4f706f181bef995fb0a446b0b92c03a2ac (diff) | |
| download | openbsd-61198dce4d3f6c83534a2d04eb35e4228fa933df.tar.gz openbsd-61198dce4d3f6c83534a2d04eb35e4228fa933df.tar.bz2 openbsd-61198dce4d3f6c83534a2d04eb35e4228fa933df.zip | |
Revert previous - we still want to do this, but I forgot about the installer
and want to avoid the wrath of theo when he arrives home in a couple
of hours :)
Diffstat (limited to 'src/lib/libssl/ssl_algs.c')
| -rw-r--r-- | src/lib/libssl/ssl_algs.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/lib/libssl/ssl_algs.c b/src/lib/libssl/ssl_algs.c index ab88b29cc1..ca84891e72 100644 --- a/src/lib/libssl/ssl_algs.c +++ b/src/lib/libssl/ssl_algs.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_algs.c,v 1.25 2017/04/29 21:54:54 beck Exp $ */ | 1 | /* $OpenBSD: ssl_algs.c,v 1.26 2017/04/29 22:31:42 beck Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -60,15 +60,13 @@ | |||
| 60 | 60 | ||
| 61 | #include <openssl/lhash.h> | 61 | #include <openssl/lhash.h> |
| 62 | #include <openssl/objects.h> | 62 | #include <openssl/objects.h> |
| 63 | #include <pthread.h> | ||
| 64 | 63 | ||
| 65 | #include "ssl_locl.h" | 64 | #include "ssl_locl.h" |
| 66 | 65 | ||
| 67 | pthread_once_t SSL_library_init_once = PTHREAD_ONCE_INIT; | 66 | int |
| 68 | 67 | SSL_library_init(void) | |
| 69 | static void | ||
| 70 | SSL_library_init_internal(void) | ||
| 71 | { | 68 | { |
| 69 | |||
| 72 | #ifndef OPENSSL_NO_DES | 70 | #ifndef OPENSSL_NO_DES |
| 73 | EVP_add_cipher(EVP_des_cbc()); | 71 | EVP_add_cipher(EVP_des_cbc()); |
| 74 | EVP_add_cipher(EVP_des_ede3_cbc()); | 72 | EVP_add_cipher(EVP_des_ede3_cbc()); |
| @@ -127,11 +125,6 @@ SSL_library_init_internal(void) | |||
| 127 | #endif | 125 | #endif |
| 128 | /* initialize cipher/digest methods table */ | 126 | /* initialize cipher/digest methods table */ |
| 129 | ssl_load_ciphers(); | 127 | ssl_load_ciphers(); |
| 128 | return (1); | ||
| 130 | } | 129 | } |
| 131 | 130 | ||
| 132 | int | ||
| 133 | SSL_library_init(void) | ||
| 134 | { | ||
| 135 | pthread_once(&SSL_library_init_once, SSL_library_init_internal); | ||
| 136 | return 1; | ||
| 137 | } | ||
