Change #include filenames from <foo.h> to <openssl.h>.

[openssl.git] / crypto / rc4 / rc4_enc.c

diff --git a/crypto/rc4/rc4_enc.c b/crypto/rc4/rc4_enc.c
index de57a970bf81013015bdab6b576fbe207b4e7a22..3256bea8cc86970aa5729d5a0583b521d29a0f38 100644 (file)
--- a/crypto/rc4/rc4_enc.c
+++ b/crypto/rc4/rc4_enc.c
@@ -1,5 +1,5 @@
-/* crypto/rc4/rc4_enc.org */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* crypto/rc4/rc4_enc.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -56,35 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
-/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- *
- * Always modify rc4_enc.org since rc4_enc.c is automatically generated from
- * it during SSLeay configuration.
- * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING 
- */
-
-#include "rc4.h"
-
-/* if this is defined data[i] is used instead of *data, this is a %20
- * speedup on x86 */
-#undef RC4_INDEX
-
-char *RC4_version="RC4 part of SSLeay 0.8.1a 24-Jun-1998";
-
-char *RC4_options()
-       {
-#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 <openssl/rc4.h>
+#include "rc4_locl.h"
 
 /* RC4 as implemented from a posting from
  * Newsgroups: sci.crypt
@@ -94,44 +67,8 @@ char *RC4_options()
  * Date: Wed, 14 Sep 1994 06:35:31 GMT
  */
 
-void RC4_set_key(key, len, data)
-RC4_KEY *key;
-int len;
-register unsigned char *data;
-       {
-        register RC4_INT tmp;
-        register int id1,id2;
-        register RC4_INT *d;
-        unsigned int i;
-        
-        d= &(key->data[0]);
-       for (i=0; i<256; i++)
-               d[i]=i;
-        key->x = 0;     
-        key->y = 0;     
-        id1=id2=0;     
-
-#define SK_LOOP(n) { \
-               tmp=d[(n)]; \
-               id2 = (data[id1] + tmp + id2) & 0xff; \
-               if (++id1 == len) id1=0; \
-               d[(n)]=d[id2]; \
-               d[id2]=tmp; }
-
-       for (i=0; i < 256; i+=4)
-               {
-               SK_LOOP(i+0);
-               SK_LOOP(i+1);
-               SK_LOOP(i+2);
-               SK_LOOP(i+3);
-               }
-       }
-    
-void RC4(key, len, indata, outdata)
-RC4_KEY *key;
-unsigned long len;
-unsigned char *indata;
-unsigned char *outdata;
+void RC4(RC4_KEY *key, unsigned long len, unsigned char *indata,
+            unsigned char *outdata)
        {
         register RC4_INT *d;
         register RC4_INT x,y,tx,ty;
@@ -155,7 +92,6 @@ unsigned char *outdata;
 #define RC4_LOOP(a,b,i)        LOOP(a[i],b[i])
 #endif
 
-       i= -(int)len;
        i=(int)(len>>3L);
        if (i)
                {