Remove e_old.c again

Also remove nonexistent symbols #defined to other symbols that confuse
some linkers in -portable.

This commit entails no ABI change on OpenBSD.

Discussed with jsing

3 files changed, 1 insertions, 171 deletions

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index e6cbcb88da8..551fa4bf3cf 100644
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.118 2023/04/25 23:16:31 tb Exp $
+# $OpenBSD: Makefile,v 1.119 2023/04/26 08:25:37 tb Exp $
 
 LIB=	crypto
 LIBREBUILD=y
@@ -415,7 +415,6 @@ SRCS+= e_des3.c
 SRCS+= e_gost2814789.c
 SRCS+= e_idea.c
 SRCS+= e_null.c
-SRCS+= e_old.c
 SRCS+= e_rc2.c
 SRCS+= e_rc4.c
 SRCS+= e_rc4_hmac_md5.c
diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list
index 4c72f9654bf..626cd78b3b8 100644
--- a/lib/libcrypto/Symbols.list
+++ b/lib/libcrypto/Symbols.list
@@ -1691,7 +1691,6 @@ EVP_aead_xchacha20_poly1305
 EVP_aes_128_cbc
 EVP_aes_128_cbc_hmac_sha1
 EVP_aes_128_ccm
-EVP_aes_128_cfb
 EVP_aes_128_cfb1
 EVP_aes_128_cfb128
 EVP_aes_128_cfb8
@@ -1703,7 +1702,6 @@ EVP_aes_128_wrap
 EVP_aes_128_xts
 EVP_aes_192_cbc
 EVP_aes_192_ccm
-EVP_aes_192_cfb
 EVP_aes_192_cfb1
 EVP_aes_192_cfb128
 EVP_aes_192_cfb8
@@ -1715,7 +1713,6 @@ EVP_aes_192_wrap
 EVP_aes_256_cbc
 EVP_aes_256_cbc_hmac_sha1
 EVP_aes_256_ccm
-EVP_aes_256_cfb
 EVP_aes_256_cfb1
 EVP_aes_256_cfb128
 EVP_aes_256_cfb8
@@ -1726,7 +1723,6 @@ EVP_aes_256_ofb
 EVP_aes_256_wrap
 EVP_aes_256_xts
 EVP_bf_cbc
-EVP_bf_cfb
 EVP_bf_cfb64
 EVP_bf_ecb
 EVP_bf_ofb
@@ -1749,7 +1745,6 @@ EVP_camellia_256_cfb8
 EVP_camellia_256_ecb
 EVP_camellia_256_ofb
 EVP_cast5_cbc
-EVP_cast5_cfb
 EVP_cast5_cfb64
 EVP_cast5_ecb
 EVP_cast5_ofb
@@ -1757,7 +1752,6 @@ EVP_chacha20
 EVP_chacha20_poly1305
 EVP_cleanup
 EVP_des_cbc
-EVP_des_cfb
 EVP_des_cfb1
 EVP_des_cfb64
 EVP_des_cfb8
@@ -1765,14 +1759,12 @@ EVP_des_ecb
 EVP_des_ede
 EVP_des_ede3
 EVP_des_ede3_cbc
-EVP_des_ede3_cfb
 EVP_des_ede3_cfb1
 EVP_des_ede3_cfb64
 EVP_des_ede3_cfb8
 EVP_des_ede3_ecb
 EVP_des_ede3_ofb
 EVP_des_ede_cbc
-EVP_des_ede_cfb
 EVP_des_ede_cfb64
 EVP_des_ede_ecb
 EVP_des_ede_ofb
@@ -1788,7 +1780,6 @@ EVP_gost2814789_ecb
 EVP_gost2814789imit
 EVP_gostr341194
 EVP_idea_cbc
-EVP_idea_cfb
 EVP_idea_cfb64
 EVP_idea_ecb
 EVP_idea_ofb
@@ -1799,7 +1790,6 @@ EVP_md_null
 EVP_rc2_40_cbc
 EVP_rc2_64_cbc
 EVP_rc2_cbc
-EVP_rc2_cfb
 EVP_rc2_cfb64
 EVP_rc2_ecb
 EVP_rc2_ofb
diff --git a/lib/libcrypto/evp/e_old.c b/lib/libcrypto/evp/e_old.c
deleted file mode 100644
index 4b67a1cb321..00000000000
--- a/lib/libcrypto/evp/e_old.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* $OpenBSD: e_old.c,v 1.10 2023/04/25 23:16:31 tb Exp $ */
-/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
- * project 2004.
- */
-/* ====================================================================
- * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
- *
- * 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 above 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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <openssl/opensslconf.h>
-
-#ifndef OPENSSL_NO_DEPRECATED
-
-#include <openssl/evp.h>
-
-/* Define some deprecated functions, so older programs
-   don't crash and burn too quickly.  On Windows and VMS,
-   these will never be used, since functions and variables
-   in shared libraries are selected by entry point location,
-   not by name.  */
-
-#ifndef OPENSSL_NO_BF
-#undef EVP_bf_cfb
-const EVP_CIPHER *EVP_bf_cfb(void);
-const EVP_CIPHER *
-EVP_bf_cfb(void)
-{
-	return EVP_bf_cfb64();
-}
-#endif
-
-#ifndef OPENSSL_NO_DES
-#undef EVP_des_cfb
-const EVP_CIPHER *EVP_des_cfb(void);
-const EVP_CIPHER *
-EVP_des_cfb(void)
-{
-	return EVP_des_cfb64();
-}
-#undef EVP_des_ede3_cfb
-const EVP_CIPHER *EVP_des_ede3_cfb(void);
-const EVP_CIPHER *
-EVP_des_ede3_cfb(void)
-{
-	return EVP_des_ede3_cfb64();
-}
-#undef EVP_des_ede_cfb
-const EVP_CIPHER *EVP_des_ede_cfb(void);
-const EVP_CIPHER *
-EVP_des_ede_cfb(void)
-{
-	return EVP_des_ede_cfb64();
-}
-#endif
-
-#ifndef OPENSSL_NO_IDEA
-#undef EVP_idea_cfb
-const EVP_CIPHER *EVP_idea_cfb(void);
-const EVP_CIPHER *
-EVP_idea_cfb(void)
-{
-	return EVP_idea_cfb64();
-}
-#endif
-
-#ifndef OPENSSL_NO_RC2
-#undef EVP_rc2_cfb
-const EVP_CIPHER *EVP_rc2_cfb(void);
-const EVP_CIPHER *
-EVP_rc2_cfb(void)
-{
-	return EVP_rc2_cfb64();
-}
-#endif
-
-#ifndef OPENSSL_NO_CAST
-#undef EVP_cast5_cfb
-const EVP_CIPHER *EVP_cast5_cfb(void);
-const EVP_CIPHER *
-EVP_cast5_cfb(void)
-{
-	return EVP_cast5_cfb64();
-}
-#endif
-
-#ifndef OPENSSL_NO_AES
-#undef EVP_aes_128_cfb
-const EVP_CIPHER *EVP_aes_128_cfb(void);
-const EVP_CIPHER *
-EVP_aes_128_cfb(void)
-{
-	return EVP_aes_128_cfb128();
-}
-#undef EVP_aes_192_cfb
-const EVP_CIPHER *EVP_aes_192_cfb(void);
-const EVP_CIPHER *
-EVP_aes_192_cfb(void)
-{
-	return EVP_aes_192_cfb128();
-}
-#undef EVP_aes_256_cfb
-const EVP_CIPHER *EVP_aes_256_cfb(void);
-const EVP_CIPHER *
-EVP_aes_256_cfb(void)
-{
-	return EVP_aes_256_cfb128();
-}
-#endif
-
-#endif