1 files changed, 20 insertions, 10 deletions

diff --git a/src/lib/libcrypto/evp/e_rc4.c b/src/lib/libcrypto/evp/e_rc4.c
index c7e58a75cc..1c1e3b3857 100644
--- a/src/lib/libcrypto/evp/e_rc4.c
+++ b/src/lib/libcrypto/evp/e_rc4.c
@@ -63,14 +63,15 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 
-static void rc4_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-        unsigned char *iv,int enc);
-static void rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-        unsigned char *in, unsigned int inl);
+static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv,int enc);
+static int rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                      const unsigned char *in, unsigned int inl);
 static EVP_CIPHER r4_cipher=
         {
         NID_rc4,
         1,EVP_RC4_KEY_SIZE,0,
+        EVP_CIPH_VARIABLE_LENGTH,
         rc4_init_key,
         rc4_cipher,
         NULL,
@@ -78,14 +79,22 @@ static EVP_CIPHER r4_cipher=
                 sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc4)),
         NULL,
         NULL,
+        NULL
         };
 
 static EVP_CIPHER r4_40_cipher=
         {
         NID_rc4_40,
         1,5 /* 40 bit */,0,
+        EVP_CIPH_VARIABLE_LENGTH,
         rc4_init_key,
         rc4_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc4)),
+        NULL, 
+        NULL,
+        NULL
         };
 
 EVP_CIPHER *EVP_rc4(void)
@@ -98,18 +107,19 @@ EVP_CIPHER *EVP_rc4_40(void)
         return(&r4_40_cipher);
         }
 
-static void rc4_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-             unsigned char *iv, int enc)
+static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
         {
-        if (key != NULL)
-                memcpy(&(ctx->c.rc4.key[0]),key,EVP_CIPHER_CTX_key_length(ctx));
+        memcpy(&(ctx->c.rc4.key[0]),key,EVP_CIPHER_CTX_key_length(ctx));
         RC4_set_key(&(ctx->c.rc4.ks),EVP_CIPHER_CTX_key_length(ctx),
                 ctx->c.rc4.key);
+        return 1;
         }
 
-static void rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-             unsigned char *in, unsigned int inl)
+static int rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                      const unsigned char *in, unsigned int inl)
         {
         RC4(&(ctx->c.rc4.ks),inl,in,out);
+        return 1;
         }
 #endif