Prepare for 0.9.8k release.

[oweals/openssl.git] / crypto / aes / aes_core.c

diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
index 3a80e18b0a4856103a2da23f88d945bb0a925107..cffdd4daec4daa5e474d68cb13b320c549006e64 100644 (file)
--- a/crypto/aes/aes_core.c
+++ b/crypto/aes/aes_core.c
@@ -37,6 +37,10 @@
 
 #include <stdlib.h>
 #include <openssl/aes.h>
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 #include "aes_locl.h"
 
 /*
@@ -631,6 +635,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        int i = 0;
        u32 temp;
 
+#ifdef OPENSSL_FIPS
+       FIPS_selftest_check();
+#endif
+
        if (!userKey || !key)
                return -1;
        if (bits != 128 && bits != 192 && bits != 256)