From 518099af59fbde0e7140459c76f59c9ac24bdf9c Mon Sep 17 00:00:00 2001
From: "Simon L. B. Nielsen" <simon@FreeBSD.org>
Date: Sun, 7 Jun 2009 19:56:18 +0000
Subject: Import OpenSSL 0.9.8k.

---
 crypto/aes/aes_core.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'crypto/aes/aes_core.c')

diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
index 3a80e18b0a48..cffdd4daec4d 100644
--- 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)
-- 
cgit v1.2.3