evp: prevent underflow in base64 decoding

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

diff --git a/crypto/rc4/rc4.h b/crypto/rc4/rc4.h
index 7418c2a9a210689f8f2610da7abd10ff2107d20b..88ceb46bc54d11fbc613c049c24c938d6bcfada5 100644 (file)
--- a/crypto/rc4/rc4.h
+++ b/crypto/rc4/rc4.h
@@ -59,15 +59,16 @@
 #ifndef HEADER_RC4_H
 #define HEADER_RC4_H
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_RC4
+#include <openssl/opensslconf.h> /* OPENSSL_NO_RC4, RC4_INT */
+#ifdef OPENSSL_NO_RC4
 #error RC4 is disabled.
 #endif
 
-#include <openssl/opensslconf.h> /* RC4_INT */
+#include <stddef.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
 typedef struct rc4_key_st
        {
@@ -77,8 +78,9 @@ typedef struct rc4_key_st
 
  
 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 private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
+void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
                unsigned char *outdata);
 
 #ifdef  __cplusplus