Update filenames in makefiles.

[openssl.git] / crypto / evp / e_rc4.c

diff --git a/crypto/evp/e_rc4.c b/crypto/evp/e_rc4.c
index 7e212b3be582c27c579eb814f1619e23bb1c451e..67af850bea1ab955cdc3159bd57bb9f8a55c3b73 100644 (file)
--- a/crypto/evp/e_rc4.c
+++ b/crypto/evp/e_rc4.c
@@ -56,12 +56,24 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_RC4
-
 #include <stdio.h>
 #include "cryptlib.h"
+
+#ifndef OPENSSL_NO_RC4
+
 #include <openssl/evp.h>
 #include <openssl/objects.h>
+#include <openssl/rc4.h>
+
+/* FIXME: surely this is available elsewhere? */
+#define EVP_RC4_KEY_SIZE               16
+
+typedef struct
+    {
+    RC4_KEY ks;        /* working key */
+    } EVP_RC4_KEY;
+
+#define data(ctx) ((EVP_RC4_KEY *)(ctx)->cipher_data)
 
 static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                        const unsigned char *iv,int enc);
@@ -75,8 +87,8 @@ static const EVP_CIPHER r4_cipher=
        rc4_init_key,
        rc4_cipher,
        NULL,
-       sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
-               sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc4)),
+       sizeof(EVP_RC4_KEY),
+       NULL,
        NULL,
        NULL,
        NULL
@@ -90,10 +102,10 @@ static const EVP_CIPHER r4_40_cipher=
        rc4_init_key,
        rc4_cipher,
        NULL,
-       sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
-               sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc4)),
+       sizeof(EVP_RC4_KEY),
        NULL, 
        NULL,
+       NULL,
        NULL
        };
 
@@ -110,16 +122,15 @@ const EVP_CIPHER *EVP_rc4_40(void)
 static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                        const unsigned char *iv, int enc)
        {
-       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);
+       RC4_set_key(&data(ctx)->ks,EVP_CIPHER_CTX_key_length(ctx),
+                   key);
        return 1;
        }
 
 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);
+       RC4(&data(ctx)->ks,inl,in,out);
        return 1;
        }
 #endif