diff options
Diffstat (limited to 'src/lib/libcrypto/cast')
| -rw-r--r-- | src/lib/libcrypto/cast/c_skey.c | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/cast/cast.h | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/lib/libcrypto/cast/c_skey.c b/src/lib/libcrypto/cast/c_skey.c index cb6bf9fee3..54ea98cd0b 100644 --- a/src/lib/libcrypto/cast/c_skey.c +++ b/src/lib/libcrypto/cast/c_skey.c | |||
| @@ -73,13 +73,6 @@ | |||
| 73 | #define S6 CAST_S_table6 | 73 | #define S6 CAST_S_table6 |
| 74 | #define S7 CAST_S_table7 | 74 | #define S7 CAST_S_table7 |
| 75 | void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data) | 75 | void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data) |
| 76 | #ifdef OPENSSL_FIPS | ||
| 77 | { | ||
| 78 | fips_cipher_abort(CAST); | ||
| 79 | private_CAST_set_key(key, len, data); | ||
| 80 | } | ||
| 81 | void private_CAST_set_key(CAST_KEY *key, int len, const unsigned char *data) | ||
| 82 | #endif | ||
| 83 | { | 76 | { |
| 84 | CAST_LONG x[16]; | 77 | CAST_LONG x[16]; |
| 85 | CAST_LONG z[16]; | 78 | CAST_LONG z[16]; |
diff --git a/src/lib/libcrypto/cast/cast.h b/src/lib/libcrypto/cast/cast.h index 203922ea2b..8741532e9e 100644 --- a/src/lib/libcrypto/cast/cast.h +++ b/src/lib/libcrypto/cast/cast.h | |||
| @@ -83,9 +83,6 @@ typedef struct cast_key_st | |||
| 83 | int short_key; /* Use reduced rounds for short key */ | 83 | int short_key; /* Use reduced rounds for short key */ |
| 84 | } CAST_KEY; | 84 | } CAST_KEY; |
| 85 | 85 | ||
| 86 | #ifdef OPENSSL_FIPS | ||
| 87 | void private_CAST_set_key(CAST_KEY *key, int len, const unsigned char *data); | ||
| 88 | #endif | ||
| 89 | void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data); | 86 | void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data); |
| 90 | void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out, const CAST_KEY *key, | 87 | void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out, const CAST_KEY *key, |
| 91 | int enc); | 88 | int enc); |
