Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/johanna/openssl-initialisation'

Browse source 
* origin/topic/johanna/openssl-initialisation:
  Disable OpenSSL initialization starting with 1.1.0
This commit is contained in:
Tim Wojtulewicz 2022-04-27 21:00:29 +00:00
commit 013070d1a9
3 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CHANGES
View file

@ -1,3 +1,13 @@
5.0.0-dev.322 | 2022-04-27 21:00:29 +0000
* Disable OpenSSL initialization starting with 1.1.0 (Johanna Amann, Corelight)
Starting with OpenSSL 1.1.0, library initialization is no longer
required - and might even be harmful.
See https://wiki.openssl.org/index.php/Library_Initialization for
details.
5.0.0-dev.319 | 2022-04-27 17:42:42 +0000 5.0.0-dev.319 | 2022-04-27 17:42:42 +0000
* Wrap call to doctest's MESSAGE() method in Reporter in try/catch block (Tim Wojtulewicz, Corelight) * Wrap call to doctest's MESSAGE() method in Reporter in try/catch block (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
5.0.0-dev.319 5.0.0-dev.322

3
src/zeek-setup.cc
View file

@ -5,6 +5,7 @@
#include "zeek/zeek-config.h" #include "zeek/zeek-config.h"
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/opensslv.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
@ -544,10 +545,12 @@ SetupResult setup(int argc, char** argv, Options* zopts)
// DEBUG_MSG("HMAC key: %s\n", md5_digest_print(shared_hmac_md5_key)); // DEBUG_MSG("HMAC key: %s\n", md5_digest_print(shared_hmac_md5_key));
init_hash_function(); init_hash_function();
#if OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_load_crypto_strings(); ERR_load_crypto_strings();
OPENSSL_add_all_algorithms_conf(); OPENSSL_add_all_algorithms_conf();
SSL_library_init(); SSL_library_init();
SSL_load_error_strings(); SSL_load_error_strings();
#endif
// FIXME: On systems that don't provide /dev/urandom, OpenSSL doesn't // FIXME: On systems that don't provide /dev/urandom, OpenSSL doesn't
// seed the PRNG. We should do this here (but at least Linux, FreeBSD // seed the PRNG. We should do this here (but at least Linux, FreeBSD