Remove DES_enc_{read,write} and DES_rw_mode

Unfortunately we'll probably never be able to get rid of DES entirely.
One part of it that is old enough to be a grandparent can go, though.

ok beck jsing

5 files changed, 3 insertions, 101 deletions

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 5a28e98a87..d8e3f96b24 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.206 2024/08/31 10:28:03 tb Exp $
+# $OpenBSD: Makefile,v 1.207 2024/08/31 10:30:16 tb Exp $
 
 LIB=    crypto
 LIBREBUILD=y
@@ -264,7 +264,6 @@ SRCS+= des_enc.c
 SRCS+= ecb3_enc.c
 SRCS+= ecb_enc.c
 SRCS+= ede_cbcm_enc.c
-SRCS+= enc_read.c
 SRCS+= fcrypt.c
 SRCS+= fcrypt_b.c
 SRCS+= ofb64ede.c
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 170ae8ceae..1a298c02d7 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -720,8 +720,6 @@ DES_ede3_cbcm_encrypt
 DES_ede3_cfb64_encrypt
 DES_ede3_cfb_encrypt
 DES_ede3_ofb64_encrypt
-DES_enc_read
-DES_enc_write
 DES_encrypt1
 DES_encrypt2
 DES_encrypt3
@@ -734,7 +732,6 @@ DES_ofb_encrypt
 DES_pcbc_encrypt
 DES_quad_cksum
 DES_random_key
-DES_rw_mode
 DES_set_key
 DES_set_key_checked
 DES_set_key_unchecked
diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h
index bc5d35f37d..5891fcefe9 100644
--- a/src/lib/libcrypto/des/des.h
+++ b/src/lib/libcrypto/des/des.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: des.h,v 1.21 2023/07/31 05:04:06 tb Exp $ */
+/* $OpenBSD: des.h,v 1.22 2024/08/31 10:30:16 tb Exp $ */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -105,7 +105,6 @@ typedef struct DES_ks {
         DES_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
 
 extern int DES_check_key;       /* defaults to false */
-extern int DES_rw_mode;         /* defaults to DES_PCBC_MODE */
 
 void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
     DES_key_schedule *ks1, DES_key_schedule *ks2,
@@ -174,10 +173,6 @@ void DES_ede3_ofb64_encrypt(const unsigned char *in, unsigned char *out,
     long length, DES_key_schedule *ks1,
     DES_key_schedule *ks2, DES_key_schedule *ks3,
     DES_cblock *ivec, int *num);
-int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,
-    DES_cblock *iv);
-int DES_enc_write(int fd, const void *buf, int len, DES_key_schedule *sched,
-    DES_cblock *iv);
 char *DES_fcrypt(const char *buf, const char *salt, char *ret);
 char *DES_crypt(const char *buf, const char *salt);
 void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
diff --git a/src/lib/libcrypto/des/enc_read.c b/src/lib/libcrypto/des/enc_read.c
deleted file mode 100644
index 32f7547a3f..0000000000
--- a/src/lib/libcrypto/des/enc_read.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* $OpenBSD: enc_read.c,v 1.20 2024/07/09 07:16:13 beck 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 <openssl/opensslconf.h>
-
-#include "des_local.h"
-
-/*
- * XXX - remove this file in the next major bump
- */
-
-int DES_rw_mode = DES_PCBC_MODE;
-LCRYPTO_ALIAS(DES_rw_mode);
-
-int
-DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,
-    DES_cblock *iv)
-{
-        return -1;
-}
-LCRYPTO_ALIAS(DES_enc_read);
-
-int
-DES_enc_write(int fd, const void *_buf, int len,
-    DES_key_schedule *sched, DES_cblock *iv)
-{
-        return -1;
-}
-LCRYPTO_ALIAS(DES_enc_write);
diff --git a/src/lib/libcrypto/hidden/openssl/des.h b/src/lib/libcrypto/hidden/openssl/des.h
index e632de4b11..645181199b 100644
--- a/src/lib/libcrypto/hidden/openssl/des.h
+++ b/src/lib/libcrypto/hidden/openssl/des.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: des.h,v 1.2 2024/07/09 07:16:13 beck Exp $ */
+/* $OpenBSD: des.h,v 1.3 2024/08/31 10:30:16 tb Exp $ */
 /*
  * Copyright (c) 2024 Joshua Sing <joshua@joshuasing.dev>
  *
@@ -41,8 +41,6 @@ LCRYPTO_USED(DES_ede3_cbcm_encrypt);
 LCRYPTO_USED(DES_ede3_cfb64_encrypt);
 LCRYPTO_USED(DES_ede3_cfb_encrypt);
 LCRYPTO_USED(DES_ede3_ofb64_encrypt);
-LCRYPTO_USED(DES_enc_read);
-LCRYPTO_USED(DES_enc_write);
 LCRYPTO_USED(DES_fcrypt);
 LCRYPTO_USED(DES_crypt);
 LCRYPTO_USED(DES_ofb_encrypt);
@@ -62,7 +60,6 @@ LCRYPTO_USED(DES_cfb64_encrypt);
 LCRYPTO_USED(DES_ofb64_encrypt);
 #if defined(LIBRESSL_NAMESPACE)
 extern LCRYPTO_USED(DES_check_key);
-extern LCRYPTO_USED(DES_rw_mode);
 #endif
 
 #endif /* _LIBCRYPTO_DES_H */