Simplify OpenSSL init

- Remove openvpn/openssl/util/init.hpp and instead
  add the opensslv.h include wherever needed.
- Remove openvpn/init/cryptoinit.hpp because it was
  only required for OpenSSL < 1.1.

Jira: OVPN3-1198
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>

Author: flichtenheld

openvpn/init/cryptoinit.hpp

@@ -20,7 +20,6 @@
 #include <openvpn/common/base64.hpp>
 #include <openvpn/time/time.hpp>
 #include <openvpn/compress/compress.hpp>
-#include <openvpn/init/cryptoinit.hpp>
 #include <openvpn/init/engineinit.hpp>
 
 namespace openvpn::InitProcess {
@@ -48,10 +47,6 @@ class Init
         {
             base64_uninit_static();
         }
-
-      private:
-        // SSL library init happens when instantiated
-        crypto_init crypto_init_;
     };
 
     // process-wide singular instance

openvpn/init/initprocess.hpp

@@ -12,6 +12,8 @@
 
 #pragma once
 
+#include <openssl/opensslv.h>
+
 #if OPENSSL_VERSION_NUMBER < 0x30000000L
 #include <cassert>
 #include <cstring>
@@ -120,4 +122,4 @@ SSL_get0_group_name(SSL *s)
     int nid = static_cast<int>(SSL_get_negotiated_group(s));
     return SSL_group_to_name(s, nid);
 }
-#endif
+#endif

openvpn/openssl/compat.hpp

@@ -17,8 +17,9 @@
 
 #include <string>
 
-#include <openssl/objects.h>
 #include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/opensslv.h>
 
 #include <openvpn/common/size.hpp>
 #include <openvpn/common/exception.hpp>

openvpn/openssl/crypto/cipher.hpp

@@ -15,8 +15,9 @@
 
 #include <string>
 
-#include <openssl/objects.h>
 #include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/opensslv.h>
 
 #include <openvpn/common/size.hpp>
 #include <openvpn/common/exception.hpp>

openvpn/openssl/crypto/cipheraead.hpp

@@ -17,6 +17,7 @@
 
 #include <string>
 
+#include <openssl/opensslv.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/md4.h>

openvpn/openssl/crypto/digest.hpp

@@ -16,6 +16,7 @@
 
 #include <string>
 
+#include <openssl/opensslv.h>
 /* The HMAC_* methods are deprecated in OpenSSL 3.0 and the EVP_MAC methods
  * do no exist in OpenSSL 1.1 yet. So use two distinct implementations */
 #if OPENSSL_VERSION_NUMBER < 0x30000000L
@@ -162,4 +163,4 @@ class HMACContext
 };
 } // namespace openvpn::OpenSSLCrypto
 
-#endif
+#endif

openvpn/openssl/crypto/mac.hpp

@@ -10,15 +10,15 @@
 //
 
 #pragma once
+
+#include <openssl/opensslv.h>
 #if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
 #include <openssl/core_names.h>
 #include <openssl/params.h>
 #endif
 
 #include <openssl/kdf.h>
 
-
-
 #include <openvpn/common/numeric_util.hpp>
 
 namespace openvpn::OpenSSLCrypto {

openvpn/openssl/crypto/tls1prf.hpp

@@ -23,12 +23,6 @@
 #include <openvpn/common/exception.hpp>
 #include <openvpn/openssl/util/error.hpp>
 
-// workaround for bug in DHparams_dup macro on OpenSSL 0.9.8 and lower
-#if SSLEAY_VERSION_NUMBER <= 0x00908000L
-#undef CHECKED_PTR_OF
-#define CHECKED_PTR_OF(type, p) ((char *)(1 ? p : (type *)0))
-#endif
-
 namespace openvpn::OpenSSLPKI {
 
 namespace DH_private {

openvpn/openssl/pki/dh-compat.hpp

@@ -15,6 +15,7 @@
 
 #include <string>
 
+#include <openssl/opensslv.h>
 
 #include <openvpn/common/size.hpp>
 #include <openvpn/common/numeric_cast.hpp>
@@ -158,4 +159,4 @@ class DH
     ::EVP_PKEY *dh_;
 };
 } // namespace openvpn::OpenSSLPKI
-#endif
+#endif