Drop support for OpenSSL < 1.1

doc/UPDATES.md

@@ -1,5 +1,6 @@
 # maint
   * Fix OpenSSL 3 build.
+  * Drop support for OpenSSL < 1.1
 
 # 1.4.10
   * Clear FiSH keys when a client quits.

src/compat/openssl.cc

@@ -1,34 +1 @@
 #include <openssl/opensslv.h>
-/* Provide forward compat functions when built from < 1.1. */
-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L
-#include <stdlib.h>
-#include <stdint.h>
-#include "dl.h"
-
-extern "C" {
-void _ERR_free_strings(void) __attribute__((const));
-void _ERR_free_strings(void) {
-}
-
-void _EVP_cleanup(void) __attribute__((const));
-void _EVP_cleanup(void) {
-}
-
-void _CRYPTO_cleanup_all_ex_data(void) __attribute__((const));
-void _CRYPTO_cleanup_all_ex_data(void) {
-}
-
-typedef void *(*TLS_client_method_t)(void);
-static const void *_TLS_client_method(void) {
-  if (DLSYM_VAR(TLS_client_method) == NULL)
-    if (DLSYM_GLOBAL_SIMPLE(RTLD_NEXT, TLS_client_method) == NULL)
-      return NULL;
-  return DLSYM_VAR(TLS_client_method)();
-}
-
-const void *_SSLv23_client_method(void) {
-  return _TLS_client_method();
-}
-
-} /* extern "C" */
-#endif	/* OPENSSL_VERSION_NUMBER < 0x10100000L */

src/libssl.cc

@@ -59,13 +59,8 @@ static int load_symbols(void *handle) {
   DLSYM_GLOBAL(handle, SSL_CTX_set_cipher_list);
   DLSYM_GLOBAL(handle, SSL_CTX_set_tmp_dh_callback);
   DLSYM_GLOBAL(handle, OPENSSL_init_ssl);
-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
   DLSYM_GLOBAL(handle, TLS_client_method);
   DLSYM_GLOBAL(handle, SSL_CTX_set_options);
-#else
-  DLSYM_GLOBAL_FWDCOMPAT(handle, SSLv23_client_method);
-  /* Some forward-compat is handled in src/compat/openssl.cc. */
-#endif
 
   return 0;
 }

src/openssl.cc

@@ -78,11 +78,7 @@ int init_openssl() {
   /* good place to init ssl stuff */
   OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
       OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L
-  ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-#else
   ssl_ctx = SSL_CTX_new(TLS_client_method());
-#endif
   if (!ssl_ctx) {
     sdprintf("SSL_CTX_new() failed");
     return 1;
@@ -125,12 +121,6 @@ int uninit_openssl () {
     RAND_write_file(tls_rand_file);
 #endif
 
-#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
-  ERR_free_strings();
-  EVP_cleanup();
-  CRYPTO_cleanup_all_ex_data();
-#endif
-
   unload_libssl();
   unload_libcrypto();
   return 0;