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 c24a5b12812446b880e8da35e3d463fa75ab67e5..88ceb46bc54d11fbc613c049c24c938d6bcfada5 100644 (file)
--- a/crypto/rc4/rc4.h
+++ b/crypto/rc4/rc4.h
@@ -64,6 +64,8 @@
 #error RC4 is disabled.
 #endif
 
+#include <stddef.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -72,16 +74,13 @@ typedef struct rc4_key_st
        {
        RC4_INT x,y;
        RC4_INT data[256];
-#if defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
-       /* see crypto/rc4/asm/rc4-ia64.S for further details... */
-       RC4_INT pad[512-256-2];
-#endif
        } RC4_KEY;
 
  
 const char *RC4_options(void);
 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,
+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