Don't try to use unvalidated composite ciphers in FIPS mode

diff --git a/CHANGES b/CHANGES
index d8c701c6fb49375623f2b581d0734da967e239be..943502ec0b928c5dc15b809f6934e818b5aaf661 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,9 @@
 
  Changes between 1.0.1b and 1.0.1c [xx XXX xxxx]
 
-  *)
+  *) In FIPS mode don't try to use composite ciphers as they are not
+     approved.
+     [Steve Henson]
 
  Changes between 1.0.1a and 1.0.1b [26 Apr 2012]
 

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index b96d26faba2eb9c4e48b7ddcc60008a0bef15ab9..92d1e94d6a9ade30ed836b02a1a2d77ef156e140 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -620,6 +620,11 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
                    s->ssl_version < TLS1_VERSION)
                        return 1;
 
+#ifdef OPENSSL_FIPS
+               if (FIPS_mode())
+                       return 1;
+#endif
+
                if      (c->algorithm_enc == SSL_RC4 &&
                         c->algorithm_mac == SSL_MD5 &&
                         (evp=EVP_get_cipherbyname("RC4-HMAC-MD5")))