Pull request #3460: openssl: Openssl minimum version is set to 1.1.1

Merge in SNORT/snort3 from ~OSTEPANO/snort3:openssl_version_check to master

Squashed commit of the following:

commit 08d6c9f9168f357f3c245c110864dc253fdb9b18
Author: ostepano <ostepano@cisco.com>
Date:   Mon Jun 6 09:14:36 2022 -0400

    openssl: Openssl minimum version is set to 1.1.1

diff --git a/cmake/include_libraries.cmake b/cmake/include_libraries.cmake
index 783704ebada68dcd227cc1dfb86160c0cbf9d06e..b3b4fd4572d4bd6917b1bd5675e659abc51f8681 100644 (file)
--- a/cmake/include_libraries.cmake
+++ b/cmake/include_libraries.cmake
@@ -6,7 +6,7 @@ find_package(DNET REQUIRED)
 find_package(FlexLexer REQUIRED)
 find_package(HWLOC REQUIRED)
 find_package(LuaJIT REQUIRED)
-find_package(OpenSSL REQUIRED)
+find_package(OpenSSL 1.1.1 REQUIRED)
 find_package(PCAP REQUIRED)
 find_package(PCRE REQUIRED)
 find_package(ZLIB REQUIRED)

diff --git a/src/network_inspectors/appid/appid_inspector.cc b/src/network_inspectors/appid/appid_inspector.cc
index 34d01362b2cada0f09b194e17e7b3b9e0a3fce69..7cc690415a51b6628969bb8902201f481b1bfc3a 100644 (file)
--- a/src/network_inspectors/appid/appid_inspector.cc
+++ b/src/network_inspectors/appid/appid_inspector.cc
@@ -64,13 +64,6 @@ THREAD_LOCAL OdpContext* pkt_thread_odp_ctxt = nullptr;
 
 static THREAD_LOCAL PacketTracer::TracerMute appid_mute;
 
-// FIXIT-L - appid cleans up openssl now as it is the primary (only) user... eventually this
-//           should probably be done outside of appid
-static void openssl_cleanup()
-{
-    CRYPTO_cleanup_all_ex_data();
-}
-
 static void add_appid_to_packet_trace(Flow& flow, const OdpContext& odp_context)
 {
     AppIdSession* session = appid_api.get_appid_session(flow);
@@ -237,7 +230,6 @@ static void appid_inspector_pinit()
 static void appid_inspector_pterm()
 {
     AppIdContext::pterm();
-    openssl_cleanup();
     TPLibHandler::pfini();
 }
 

diff --git a/src/utils/util.cc b/src/utils/util.cc
index 298c747c40026a060afa8649bcbeae086b30d240..6b800e94080f8dc4285f3b16dc5d64574db95664 100644 (file)
--- a/src/utils/util.cc
+++ b/src/utils/util.cc
@@ -107,7 +107,7 @@ int DisplayBanner()
     LogMessage("           Copyright (C) 1998-2013 Sourcefire, Inc., et al.\n");
     LogMessage("           Using DAQ version %s\n", daq_version_string());
     LogMessage("           Using LuaJIT version %s\n", ljv);
-    LogMessage("           Using %s\n", SSLeay_version(SSLEAY_VERSION));
+    LogMessage("           Using %s\n", OpenSSL_version(SSLEAY_VERSION));
     LogMessage("           Using %s\n", pcap_lib_version());
     LogMessage("           Using PCRE version %s\n", pcre_version());
     LogMessage("           Using ZLIB version %s\n", zlib_version);