diff options
| author |   jsing <jsing@openbsd.org> | 2017-04-29 21:48:43 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2017-04-29 21:48:43 +0000 |
| commit | 60e626a589c7097113ddae72add2c15e84acad1d (patch) | |
| tree | 43eb3ece4851b251b032fdafbf2ea7a22a79b642 /lib/libcrypto/cryptlib.c | |
| parent | Fix UTF-8 combining characters in column 0, based on a diff from Keith (diff) | |
| download | wireguard-openbsd-60e626a589c7097113ddae72add2c15e84acad1d.tar.xz wireguard-openbsd-60e626a589c7097113ddae72add2c15e84acad1d.zip | |
Stop calling OPENSSL_init() internally, since it is a no-op. Also place
it under #ifndef LIBRESSL_INTERNAL.
ok beck@
Diffstat (limited to 'lib/libcrypto/cryptlib.c')
| -rw-r--r-- | lib/libcrypto/cryptlib.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libcrypto/cryptlib.c b/lib/libcrypto/cryptlib.c index 1bc245ed0a5..f7b783a029b 100644 --- a/lib/libcrypto/cryptlib.c +++ b/lib/libcrypto/cryptlib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptlib.c,v 1.40 2017/01/29 17:49:22 beck Exp $ */ +/* $OpenBSD: cryptlib.c,v 1.41 2017/04/29 21:48:43 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -403,7 +403,6 @@ CRYPTO_set_locking_callback(void (*func)(int mode, int type, /* Calling this here ensures initialisation before any threads * are started. */ - OPENSSL_init(); locking_callback = func; } |