import OpenSSL-1.0.1c

1 files changed, 8 insertions, 0 deletions

diff --git a/src/lib/libcrypto/bf/bf_skey.c b/src/lib/libcrypto/bf/bf_skey.c
index 3673cdee6e..3b0bca41ae 100644
--- a/src/lib/libcrypto/bf/bf_skey.c
+++ b/src/lib/libcrypto/bf/bf_skey.c
@@ -58,11 +58,19 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <openssl/crypto.h>
 #include <openssl/blowfish.h>
 #include "bf_locl.h"
 #include "bf_pi.h"
 
 void BF_set_key(BF_KEY *key, int len, const unsigned char *data)
+#ifdef OPENSSL_FIPS
+        {
+        fips_cipher_abort(BLOWFISH);
+        private_BF_set_key(key, len, data);
+        }
+void private_BF_set_key(BF_KEY *key, int len, const unsigned char *data)
+#endif
         {
         int i;
         BF_LONG *p,ri,in[2];