diff options
author | jsing <> | 2017-04-29 21:48:44 +0000 |
---|---|---|
committer | jsing <> | 2017-04-29 21:48:44 +0000 |
commit | 1de47e5fe8ef45dc6638449b6a0decdcf07cc840 (patch) | |
tree | 4195f946a49f85960dfe69d053abfc95e5e32dd9 /src/lib/libcrypto/cryptlib.c | |
parent | 06e58ee3d445df182278c56c23d0bf1aec820070 (diff) | |
download | openbsd-1de47e5fe8ef45dc6638449b6a0decdcf07cc840.tar.gz openbsd-1de47e5fe8ef45dc6638449b6a0decdcf07cc840.tar.bz2 openbsd-1de47e5fe8ef45dc6638449b6a0decdcf07cc840.zip |
Stop calling OPENSSL_init() internally, since it is a no-op. Also place
it under #ifndef LIBRESSL_INTERNAL.
ok beck@
Diffstat (limited to 'src/lib/libcrypto/cryptlib.c')
-rw-r--r-- | src/lib/libcrypto/cryptlib.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c index 1bc245ed0a..f7b783a029 100644 --- a/src/lib/libcrypto/cryptlib.c +++ b/src/lib/libcrypto/cryptlib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cryptlib.c,v 1.40 2017/01/29 17:49:22 beck Exp $ */ | 1 | /* $OpenBSD: cryptlib.c,v 1.41 2017/04/29 21:48:43 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -403,7 +403,6 @@ CRYPTO_set_locking_callback(void (*func)(int mode, int type, | |||
403 | /* Calling this here ensures initialisation before any threads | 403 | /* Calling this here ensures initialisation before any threads |
404 | * are started. | 404 | * are started. |
405 | */ | 405 | */ |
406 | OPENSSL_init(); | ||
407 | locking_callback = func; | 406 | locking_callback = func; |
408 | } | 407 | } |
409 | 408 | ||