import OpenSSL-1.0.1c

1 files changed, 8 insertions, 1 deletions

diff --git a/src/lib/libcrypto/cast/c_skey.c b/src/lib/libcrypto/cast/c_skey.c
index 76e40005c9..cb6bf9fee3 100644
--- a/src/lib/libcrypto/cast/c_skey.c
+++ b/src/lib/libcrypto/cast/c_skey.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include <openssl/cast.h>
 #include "cast_lcl.h"
 #include "cast_s.h"
@@ -71,8 +72,14 @@
 #define S5 CAST_S_table5
 #define S6 CAST_S_table6
 #define S7 CAST_S_table7
-
 void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data)
+#ifdef OPENSSL_FIPS
+        {
+        fips_cipher_abort(CAST);
+        private_CAST_set_key(key, len, data);
+        }
+void private_CAST_set_key(CAST_KEY *key, int len, const unsigned char *data)
+#endif
         {
         CAST_LONG x[16];
         CAST_LONG z[16];