Add -clrext option to 'x509'

[openssl.git] / crypto / rc4 / rc4.h

diff --git a/crypto/rc4/rc4.h b/crypto/rc4/rc4.h
index ea66f1ce8d65e2b6fc6a0fa282418a3fa3740286..8556dddab0ecebd90ede06fa64e8e8f66ed455e9 100644 (file)
--- a/crypto/rc4/rc4.h
+++ b/crypto/rc4/rc4.h
@@ -63,6 +63,10 @@
 extern "C" {
 #endif
 
+#ifdef NO_RC4
+#error RC4 is disabled.
+#endif
+
 #include <openssl/opensslconf.h> /* RC4_INT */
 
 typedef struct rc4_key_st
@@ -71,21 +75,12 @@ typedef struct rc4_key_st
        RC4_INT data[256];
        } RC4_KEY;
 
-#ifndef NOPROTO
  
 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,
+void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
+void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata,
                unsigned char *outdata);
 
-#else
-
-const char *RC4_options();
-void RC4_set_key();
-void RC4();
-
-#endif
-
 #ifdef  __cplusplus
 }
 #endif