6 files changed, 3 insertions, 106 deletions

diff --git a/src/lib/libcrypto/rc4/asm/rc4-586.pl b/src/lib/libcrypto/rc4/asm/rc4-586.pl
index 4991c37c2c..bb30f9b88f 100644
--- a/src/lib/libcrypto/rc4/asm/rc4-586.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-586.pl
@@ -384,32 +384,4 @@ $idx="edx";
         &mov    (&DWP(-4,$out),"eax");          # key->y=0;
 &function_end("RC4_set_key");
 
-# const char *RC4_options(void);
-&static_label("opts");
-&function_begin_B("RC4_options");
-        &picsetup("edx");
-        &picsymbol("eax", &label("opts"), "edx");
-        &picsymbol("edx", "OPENSSL_ia32cap_P", "edx");;
-
-        &mov    ("edx",&DWP(0,"edx"));
-        &bt     ("edx","\$IA32CAP_BIT0_INTELP4");
-        &jc     (&label("1xchar"));
-        &bt     ("edx","\$IA32CAP_BIT0_SSE2");
-        &jnc    (&label("ret"));
-        &add    ("eax",25);
-        &ret    ();
-&set_label("1xchar");
-        &add    ("eax",12);
-&set_label("ret");
-        &ret    ();
-&function_end_B("RC4_options");
-
-        &rodataseg();
-&set_label("opts");
-&asciz  ("rc4(4x,int)");
-&asciz  ("rc4(1x,char)");
-&asciz  ("rc4(8x,mmx)");
-        &previous();
-
 &asm_finish();
-
diff --git a/src/lib/libcrypto/rc4/asm/rc4-md5-x86_64.pl b/src/lib/libcrypto/rc4/asm/rc4-md5-x86_64.pl
index 6d058bd9d4..3190e6a8e7 100644
--- a/src/lib/libcrypto/rc4/asm/rc4-md5-x86_64.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-md5-x86_64.pl
@@ -491,19 +491,6 @@ RC4_set_key:
         mov     %eax,-4($dat)
         ret
 .size   RC4_set_key,.-RC4_set_key
-
-.globl  RC4_options
-.type   RC4_options,\@abi-omnipotent
-.align  16
-RC4_options:
-        endbr64
-        lea     .Lopts(%rip),%rax
-        ret
-.align  64
-.Lopts:
-.asciz  "rc4(64x,int)"
-.align  64
-.size   RC4_options,.-RC4_options
 ___
 }
 
diff --git a/src/lib/libcrypto/rc4/asm/rc4-parisc.pl b/src/lib/libcrypto/rc4/asm/rc4-parisc.pl
index 24e3e0c30b..831d785979 100644
--- a/src/lib/libcrypto/rc4/asm/rc4-parisc.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-parisc.pl
@@ -286,24 +286,6 @@ L\$2nd
         nop
         .PROCEND
 
-        .EXPORT RC4_options,ENTRY
-        .ALIGN  8
-RC4_options
-        .PROC
-        .CALLINFO       NO_CALLS
-        .ENTRY
-#ifdef __PIC__
-        addil   LT'L\$opts, %r19
-        ldw     RT'L\$opts(%r1), %r28
-#else
-        ldil    L'L\$opts, %t1
-        ldo     R'L\$opts(%t1), %r28
-#endif
-        bv      (%r2)
-        .EXIT
-        nop
-        .PROCEND
-
         .section .rodata
         .ALIGN  8
 L\$opts
diff --git a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl b/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
index 2bac7d744d..0472acce8a 100755
--- a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
@@ -503,33 +503,6 @@ RC4_set_key:
         mov     %eax,-4($dat)
         ret
 .size   RC4_set_key,.-RC4_set_key
-
-.globl  RC4_options
-.type   RC4_options,\@abi-omnipotent
-.align  16
-RC4_options:
-        endbr64
-        lea     .Lopts(%rip),%rax
-        mov     OPENSSL_ia32cap_P(%rip),%edx
-        bt      \$IA32CAP_BIT0_INTELP4,%edx
-        jc      .L8xchar
-        bt      \$IA32CAP_BIT0_INTEL,%edx
-        jnc     .Ldone
-        add     \$25,%rax
-        ret
-.L8xchar:
-        add     \$12,%rax
-.Ldone:
-        ret
-.section .rodata
-.align  64
-.Lopts:
-.asciz  "rc4(8x,int)"
-.asciz  "rc4(8x,char)"
-.asciz  "rc4(16x,int)"
-.align  64
-.text
-.size   RC4_options,.-RC4_options
 ___
 
 sub reg_part {
diff --git a/src/lib/libcrypto/rc4/rc4.h b/src/lib/libcrypto/rc4/rc4.h
index f59185ed33..7ebe232106 100644
--- a/src/lib/libcrypto/rc4/rc4.h
+++ b/src/lib/libcrypto/rc4/rc4.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc4.h,v 1.13 2015/10/20 15:50:13 jsing Exp $ */
+/* $OpenBSD: rc4.h,v 1.14 2023/07/28 10:35:14 tb Exp $ */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -76,7 +76,6 @@ typedef struct rc4_key_st {
         RC4_INT data[256];
 } RC4_KEY;
 
-const char *RC4_options(void);
 void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
 void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
 void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
diff --git a/src/lib/libcrypto/rc4/rc4_skey.c b/src/lib/libcrypto/rc4/rc4_skey.c
index e32a6e84a3..5833c7bd07 100644
--- a/src/lib/libcrypto/rc4/rc4_skey.c
+++ b/src/lib/libcrypto/rc4/rc4_skey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc4_skey.c,v 1.15 2022/11/26 16:08:54 tb Exp $ */
+/* $OpenBSD: rc4_skey.c,v 1.16 2023/07/28 10:35:14 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,24 +57,8 @@
  */
 
 #include <openssl/rc4.h>
-#include "rc4_local.h"
-#include <openssl/opensslv.h>
 
-const char *
-RC4_options(void)
-{
-#ifdef RC4_INDEX
-        if (sizeof(RC4_INT) == 1)
-                return("rc4(idx,char)");
-        else
-                return("rc4(idx,int)");
-#else
-        if (sizeof(RC4_INT) == 1)
-                return("rc4(ptr,char)");
-        else
-                return("rc4(ptr,int)");
-#endif
-}
+#include "rc4_local.h"
 
 /* RC4 as implemented from a posting from
  * Newsgroups: sci.crypt