From 5e52c4857f27ad40fcb89efaa801b97758dc4bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Thu, 20 Aug 2009 17:22:41 +0000 Subject: [PATCH] - fix RC4 prototype --- openssl-1.0.0-beta3-fips.patch | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/openssl-1.0.0-beta3-fips.patch b/openssl-1.0.0-beta3-fips.patch index ef0f68f..707a0b9 100644 --- a/openssl-1.0.0-beta3-fips.patch +++ b/openssl-1.0.0-beta3-fips.patch @@ -544,7 +544,7 @@ diff -up openssl-1.0.0-beta3/crypto/camellia/Makefile.fips openssl-1.0.0-beta3/c + cmll_cfb.c cmll_ctr.c cmll_fblk.c -LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o $(CMLL_ENC) -+LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o cmll_fblk.o $(CMLL_ENC) ++LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o $(CMLL_ENC) cmll_fblk.o SRC= $(LIBSRC) @@ -10850,7 +10850,7 @@ diff -up /dev/null openssl-1.0.0-beta3/crypto/rc4/rc4_fblk.c diff -up openssl-1.0.0-beta3/crypto/rc4/rc4.h.fips openssl-1.0.0-beta3/crypto/rc4/rc4.h --- openssl-1.0.0-beta3/crypto/rc4/rc4.h.fips 2009-08-11 18:07:30.000000000 +0200 +++ openssl-1.0.0-beta3/crypto/rc4/rc4.h 2009-08-11 18:07:30.000000000 +0200 -@@ -78,8 +78,11 @@ typedef struct rc4_key_st +@@ -78,6 +78,9 @@ typedef struct rc4_key_st const char *RC4_options(void); @@ -10858,11 +10858,8 @@ diff -up openssl-1.0.0-beta3/crypto/rc4/rc4.h.fips openssl-1.0.0-beta3/crypto/rc +void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); +#endif void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); --void RC4(RC4_KEY *key, size_t len, const unsigned char *indata, -+void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata, + void RC4(RC4_KEY *key, size_t len, const unsigned char *indata, unsigned char *outdata); - - #ifdef __cplusplus diff -up openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c.fips openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c --- openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c.fips 2007-01-21 14:07:13.000000000 +0100 +++ openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c 2009-08-11 18:07:30.000000000 +0200