diff options
author | jkim <jkim@FreeBSD.org> | 2014-04-10 22:39:22 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2014-04-10 22:39:22 +0000 |
commit | aeb5a4ff70fa036e3502afc9daf7d02795216340 (patch) | |
tree | c5b5657bc6509d897204957128bcbeac4535b4b7 /crypto/openssl/doc/ssl/SSL_CTX_set_options.pod | |
parent | 8f4a94c1c91787a4ac5272d05fa061275e720a27 (diff) | |
download | FreeBSD-src-aeb5a4ff70fa036e3502afc9daf7d02795216340.zip FreeBSD-src-aeb5a4ff70fa036e3502afc9daf7d02795216340.tar.gz |
MFC: r261037, r264278
Merge OpenSSL 1.0.1f and 1.0.1g.
Diffstat (limited to 'crypto/openssl/doc/ssl/SSL_CTX_set_options.pod')
-rw-r--r-- | crypto/openssl/doc/ssl/SSL_CTX_set_options.pod | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod b/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod index cc588f3..fded060 100644 --- a/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod +++ b/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod @@ -88,9 +88,10 @@ As of OpenSSL 0.9.8q and 1.0.0c, this option has no effect. ... -=item SSL_OP_MSIE_SSLV2_RSA_PADDING +=item SSL_OP_SAFARI_ECDHE_ECDSA_BUG -As of OpenSSL 0.9.7h and 0.9.8a, this option has no effect. +Don't prefer ECDHE-ECDSA ciphers when the client appears to be Safari on OS X. +OS X 10.8..10.8.3 has broken support for ECDHE-ECDSA ciphers. =item SSL_OP_SSLEAY_080_CLIENT_DH_BUG |