1 files changed, 7 insertions, 22 deletions

diff --git a/src/lib/libssl/src/crypto/rc4/rc4.org b/src/lib/libcrypto/rc4/rc4.h
index c558651af8..7418c2a9a2 100644
--- a/src/lib/libssl/src/crypto/rc4/rc4.org
+++ b/src/lib/libcrypto/rc4/rc4.h
@@ -1,4 +1,4 @@
-/* crypto/rc4/rc4.org */
+/* crypto/rc4/rc4.h */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,14 +56,6 @@
  * [including the GNU Public Licence.]
  */
 
-/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- *
- * Always modify rc4.org since rc4.h is automatically generated from
- * it during SSLeay configuration.
- *
- * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING 
- */
-
 #ifndef HEADER_RC4_H
 #define HEADER_RC4_H
 
@@ -71,9 +63,11 @@
 extern "C" {
 #endif
 
-/* using int types make the structure larger but make the code faster
- * on most boxes I have tested - up to %20 faster. */
-#define RC4_INT unsigned int
+#ifdef NO_RC4
+#error RC4 is disabled.
+#endif
+
+#include <openssl/opensslconf.h> /* RC4_INT */
 
 typedef struct rc4_key_st
         {
@@ -81,21 +75,12 @@ typedef struct rc4_key_st
         RC4_INT data[256];
         } RC4_KEY;
 
-#ifndef NOPROTO
  
-char *RC4_options(void);
+const char *RC4_options(void);
 void RC4_set_key(RC4_KEY *key, int len, unsigned char *data);
 void RC4(RC4_KEY *key, unsigned long len, unsigned char *indata,
                 unsigned char *outdata);
 
-#else
-
-char *RC4_options();
-void RC4_set_key();
-void RC4();
-
-#endif
-
 #ifdef  __cplusplus
 }
 #endif