diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-30 12:36:28 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-30 12:36:28 +0000 |
| commit | ff48c0d9098080b51ea12710029135916d117806 (patch) | |
| tree | 96e6af9caf170ba21a1027b24e306a07e27d7b75 /openssl/crypto/rc5/rc5_skey.c | |
| parent | bb731f5ac92655c4860a41fa818a7a63005f8369 (diff) | |
| download | vcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.gz vcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.bz2 vcxsrv-ff48c0d9098080b51ea12710029135916d117806.zip | |
svn merge -r514:HEAD ^/branches/released .
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; |