From f3653b08a475372a0849cd9a3387a5997ce121c9 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Tue, 12 May 2015 13:51:02 -0400 Subject: Update Cryptlib and openssl Update Cryptlib to r16559 and openssl to 0.9.8zf Signed-off-by: Gary Ching-Pang Lin --- Cryptlib/OpenSSL/crypto/rc4/rc4_fblk.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Cryptlib/OpenSSL/crypto/rc4/rc4_fblk.c') diff --git a/Cryptlib/OpenSSL/crypto/rc4/rc4_fblk.c b/Cryptlib/OpenSSL/crypto/rc4/rc4_fblk.c index 1b2a4297..f2366851 100644 --- a/Cryptlib/OpenSSL/crypto/rc4/rc4_fblk.c +++ b/Cryptlib/OpenSSL/crypto/rc4/rc4_fblk.c @@ -1,5 +1,6 @@ /* crypto/rc4/rc4_fblk.c */ -/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL +/* + * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ /* ==================================================================== @@ -10,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -51,25 +52,24 @@ * ==================================================================== */ - #include #include "rc4_locl.h" #include #include #ifdef OPENSSL_FIPS -#include +# include #endif -/* FIPS mode blocking for RC4 has to be done separately since RC4_set_key - * may be implemented in an assembly language file. +/* + * FIPS mode blocking for RC4 has to be done separately since RC4_set_key may + * be implemented in an assembly language file. */ #ifdef OPENSSL_FIPS void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data) - { - if (FIPS_mode()) - FIPS_BAD_ABORT(RC4) - private_RC4_set_key(key, len, data); - } +{ + if (FIPS_mode()) + FIPS_BAD_ABORT(RC4) + private_RC4_set_key(key, len, data); +} #endif - -- cgit v1.2.3