summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2015-09-10 16:43:06 +0000
committerjsing <>2015-09-10 16:43:06 +0000
commit026c99675eb9b8902610f6f059b8b29e491875b4 (patch)
tree8ff6d247fadb364ecb4c81f3a8c4222227b3e969
parent661a4801887174ecff5669311ffbddbe1d358327 (diff)
downloadopenbsd-026c99675eb9b8902610f6f059b8b29e491875b4.tar.gz
openbsd-026c99675eb9b8902610f6f059b8b29e491875b4.tar.bz2
openbsd-026c99675eb9b8902610f6f059b8b29e491875b4.zip
Remove call to CRYPTO_malloc_init(), which does nothing.
-rw-r--r--src/usr.bin/openssl/openssl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
index 6d56b00f96..97321f0cac 100644
--- a/src/usr.bin/openssl/openssl.c
+++ b/src/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: openssl.c,v 1.5 2015/08/22 16:36:05 jsing Exp $ */ 1/* $OpenBSD: openssl.c,v 1.6 2015/09/10 16:43:06 jsing 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 *
@@ -415,7 +415,6 @@ openssl_startup(void)
415{ 415{
416 signal(SIGPIPE, SIG_IGN); 416 signal(SIGPIPE, SIG_IGN);
417 417
418 CRYPTO_malloc_init();
419 OpenSSL_add_all_algorithms(); 418 OpenSSL_add_all_algorithms();
420 SSL_library_init(); 419 SSL_library_init();
421 SSL_load_error_strings(); 420 SSL_load_error_strings();