aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/rc5/rc5.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-30 12:36:28 +0000
committermarha <marha@users.sourceforge.net>2010-03-30 12:36:28 +0000
commitff48c0d9098080b51ea12710029135916d117806 (patch)
tree96e6af9caf170ba21a1027b24e306a07e27d7b75 /openssl/crypto/rc5/rc5.h
parentbb731f5ac92655c4860a41fa818a7a63005f8369 (diff)
downloadvcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.gz
vcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.bz2
vcxsrv-ff48c0d9098080b51ea12710029135916d117806.zip
svn merge -r514:HEAD ^/branches/released .
Diffstat (limited to 'openssl/crypto/rc5/rc5.h')
-rw-r--r--openssl/crypto/rc5/rc5.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/openssl/crypto/rc5/rc5.h b/openssl/crypto/rc5/rc5.h
index f73a2a02a..4b3c153b5 100644
--- a/openssl/crypto/rc5/rc5.h
+++ b/openssl/crypto/rc5/rc5.h
@@ -94,10 +94,7 @@ typedef struct rc5_key_st
RC5_32_INT data[2*(RC5_16_ROUNDS+1)];
} RC5_32_KEY;
-#ifdef OPENSSL_FIPS
-void private_RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
- int rounds);
-#endif
+
void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
int rounds);
void RC5_32_ecb_encrypt(const unsigned char *in,unsigned char *out,RC5_32_KEY *key,