Delaying BinPAC initializaton until afte plugins have been activated.

This commit is contained in:
Robin Sommer 2015-12-04 16:40:15 -08:00
parent 6dd32c649b
commit 952c64a793
3 changed files with 10 additions and 4 deletions

View file

@ -1,4 +1,9 @@
2.4-214 | 2015-12-04 16:40:15 -0800
* Delaying BinPAC initializaton until afte plugins have been
activated. (Robin Sommer)
2.4-213 | 2015-12-04 15:25:48 -0800
* Use better data structure for storing BPF filters. (Robin Sommer)

View file

@ -1 +1 @@
2.4-213
2.4-214

View file

@ -761,9 +761,6 @@ int main(int argc, char** argv)
// DEBUG_MSG("HMAC key: %s\n", md5_digest_print(shared_hmac_md5_key));
init_hash_function();
// Must come after hash initialization.
binpac::init();
ERR_load_crypto_strings();
OPENSSL_add_all_algorithms_conf();
SSL_library_init();
@ -863,6 +860,10 @@ int main(int argc, char** argv)
if ( events_file )
event_player = new EventPlayer(events_file);
// Must come after plugin activation (and also after hash
// initialization).
binpac::init();
init_event_handlers();
md5_type = new OpaqueType("md5");