svn commit: r1924445 - /apr/apr-util/branches/1.7.x/crypto/apr_crypto_openssl.c

Author: minfrin
Date: Tue Mar 18 09:16:46 2025
New Revision: 1924445

URL: http://svn.apache.org/viewvc?rev=1924445&view=rev
Log:
apr_crypto_openssl: ERR_free_strings and ERR_load_crypto_strings are gone.

Modified:
    apr/apr-util/branches/1.7.x/crypto/apr_crypto_openssl.c

Modified: apr/apr-util/branches/1.7.x/crypto/apr_crypto_openssl.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/crypto/apr_crypto_openssl.c?rev=1924445&r1=1924444&r2=1924445&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/crypto/apr_crypto_openssl.c (original)
+++ apr/apr-util/branches/1.7.x/crypto/apr_crypto_openssl.c Tue Mar 18 09:16:46 2025
@@ -210,8 +210,10 @@ static apr_status_t crypto_shutdown(void
      * older.
      */
 
+#if APR_USE_OPENSSL_PRE_3_0_API
     ERR_free_strings();
     EVP_cleanup();
+#endif
 #if APR_USE_OPENSSL_ENGINE_API
     ENGINE_cleanup();
 #endif
@@ -227,6 +229,8 @@ static apr_status_t crypto_shutdown_help
 
 /**
  * Initialise the crypto library and perform one time initialisation.
+ *
+ * This is a noop from OpenSSL v3+.
  */
 static apr_status_t crypto_init(apr_pool_t *pool, const char *params,
         const apu_err_t **result)
@@ -248,12 +252,16 @@ static apr_status_t crypto_init(apr_pool
 
 #if APR_USE_OPENSSL_PRE_1_1_API
     (void)CRYPTO_malloc_init();
-#else
+#elif APR_USE_OPENSSL_PRE_3_0_API
     OPENSSL_malloc_init();
 #endif
+
+#if APR_USE_OPENSSL_PRE_3_0_API
     ERR_load_crypto_strings();
     /* SSL_load_error_strings(); */
     OpenSSL_add_all_algorithms();
+#endif
+
 #if APR_USE_OPENSSL_ENGINE_API
     ENGINE_load_builtin_engines();
     ENGINE_register_all_complete();