From dc6989fcceeb8a299b2364670053a568ea83d2ff Mon Sep 17 00:00:00 2001
From: tb <>
Date: Mon, 31 Jul 2023 05:04:06 +0000
Subject: Remove more *_options() stuff

The public symbols were removed. Some prototypes and in the case of DES
even the implementation remained.

ok jsing
---
 src/lib/libcrypto/des/des.h     |  3 +--
 src/lib/libcrypto/des/ecb_enc.c | 42 +----------------------------------------
 2 files changed, 2 insertions(+), 43 deletions(-)

(limited to 'src/lib/libcrypto/des')

diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h
index ef2ecb4d03..bc5d35f37d 100644
--- a/src/lib/libcrypto/des/des.h
+++ b/src/lib/libcrypto/des/des.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: des.h,v 1.20 2023/07/08 07:11:07 beck Exp $ */
+/* $OpenBSD: des.h,v 1.21 2023/07/31 05:04:06 tb Exp $ */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -107,7 +107,6 @@ typedef struct DES_ks {
 extern int DES_check_key;	/* defaults to false */
 extern int DES_rw_mode;		/* defaults to DES_PCBC_MODE */
 
-const char *DES_options(void);
 void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
     DES_key_schedule *ks1, DES_key_schedule *ks2,
     DES_key_schedule *ks3, int enc);
diff --git a/src/lib/libcrypto/des/ecb_enc.c b/src/lib/libcrypto/des/ecb_enc.c
index 7cc8cc687f..3599fb812f 100644
--- a/src/lib/libcrypto/des/ecb_enc.c
+++ b/src/lib/libcrypto/des/ecb_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecb_enc.c,v 1.18 2023/07/08 07:11:07 beck Exp $ */
+/* $OpenBSD: ecb_enc.c,v 1.19 2023/07/31 05:04:06 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -60,46 +60,6 @@
 #include <openssl/opensslv.h>
 #include <openssl/bio.h>
 
-const char *
-DES_options(void)
-{
-	static int init = 1;
-	static char buf[32];
-
-	if (init) {
-		const char *ptr, *unroll, *risc, *size;
-
-#ifdef DES_PTR
-		ptr = "ptr";
-#else
-		ptr = "idx";
-#endif
-#if defined(DES_RISC1) || defined(DES_RISC2)
-#ifdef DES_RISC1
-		risc = "risc1";
-#endif
-#ifdef DES_RISC2
-		risc = "risc2";
-#endif
-#else
-		risc = "cisc";
-#endif
-#ifdef DES_UNROLL
-		unroll = "16";
-#else
-		unroll = "2";
-#endif
-		if (sizeof(DES_LONG) != sizeof(long))
-			size = "int";
-		else
-			size = "long";
-		snprintf(buf, sizeof buf, "des(%s,%s,%s,%s)", ptr, risc, unroll,
-		    size);
-		init = 0;
-	}
-	return (buf);
-}
-
 void
 DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
     DES_key_schedule *ks, int enc)
-- 
cgit v1.2.3-55-g6feb