Remove private_{Camellia,RC4}_set_key FIPS indirection tentacles, as has been

done for other symmetric algorithms recently.

4 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/libcrypto/rc4/asm/rc4-586.pl b/src/lib/libcrypto/rc4/asm/rc4-586.pl
index 5c9ac6ad28..84f1a798cb 100644
--- a/src/lib/libcrypto/rc4/asm/rc4-586.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-586.pl
@@ -300,7 +300,7 @@ $ido="ecx";
 $idx="edx";
 
 # void RC4_set_key(RC4_KEY *key,int len,const unsigned char *data);
-&function_begin("private_RC4_set_key");
+&function_begin("RC4_set_key");
         &mov    ($out,&wparam(0));              # load key
         &mov    ($idi,&wparam(1));              # load len
         &mov    ($inp,&wparam(2));              # load data
@@ -378,7 +378,7 @@ $idx="edx";
         &xor    ("eax","eax");
         &mov    (&DWP(-8,$out),"eax");          # key->x=0;
         &mov    (&DWP(-4,$out),"eax");          # key->y=0;
-&function_end("private_RC4_set_key");
+&function_end("RC4_set_key");
 
 # const char *RC4_options(void);
 &function_begin_B("RC4_options");
diff --git a/src/lib/libcrypto/rc4/asm/rc4-parisc.pl b/src/lib/libcrypto/rc4/asm/rc4-parisc.pl
index 9eca69902e..7e7974430a 100644
--- a/src/lib/libcrypto/rc4/asm/rc4-parisc.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-parisc.pl
@@ -247,9 +247,9 @@ ___
 
 $code.=<<___;
 
-        .EXPORT private_RC4_set_key,ENTRY,ARGW0=GR,ARGW1=GR,ARGW2=GR
+        .EXPORT RC4_set_key,ENTRY,ARGW0=GR,ARGW1=GR,ARGW2=GR
         .ALIGN  8
-private_RC4_set_key
+RC4_set_key
         .PROC
         .CALLINFO       NO_CALLS
         .ENTRY
diff --git a/src/lib/libcrypto/rc4/asm/rc4-s390x.pl b/src/lib/libcrypto/rc4/asm/rc4-s390x.pl
index 7528ece13c..1aa754820c 100644
--- a/src/lib/libcrypto/rc4/asm/rc4-s390x.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-s390x.pl
@@ -171,10 +171,10 @@ $ikey="%r7";
 $iinp="%r8";
 
 $code.=<<___;
-.globl  private_RC4_set_key
-.type   private_RC4_set_key,\@function
+.globl  RC4_set_key
+.type   RC4_set_key,\@function
 .align  64
-private_RC4_set_key:
+RC4_set_key:
         stm${g} %r6,%r8,6*$SIZE_T($sp)
         lhi     $cnt,256
         la      $idx,0(%r0)
@@ -210,7 +210,7 @@ private_RC4_set_key:
 .Ldone:
         lm${g}  %r6,%r8,6*$SIZE_T($sp)
         br      $rp
-.size   private_RC4_set_key,.-private_RC4_set_key
+.size   RC4_set_key,.-RC4_set_key
 
 ___
 }
diff --git a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl b/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
index 2bed1e279f..197749dda7 100755
--- a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
@@ -428,10 +428,10 @@ $idx="%r8";
 $ido="%r9";
 
 $code.=<<___;
-.globl  private_RC4_set_key
-.type   private_RC4_set_key,\@function,3
+.globl  RC4_set_key
+.type   RC4_set_key,\@function,3
 .align  16
-private_RC4_set_key:
+RC4_set_key:
         lea     8($dat),$dat
         lea     ($inp,$len),$inp
         neg     $len
@@ -498,7 +498,7 @@ private_RC4_set_key:
         mov     %eax,-8($dat)
         mov     %eax,-4($dat)
         ret
-.size   private_RC4_set_key,.-private_RC4_set_key
+.size   RC4_set_key,.-RC4_set_key
 
 .globl  RC4_options
 .type   RC4_options,\@abi-omnipotent