diff options
Diffstat (limited to 'src/lib/libcrypto/bf')
| -rw-r--r-- | src/lib/libcrypto/bf/bf_skey.c | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/blowfish.h | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/lib/libcrypto/bf/bf_skey.c b/src/lib/libcrypto/bf/bf_skey.c index 3b0bca41ae..d8e6287a32 100644 --- a/src/lib/libcrypto/bf/bf_skey.c +++ b/src/lib/libcrypto/bf/bf_skey.c | |||
| @@ -64,13 +64,6 @@ | |||
| 64 | #include "bf_pi.h" | 64 | #include "bf_pi.h" |
| 65 | 65 | ||
| 66 | void BF_set_key(BF_KEY *key, int len, const unsigned char *data) | 66 | void BF_set_key(BF_KEY *key, int len, const unsigned char *data) |
| 67 | #ifdef OPENSSL_FIPS | ||
| 68 | { | ||
| 69 | fips_cipher_abort(BLOWFISH); | ||
| 70 | private_BF_set_key(key, len, data); | ||
| 71 | } | ||
| 72 | void private_BF_set_key(BF_KEY *key, int len, const unsigned char *data) | ||
| 73 | #endif | ||
| 74 | { | 67 | { |
| 75 | int i; | 68 | int i; |
| 76 | BF_LONG *p,ri,in[2]; | 69 | BF_LONG *p,ri,in[2]; |
diff --git a/src/lib/libcrypto/bf/blowfish.h b/src/lib/libcrypto/bf/blowfish.h index 4b6c8920a4..65685f478c 100644 --- a/src/lib/libcrypto/bf/blowfish.h +++ b/src/lib/libcrypto/bf/blowfish.h | |||
| @@ -104,9 +104,6 @@ typedef struct bf_key_st | |||
| 104 | BF_LONG S[4*256]; | 104 | BF_LONG S[4*256]; |
| 105 | } BF_KEY; | 105 | } BF_KEY; |
| 106 | 106 | ||
| 107 | #ifdef OPENSSL_FIPS | ||
| 108 | void private_BF_set_key(BF_KEY *key, int len, const unsigned char *data); | ||
| 109 | #endif | ||
| 110 | void BF_set_key(BF_KEY *key, int len, const unsigned char *data); | 107 | void BF_set_key(BF_KEY *key, int len, const unsigned char *data); |
| 111 | 108 | ||
| 112 | void BF_encrypt(BF_LONG *data,const BF_KEY *key); | 109 | void BF_encrypt(BF_LONG *data,const BF_KEY *key); |
