diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2010-10-01 22:59:02 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2010-10-01 22:59:02 +0000 |
| commit | 367b2622e0527401666a65476f4111fdda2e3c12 (patch) | |
| tree | dc507d2394eb3b616bd9eae56d17671899a24a05 /lib/libcrypto/evp/e_rc4.c | |
| parent | ae9cbeba0dc25f0e95e6a0e50b6c161bf6384e17 (diff) | |
resolve conflicts, fix local changes
Diffstat (limited to 'lib/libcrypto/evp/e_rc4.c')
| -rw-r--r-- | lib/libcrypto/evp/e_rc4.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libcrypto/evp/e_rc4.c b/lib/libcrypto/evp/e_rc4.c index 55baad7446d..8b5175e0fdc 100644 --- a/lib/libcrypto/evp/e_rc4.c +++ b/lib/libcrypto/evp/e_rc4.c @@ -64,7 +64,6 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/rc4.h> -#include "evp_locl.h" /* FIXME: surely this is available elsewhere? */ #define EVP_RC4_KEY_SIZE 16 @@ -79,7 +78,7 @@ typedef struct 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); + const unsigned char *in, size_t inl); static const EVP_CIPHER r4_cipher= { NID_rc4, @@ -129,7 +128,7 @@ static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, } static int rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, unsigned int inl) + const unsigned char *in, size_t inl) { RC4(&data(ctx)->ks,inl,in,out); return 1; |