diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-29 17:08:02 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-29 17:08:02 +0000 |
| commit | 15272ab4ed1e6250412fccd48200ed9eae59608f (patch) | |
| tree | a5996ea67966a778a16565f19dfc2e7c7f49b376 /openssl/crypto/rc5/rc5_skey.c | |
| parent | 3827301b2ea5a45ac009c3bf9f08586ff40b8506 (diff) | |
| download | vcxsrv-15272ab4ed1e6250412fccd48200ed9eae59608f.tar.gz vcxsrv-15272ab4ed1e6250412fccd48200ed9eae59608f.tar.bz2 vcxsrv-15272ab4ed1e6250412fccd48200ed9eae59608f.zip | |
Updated to openssl 1.0.0
Diffstat (limited to 'openssl/crypto/rc5/rc5_skey.c')
| -rw-r--r-- | openssl/crypto/rc5/rc5_skey.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/openssl/crypto/rc5/rc5_skey.c b/openssl/crypto/rc5/rc5_skey.c index 247fa6500..a2e00a41c 100644 --- a/openssl/crypto/rc5/rc5_skey.c +++ b/openssl/crypto/rc5/rc5_skey.c @@ -56,28 +56,11 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include <openssl/rc5.h> -#ifdef OPENSSL_FIPS -#include <openssl/fips.h> -#endif - #include "rc5_locl.h" -#ifdef OPENSSL_FIPS -void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, - int rounds) - { - if (FIPS_mode()) - FIPS_BAD_ABORT(RC5) - private_RC5_32_set_key(key, len, data, rounds); - } -void private_RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, - int rounds) -#else void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, int rounds) -#endif { RC5_32_INT L[64],l,ll,A,B,*S,k; int i,j,m,c,t,ii,jj; |