diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/rc2/rc2.h | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/rc2/rc2_skey.c | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/lib/libcrypto/rc2/rc2.h b/src/lib/libcrypto/rc2/rc2.h index e542ec94ff..4c737f5b90 100644 --- a/src/lib/libcrypto/rc2/rc2.h +++ b/src/lib/libcrypto/rc2/rc2.h | |||
| @@ -79,9 +79,6 @@ typedef struct rc2_key_st | |||
| 79 | RC2_INT data[64]; | 79 | RC2_INT data[64]; |
| 80 | } RC2_KEY; | 80 | } RC2_KEY; |
| 81 | 81 | ||
| 82 | #ifdef OPENSSL_FIPS | ||
| 83 | void private_RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,int bits); | ||
| 84 | #endif | ||
| 85 | void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,int bits); | 82 | void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,int bits); |
| 86 | void RC2_ecb_encrypt(const unsigned char *in,unsigned char *out,RC2_KEY *key, | 83 | void RC2_ecb_encrypt(const unsigned char *in,unsigned char *out,RC2_KEY *key, |
| 87 | int enc); | 84 | int enc); |
diff --git a/src/lib/libcrypto/rc2/rc2_skey.c b/src/lib/libcrypto/rc2/rc2_skey.c index 6668ac011f..26b8dd63f6 100644 --- a/src/lib/libcrypto/rc2/rc2_skey.c +++ b/src/lib/libcrypto/rc2/rc2_skey.c | |||
| @@ -96,13 +96,6 @@ static const unsigned char key_table[256]={ | |||
| 96 | * the same as specifying 1024 for the 'bits' parameter. Bsafe uses | 96 | * the same as specifying 1024 for the 'bits' parameter. Bsafe uses |
| 97 | * a version where the bits parameter is the same as len*8 */ | 97 | * a version where the bits parameter is the same as len*8 */ |
| 98 | void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits) | 98 | void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits) |
| 99 | #ifdef OPENSSL_FIPS | ||
| 100 | { | ||
| 101 | fips_cipher_abort(RC2); | ||
| 102 | private_RC2_set_key(key, len, data, bits); | ||
| 103 | } | ||
| 104 | void private_RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits) | ||
| 105 | #endif | ||
| 106 | { | 99 | { |
| 107 | int i,j; | 100 | int i,j; |
| 108 | unsigned char *k; | 101 | unsigned char *k; |
