diff options
author | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 09:50:31 -0400 |
---|---|---|
committer | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 13:13:13 -0400 |
commit | 91e3957fb0e38a5d5649f82e5d9f89dd0e85666f (patch) | |
tree | fe0992fb4cf6f3c2a5d597557552ae69caccbe70 /openssl/crypto/rc4/rc4_utl.c | |
parent | 9073d97eff3f6d3b33450ef3532a826674c7e1e8 (diff) | |
download | vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.tar.gz vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.tar.bz2 vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.zip |
Update openssl to version openssl-1.0.1m
Conflicts:
openssl/Makefile
openssl/Makefile.bak
openssl/crypto/cryptlib.c
Diffstat (limited to 'openssl/crypto/rc4/rc4_utl.c')
-rw-r--r-- | openssl/crypto/rc4/rc4_utl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openssl/crypto/rc4/rc4_utl.c b/openssl/crypto/rc4/rc4_utl.c index ab3f02fe6..7c6a15f1c 100644 --- a/openssl/crypto/rc4/rc4_utl.c +++ b/openssl/crypto/rc4/rc4_utl.c @@ -7,7 +7,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 @@ -54,9 +54,9 @@ #include <openssl/rc4.h> void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data) - { +{ #ifdef OPENSSL_FIPS - fips_cipher_abort(RC4); + fips_cipher_abort(RC4); #endif - private_RC4_set_key(key, len, data); - } + private_RC4_set_key(key, len, data); +} |