Remove more *_options() stuff

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

ok jsing

diff --git a/lib/libcrypto/aes/aes.h b/lib/libcrypto/aes/aes.h
index c904485..702873e 100644 (file)
--- a/lib/libcrypto/aes/aes.h
+++ b/lib/libcrypto/aes/aes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aes.h,v 1.14 2014/07/09 09:10:07 miod Exp $ */
+/* $OpenBSD: aes.h,v 1.15 2023/07/31 05:04:06 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -79,8 +79,6 @@ struct aes_key_st {
 };
 typedef struct aes_key_st AES_KEY;
 
-const char *AES_options(void);
-
 int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
     AES_KEY *key);
 int AES_set_decrypt_key(const unsigned char *userKey, const int bits,

diff --git a/lib/libcrypto/bf/blowfish.h b/lib/libcrypto/bf/blowfish.h
index 592bd83..b434e70 100644 (file)
--- a/lib/libcrypto/bf/blowfish.h
+++ b/lib/libcrypto/bf/blowfish.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: blowfish.h,v 1.16 2022/11/11 12:08:29 jsing Exp $ */
+/* $OpenBSD: blowfish.h,v 1.17 2023/07/31 05:04:06 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -102,7 +102,6 @@ void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length,
     const BF_KEY *schedule, unsigned char *ivec, int *num, int enc);
 void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length,
     const BF_KEY *schedule, unsigned char *ivec, int *num);
-const char *BF_options(void);
 
 #ifdef  __cplusplus
 }

diff --git a/lib/libcrypto/bn/bn.h b/lib/libcrypto/bn/bn.h
index 62c85d1..e00953e 100644 (file)
--- a/lib/libcrypto/bn/bn.h
+++ b/lib/libcrypto/bn/bn.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn.h,v 1.74 2023/07/28 10:07:30 tb Exp $ */
+/* $OpenBSD: bn.h,v 1.75 2023/07/31 05:04:06 tb Exp $ */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -318,7 +318,6 @@ void BN_zero(BIGNUM *a);
 int BN_one(BIGNUM *a);
 
 const BIGNUM *BN_value_one(void);
-char * BN_options(void);
 BN_CTX *BN_CTX_new(void);
 void   BN_CTX_free(BN_CTX *c);
 void   BN_CTX_start(BN_CTX *ctx);

diff --git a/lib/libcrypto/des/des.h b/lib/libcrypto/des/des.h
index ef2ecb4..bc5d35f 100644 (file)
--- a/lib/libcrypto/des/des.h
+++ b/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/lib/libcrypto/des/ecb_enc.c b/lib/libcrypto/des/ecb_enc.c
index 7cc8cc6..3599fb8 100644 (file)
--- a/lib/libcrypto/des/ecb_enc.c
+++ b/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)