generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dr. Stephen Henson 2012-04-26 18:51:26 +00:00
parent 0ae89cf32e
commit a56f9a612b
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGES
View File

@ -52,7 +52,13 @@
certificates. certificates.
[Steve Henson] [Steve Henson]
Changes between 1.0.1a and 1.0.1b [xx XXX xxxx] 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]
*) OpenSSL 1.0.0 sets SSL_OP_ALL to 0x80000FFFL and OpenSSL 1.0.1 and *) OpenSSL 1.0.0 sets SSL_OP_ALL to 0x80000FFFL and OpenSSL 1.0.1 and
1.0.1a set SSL_OP_NO_TLSv1_1 to 0x00000400L which would unfortunately 1.0.1a set SSL_OP_NO_TLSv1_1 to 0x00000400L which would unfortunately

5
ssl/ssl_ciph.c
View File

@ -620,6 +620,11 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
s->ssl_version < TLS1_VERSION) s->ssl_version < TLS1_VERSION)
return 1; return 1;
#ifdef OPENSSL_FIPS
if (FIPS_mode())
return 1;
#endif
if (c->algorithm_enc == SSL_RC4 && if (c->algorithm_enc == SSL_RC4 &&
c->algorithm_mac == SSL_MD5 && c->algorithm_mac == SSL_MD5 &&
(evp=EVP_get_cipherbyname("RC4-HMAC-MD5"))) (evp=EVP_get_cipherbyname("RC4-HMAC-MD5")))