Stub out {OpenSSL,OPENSSL}_add*

These serve no purpose anymore (and really haven't for many years) but
will have to be kept since there's a number of software that still uses
them because many years ago they had to.

Relocate the stubs to crypto_init.c since library initialization's what
they were there for.

ok jsing

3 files changed, 23 insertions, 334 deletions

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index c308a47c62..75ab43c132 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.163 2024/01/13 10:57:08 tb Exp $
+# $OpenBSD: Makefile,v 1.164 2024/01/13 11:18:52 tb Exp $
 
 LIB=    crypto
 LIBREBUILD=y
@@ -348,7 +348,6 @@ SRCS+= err_prn.c
 SRCS+= bio_b64.c
 SRCS+= bio_enc.c
 SRCS+= bio_md.c
-SRCS+= c_all.c
 SRCS+= e_aes.c
 SRCS+= e_aes_cbc_hmac_sha1.c
 SRCS+= e_bf.c
diff --git a/src/lib/libcrypto/crypto_init.c b/src/lib/libcrypto/crypto_init.c
index 440128fe4c..d598318503 100644
--- a/src/lib/libcrypto/crypto_init.c
+++ b/src/lib/libcrypto/crypto_init.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: crypto_init.c,v 1.15 2024/01/07 19:59:32 tb Exp $ */
+/*      $OpenBSD: crypto_init.c,v 1.16 2024/01/13 11:18:52 tb Exp $ */
 /*
  * Copyright (c) 2018 Bob Beck <beck@openbsd.org>
  *
@@ -91,3 +91,24 @@ OPENSSL_cleanup(void)
         crypto_init_cleaned_up = 1;
 }
 LCRYPTO_ALIAS(OPENSSL_cleanup);
+
+void
+OpenSSL_add_all_ciphers(void)
+{
+}
+
+void
+OpenSSL_add_all_digests(void)
+{
+}
+
+void
+OPENSSL_add_all_algorithms_noconf(void)
+{
+}
+
+void
+OPENSSL_add_all_algorithms_conf(void)
+{
+        OPENSSL_config(NULL);
+}
diff --git a/src/lib/libcrypto/evp/c_all.c b/src/lib/libcrypto/evp/c_all.c
deleted file mode 100644
index ec38b108c5..0000000000
--- a/src/lib/libcrypto/evp/c_all.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/* $OpenBSD: c_all.c,v 1.33 2023/10/24 13:09:54 tb Exp $ */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <pthread.h>
-
-#include <openssl/opensslconf.h>
-
-#include <openssl/conf.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-
-#include "cryptlib.h"
-
-static void
-OpenSSL_add_all_ciphers_internal(void)
-{
-#ifndef OPENSSL_NO_DES
-        EVP_add_cipher(EVP_des_cfb());
-        EVP_add_cipher(EVP_des_cfb1());
-        EVP_add_cipher(EVP_des_cfb8());
-        EVP_add_cipher(EVP_des_ede_cfb());
-        EVP_add_cipher(EVP_des_ede3_cfb());
-        EVP_add_cipher(EVP_des_ede3_cfb1());
-        EVP_add_cipher(EVP_des_ede3_cfb8());
-
-        EVP_add_cipher(EVP_des_ofb());
-        EVP_add_cipher(EVP_des_ede_ofb());
-        EVP_add_cipher(EVP_des_ede3_ofb());
-
-        EVP_add_cipher(EVP_desx_cbc());
-        EVP_add_cipher_alias(SN_desx_cbc, "DESX");
-        EVP_add_cipher_alias(SN_desx_cbc, "desx");
-
-        EVP_add_cipher(EVP_des_cbc());
-        EVP_add_cipher_alias(SN_des_cbc, "DES");
-        EVP_add_cipher_alias(SN_des_cbc, "des");
-        EVP_add_cipher(EVP_des_ede_cbc());
-        EVP_add_cipher(EVP_des_ede3_cbc());
-        EVP_add_cipher_alias(SN_des_ede3_cbc, "DES3");
-        EVP_add_cipher_alias(SN_des_ede3_cbc, "des3");
-
-        EVP_add_cipher(EVP_des_ecb());
-        EVP_add_cipher(EVP_des_ede());
-        EVP_add_cipher(EVP_des_ede3());
-#endif
-
-#ifndef OPENSSL_NO_RC4
-        EVP_add_cipher(EVP_rc4());
-        EVP_add_cipher(EVP_rc4_40());
-#ifndef OPENSSL_NO_MD5
-        EVP_add_cipher(EVP_rc4_hmac_md5());
-#endif
-#endif
-
-#ifndef OPENSSL_NO_IDEA
-        EVP_add_cipher(EVP_idea_ecb());
-        EVP_add_cipher(EVP_idea_cfb());
-        EVP_add_cipher(EVP_idea_ofb());
-        EVP_add_cipher(EVP_idea_cbc());
-        EVP_add_cipher_alias(SN_idea_cbc, "IDEA");
-        EVP_add_cipher_alias(SN_idea_cbc, "idea");
-#endif
-
-#ifndef OPENSSL_NO_RC2
-        EVP_add_cipher(EVP_rc2_ecb());
-        EVP_add_cipher(EVP_rc2_cfb());
-        EVP_add_cipher(EVP_rc2_ofb());
-        EVP_add_cipher(EVP_rc2_cbc());
-        EVP_add_cipher(EVP_rc2_40_cbc());
-        EVP_add_cipher(EVP_rc2_64_cbc());
-        EVP_add_cipher_alias(SN_rc2_cbc, "RC2");
-        EVP_add_cipher_alias(SN_rc2_cbc, "rc2");
-#endif
-
-#ifndef OPENSSL_NO_BF
-        EVP_add_cipher(EVP_bf_ecb());
-        EVP_add_cipher(EVP_bf_cfb());
-        EVP_add_cipher(EVP_bf_ofb());
-        EVP_add_cipher(EVP_bf_cbc());
-        EVP_add_cipher_alias(SN_bf_cbc, "BF");
-        EVP_add_cipher_alias(SN_bf_cbc, "bf");
-        EVP_add_cipher_alias(SN_bf_cbc, "blowfish");
-#endif
-
-#ifndef OPENSSL_NO_CAST
-        EVP_add_cipher(EVP_cast5_ecb());
-        EVP_add_cipher(EVP_cast5_cfb());
-        EVP_add_cipher(EVP_cast5_ofb());
-        EVP_add_cipher(EVP_cast5_cbc());
-        EVP_add_cipher_alias(SN_cast5_cbc, "CAST");
-        EVP_add_cipher_alias(SN_cast5_cbc, "cast");
-        EVP_add_cipher_alias(SN_cast5_cbc, "CAST-cbc");
-        EVP_add_cipher_alias(SN_cast5_cbc, "cast-cbc");
-#endif
-
-#ifndef OPENSSL_NO_AES
-        EVP_add_cipher(EVP_aes_128_ecb());
-        EVP_add_cipher(EVP_aes_128_cbc());
-        EVP_add_cipher(EVP_aes_128_ccm());
-        EVP_add_cipher(EVP_aes_128_cfb());
-        EVP_add_cipher(EVP_aes_128_cfb1());
-        EVP_add_cipher(EVP_aes_128_cfb8());
-        EVP_add_cipher(EVP_aes_128_ofb());
-        EVP_add_cipher(EVP_aes_128_ctr());
-        EVP_add_cipher(EVP_aes_128_gcm());
-        EVP_add_cipher(EVP_aes_128_wrap());
-        EVP_add_cipher(EVP_aes_128_xts());
-        EVP_add_cipher_alias(SN_aes_128_cbc, "AES128");
-        EVP_add_cipher_alias(SN_aes_128_cbc, "aes128");
-        EVP_add_cipher(EVP_aes_192_ecb());
-        EVP_add_cipher(EVP_aes_192_cbc());
-        EVP_add_cipher(EVP_aes_192_ccm());
-        EVP_add_cipher(EVP_aes_192_cfb());
-        EVP_add_cipher(EVP_aes_192_cfb1());
-        EVP_add_cipher(EVP_aes_192_cfb8());
-        EVP_add_cipher(EVP_aes_192_ofb());
-        EVP_add_cipher(EVP_aes_192_ctr());
-        EVP_add_cipher(EVP_aes_192_gcm());
-        EVP_add_cipher(EVP_aes_192_wrap());
-        EVP_add_cipher_alias(SN_aes_192_cbc, "AES192");
-        EVP_add_cipher_alias(SN_aes_192_cbc, "aes192");
-        EVP_add_cipher(EVP_aes_256_ecb());
-        EVP_add_cipher(EVP_aes_256_cbc());
-        EVP_add_cipher(EVP_aes_256_ccm());
-        EVP_add_cipher(EVP_aes_256_cfb());
-        EVP_add_cipher(EVP_aes_256_cfb1());
-        EVP_add_cipher(EVP_aes_256_cfb8());
-        EVP_add_cipher(EVP_aes_256_ofb());
-        EVP_add_cipher(EVP_aes_256_ctr());
-        EVP_add_cipher(EVP_aes_256_gcm());
-        EVP_add_cipher(EVP_aes_256_wrap());
-        EVP_add_cipher(EVP_aes_256_xts());
-        EVP_add_cipher_alias(SN_aes_256_cbc, "AES256");
-        EVP_add_cipher_alias(SN_aes_256_cbc, "aes256");
-#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
-        EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1());
-        EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1());
-#endif
-#endif
-
-#ifndef OPENSSL_NO_CAMELLIA
-        EVP_add_cipher(EVP_camellia_128_ecb());
-        EVP_add_cipher(EVP_camellia_128_cbc());
-        EVP_add_cipher(EVP_camellia_128_cfb());
-        EVP_add_cipher(EVP_camellia_128_cfb1());
-        EVP_add_cipher(EVP_camellia_128_cfb8());
-        EVP_add_cipher(EVP_camellia_128_ofb());
-        EVP_add_cipher_alias(SN_camellia_128_cbc, "CAMELLIA128");
-        EVP_add_cipher_alias(SN_camellia_128_cbc, "camellia128");
-        EVP_add_cipher(EVP_camellia_192_ecb());
-        EVP_add_cipher(EVP_camellia_192_cbc());
-        EVP_add_cipher(EVP_camellia_192_cfb());
-        EVP_add_cipher(EVP_camellia_192_cfb1());
-        EVP_add_cipher(EVP_camellia_192_cfb8());
-        EVP_add_cipher(EVP_camellia_192_ofb());
-        EVP_add_cipher_alias(SN_camellia_192_cbc, "CAMELLIA192");
-        EVP_add_cipher_alias(SN_camellia_192_cbc, "camellia192");
-        EVP_add_cipher(EVP_camellia_256_ecb());
-        EVP_add_cipher(EVP_camellia_256_cbc());
-        EVP_add_cipher(EVP_camellia_256_cfb());
-        EVP_add_cipher(EVP_camellia_256_cfb1());
-        EVP_add_cipher(EVP_camellia_256_cfb8());
-        EVP_add_cipher(EVP_camellia_256_ofb());
-        EVP_add_cipher_alias(SN_camellia_256_cbc, "CAMELLIA256");
-        EVP_add_cipher_alias(SN_camellia_256_cbc, "camellia256");
-#endif
-
-#ifndef OPENSSL_NO_CHACHA
-        EVP_add_cipher(EVP_chacha20());
-        EVP_add_cipher_alias(SN_chacha20, "ChaCha20");
-        EVP_add_cipher_alias(LN_chacha20, "chacha20");
-#endif
-#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
-        EVP_add_cipher(EVP_chacha20_poly1305());
-#endif
-
-#ifndef OPENSSL_NO_GOST
-        EVP_add_cipher(EVP_gost2814789_ecb());
-        EVP_add_cipher(EVP_gost2814789_cfb64());
-        EVP_add_cipher(EVP_gost2814789_cnt());
-#endif
-
-#ifndef OPENSSL_NO_SM4
-        EVP_add_cipher(EVP_sm4_ecb());
-        EVP_add_cipher(EVP_sm4_cbc());
-        EVP_add_cipher(EVP_sm4_cfb());
-        EVP_add_cipher(EVP_sm4_ofb());
-        EVP_add_cipher(EVP_sm4_ctr());
-        EVP_add_cipher_alias(SN_sm4_cbc, "SM4");
-        EVP_add_cipher_alias(SN_sm4_cbc, "sm4");
-#endif
-}
-
-void
-OpenSSL_add_all_ciphers(void)
-{
-        static pthread_once_t add_all_ciphers_once = PTHREAD_ONCE_INIT;
-        (void) pthread_once(&add_all_ciphers_once, OpenSSL_add_all_ciphers_internal);
-}
-
-static void
-OpenSSL_add_all_digests_internal(void)
-{
-#ifndef OPENSSL_NO_MD4
-        EVP_add_digest(EVP_md4());
-#endif
-
-#ifndef OPENSSL_NO_MD5
-        EVP_add_digest(EVP_md5());
-        EVP_add_digest(EVP_md5_sha1());
-        EVP_add_digest_alias(SN_md5, "ssl2-md5");
-        EVP_add_digest_alias(SN_md5, "ssl3-md5");
-#endif
-
-#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
-        EVP_add_digest(EVP_sha1());
-        EVP_add_digest_alias(SN_sha1, "ssl3-sha1");
-        EVP_add_digest_alias(SN_sha1WithRSAEncryption, SN_sha1WithRSA);
-#endif
-
-#ifndef OPENSSL_NO_GOST
-        EVP_add_digest(EVP_gostr341194());
-        EVP_add_digest(EVP_gost2814789imit());
-        EVP_add_digest(EVP_streebog256());
-        EVP_add_digest(EVP_streebog512());
-#endif
-#ifndef OPENSSL_NO_RIPEMD
-        EVP_add_digest(EVP_ripemd160());
-        EVP_add_digest_alias(SN_ripemd160, "ripemd");
-        EVP_add_digest_alias(SN_ripemd160, "rmd160");
-#endif
-#ifndef OPENSSL_NO_SHA256
-        EVP_add_digest(EVP_sha224());
-        EVP_add_digest(EVP_sha256());
-#endif
-#ifndef OPENSSL_NO_SHA512
-        EVP_add_digest(EVP_sha384());
-        EVP_add_digest(EVP_sha512());
-        EVP_add_digest(EVP_sha512_224());
-        EVP_add_digest(EVP_sha512_256());
-#endif
-#ifndef OPENSSL_NO_SHA3
-        EVP_add_digest(EVP_sha3_224());
-        EVP_add_digest(EVP_sha3_256());
-        EVP_add_digest(EVP_sha3_384());
-        EVP_add_digest(EVP_sha3_512());
-#endif
-#ifndef OPENSSL_NO_SM3
-        EVP_add_digest(EVP_sm3());
-#endif
-#ifndef OPENSSL_NO_WHIRLPOOL
-        EVP_add_digest(EVP_whirlpool());
-#endif
-}
-
-void
-OpenSSL_add_all_digests(void)
-{
-        static pthread_once_t add_all_digests_once = PTHREAD_ONCE_INIT;
-        (void) pthread_once(&add_all_digests_once, OpenSSL_add_all_digests_internal);
-}
-
-void
-OPENSSL_add_all_algorithms_noconf(void)
-{
-        OpenSSL_add_all_ciphers();
-        OpenSSL_add_all_digests();
-}
-
-void
-OPENSSL_add_all_algorithms_conf(void)
-{
-        OPENSSL_add_all_algorithms_noconf();
-        OPENSSL_config(NULL);
-}