Remove OPENSSL_load_builtin_modules

This became obsolete with the automatic library initialization. Now it
is time for it to become an internal API.

ok beck jsing

diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list
index d76ab68..31e9480 100644 (file)
--- a/lib/libcrypto/Symbols.list
+++ b/lib/libcrypto/Symbols.list
@@ -1673,7 +1673,6 @@ OPENSSL_cpuid_setup
 OPENSSL_gmtime
 OPENSSL_init
 OPENSSL_init_crypto
-OPENSSL_load_builtin_modules
 OPENSSL_no_config
 OPENSSL_posix_to_tm
 OPENSSL_timegm

diff --git a/lib/libcrypto/conf/conf.h b/lib/libcrypto/conf/conf.h
index b7df24e..e8873f6 100644 (file)
--- a/lib/libcrypto/conf/conf.h
+++ b/lib/libcrypto/conf/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.26 2024/08/31 09:53:02 tb Exp $ */
+/* $OpenBSD: conf.h,v 1.27 2024/08/31 09:54:31 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -139,8 +139,6 @@ void CONF_modules_free(void);
 
 char *CONF_get1_default_config_file(void);
 
-void OPENSSL_load_builtin_modules(void);
-
 void ERR_load_CONF_strings(void);
 
 /* Error codes for the CONF functions. */

diff --git a/lib/libcrypto/conf/conf_local.h b/lib/libcrypto/conf/conf_local.h
index 2933240..d7255e1 100644 (file)
--- a/lib/libcrypto/conf/conf_local.h
+++ b/lib/libcrypto/conf/conf_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_local.h,v 1.6 2024/08/31 09:53:02 tb Exp $ */
+/* $OpenBSD: conf_local.h,v 1.7 2024/08/31 09:54:31 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -106,6 +106,8 @@ char *_CONF_get_string(const CONF *conf, const char *section,
 int _CONF_new_data(CONF *conf);
 void _CONF_free_data(CONF *conf);
 
+void OPENSSL_load_builtin_modules(void);
+
 __END_HIDDEN_DECLS
 
 #endif /* HEADER_CONF_LOCAL_H */

diff --git a/lib/libcrypto/conf/conf_mall.c b/lib/libcrypto/conf/conf_mall.c
index 6a3d180..dd1bb67 100644 (file)
--- a/lib/libcrypto/conf/conf_mall.c
+++ b/lib/libcrypto/conf/conf_mall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_mall.c,v 1.12 2024/04/09 13:56:30 beck Exp $ */
+/* $OpenBSD: conf_mall.c,v 1.13 2024/08/31 09:54:31 tb Exp $ */
 /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -67,4 +67,3 @@ OPENSSL_load_builtin_modules(void)
        /* Add builtin modules here */
        ASN1_add_oid_module();
 }
-LCRYPTO_ALIAS(OPENSSL_load_builtin_modules);

diff --git a/lib/libcrypto/conf/conf_sap.c b/lib/libcrypto/conf/conf_sap.c
index 3a0bf96..59c90da 100644 (file)
--- a/lib/libcrypto/conf/conf_sap.c
+++ b/lib/libcrypto/conf/conf_sap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_sap.c,v 1.16 2024/04/09 13:56:30 beck Exp $ */
+/* $OpenBSD: conf_sap.c,v 1.17 2024/08/31 09:54:31 tb Exp $ */
 /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -67,6 +67,8 @@
 #include <openssl/err.h>
 #include <openssl/x509.h>
 
+#include "conf_local.h"
+
 /* This is the automatic configuration loader: it is called automatically by
  * OpenSSL when any of a number of standard initialisation functions are called,
  * unless this is overridden by calling OPENSSL_no_config()

diff --git a/lib/libcrypto/hidden/openssl/conf.h b/lib/libcrypto/hidden/openssl/conf.h
index 29b49e9..f378098 100644 (file)
--- a/lib/libcrypto/hidden/openssl/conf.h
+++ b/lib/libcrypto/hidden/openssl/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.8 2024/08/31 09:53:02 tb Exp $ */
+/* $OpenBSD: conf.h,v 1.9 2024/08/31 09:54:31 tb Exp $ */
 /*
  * Copyright (c) 2024 Bob Beck <beck@openbsd.org>
  *
@@ -40,7 +40,6 @@ LCRYPTO_USED(CONF_modules_unload);
 LCRYPTO_USED(CONF_modules_finish);
 LCRYPTO_USED(CONF_modules_free);
 LCRYPTO_USED(CONF_get1_default_config_file);
-LCRYPTO_USED(OPENSSL_load_builtin_modules);
 LCRYPTO_USED(ERR_load_CONF_strings);
 
 #endif /* _LIBCRYPTO_CONF_H */