resolve conflicts

1 files changed, 21 insertions, 0 deletions

diff --git a/src/lib/libcrypto/aes/aes_misc.c b/src/lib/libcrypto/aes/aes_misc.c
index 4fead1b4c7..f083488ecb 100644
--- a/src/lib/libcrypto/aes/aes_misc.c
+++ b/src/lib/libcrypto/aes/aes_misc.c
@@ -50,6 +50,7 @@
  */
 
 #include <openssl/opensslv.h>
+#include <openssl/crypto.h>
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
@@ -62,3 +63,23 @@ const char *AES_options(void) {
         return "aes(partial)";
 #endif
 }
+
+/* FIPS wrapper functions to block low level AES calls in FIPS mode */
+
+int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+                        AES_KEY *key)
+        {
+#ifdef OPENSSL_FIPS
+        fips_cipher_abort(AES);
+#endif
+        return private_AES_set_encrypt_key(userKey, bits, key);
+        }
+
+int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+                        AES_KEY *key)
+        {
+#ifdef OPENSSL_FIPS
+        fips_cipher_abort(AES);
+#endif
+        return private_AES_set_decrypt_key(userKey, bits, key);
+        }