| commit | eb16853f1084abf2770588727ef99c6a244abc50 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Thu May 10 15:18:43 2012 -0700 |
| committer | Brian Carlstrom <[email protected]> | Thu May 10 15:18:43 2012 -0700 |
| tree | b07b2bffc95a1c06ee883cce1131d2d24513e230 | |
| parent | f42d491ab90c82302b0054c62014c1ee9b638aff [diff] [blame] |
openssl-1.0.1c upgrade Bug: 6478397 Change-Id: If231aadbeb92eba4383adf91969361102cdfad69
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 5898701..55deaaf 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c
@@ -620,6 +620,11 @@ 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")))