Use C functions for RC4 public API.

Rather than having public API switch between C and assembly, always
use C functions as entry points, which then call an assembly
implementation (if available). This makes it significantly easier
to deal with symbol aliasing/namespaces and it also means we
benefit from vulnerability prevention provided by the C compiler.

Rename the assembly generated functions from RC4() to rc4_internal()
and RC4_set_key() to rc4_set_key_internal(). Always include rc4.c
and change it to use defines that are similar to those used in BN.

ok beck@ joshua@ tb@

2 files changed, 15 insertions, 14 deletions

diff --git a/src/lib/libcrypto/rc4/asm/rc4-586.pl b/src/lib/libcrypto/rc4/asm/rc4-586.pl
index bb30f9b88f..8fffe91e74 100644
--- a/src/lib/libcrypto/rc4/asm/rc4-586.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-586.pl
@@ -152,8 +152,9 @@ if ($alt=0) {
 
 &external_label("OPENSSL_ia32cap_P");
 
-# void RC4(RC4_KEY *key,size_t len,const unsigned char *inp,unsigned char *out);
-&function_begin("RC4");
+# void rc4_internal(RC4_KEY *key, size_t len, const unsigned char *inp,
+#     unsigned char *out);
+&function_begin("rc4_internal");
         &mov    ($dat,&wparam(0));      # load key schedule pointer
         &mov    ($ty, &wparam(1));      # load len
         &mov    ($inp,&wparam(2));      # load inp
@@ -291,7 +292,7 @@ if ($alt=0) {
         &mov    (&DWP(-4,$dat),$yy);            # save key->y
         &mov    (&BP(-8,$dat),&LB($xx));        # save key->x
 &set_label("abort");
-&function_end("RC4");
+&function_end("rc4_internal");
 
 ########################################################################
 
@@ -301,8 +302,8 @@ $idi="ebp";
 $ido="ecx";
 $idx="edx";
 
-# void RC4_set_key(RC4_KEY *key,int len,const unsigned char *data);
-&function_begin("RC4_set_key");
+# void rc4_set_key_internal(RC4_KEY *key,int len,const unsigned char *data);
+&function_begin("rc4_set_key_internal");
         &mov    ($out,&wparam(0));              # load key
         &mov    ($idi,&wparam(1));              # load len
         &mov    ($inp,&wparam(2));              # load data
@@ -382,6 +383,6 @@ $idx="edx";
         &xor    ("eax","eax");
         &mov    (&DWP(-8,$out),"eax");          # key->x=0;
         &mov    (&DWP(-4,$out),"eax");          # key->y=0;
-&function_end("RC4_set_key");
+&function_end("rc4_set_key_internal");
 
 &asm_finish();
diff --git a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl b/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
index a9cf9d1bdf..4dfce6a9ad 100755
--- a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
@@ -124,10 +124,10 @@ $code=<<___;
 .extern OPENSSL_ia32cap_P
 .hidden OPENSSL_ia32cap_P
 
-.globl  RC4
-.type   RC4,\@function,4
+.globl  rc4_internal
+.type   rc4_internal,\@function,4
 .align  16
-RC4:
+rc4_internal:
         _CET_ENDBR
         or      $len,$len
         jne     .Lentry
@@ -423,7 +423,7 @@ $code.=<<___;
         add     \$24,%rsp
 .Lepilogue:
         ret
-.size   RC4,.-RC4
+.size   rc4_internal,.-rc4_internal
 ___
 }
 
@@ -431,10 +431,10 @@ $idx="%r8";
 $ido="%r9";
 
 $code.=<<___;
-.globl  RC4_set_key
-.type   RC4_set_key,\@function,3
+.globl  rc4_set_key_internal
+.type   rc4_set_key_internal,\@function,3
 .align  16
-RC4_set_key:
+rc4_set_key_internal:
         _CET_ENDBR
         lea     8($dat),$dat
         lea     ($inp,$len),$inp
@@ -502,7 +502,7 @@ RC4_set_key:
         mov     %eax,-8($dat)
         mov     %eax,-4($dat)
         ret
-.size   RC4_set_key,.-RC4_set_key
+.size   rc4_set_key_internal,.-rc4_set_key_internal
 ___
 
 sub reg_part {