Author: schultz
Date: Fri Dec 21 20:45:32 2012
New Revision: 1425135
URL: http://svn.apache.org/viewvc?rev=1425135&view=rev
Log:
Back-port r1424947, r1424971 from trunk.
Add new SSL_OP_* constants to OpenSSL option-detection.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/ssl.c
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
Merged /tomcat/native/trunk:r1424947,1424971
Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1425135&r1=1425134&r2=1425135&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Fri Dec 21 20:45:32 2012
@@ -110,6 +110,10 @@ static const jint supported_ssl_opts = 0
| SSL_OP_CIPHER_SERVER_PREFERENCE
#endif
+#ifdef SSL_OP_CRYPTOPRO_TLSEXT_BUG
+ | SSL_OP_CRYPTOPRO_TLSEXT_BUG
+#endif
+
#ifdef SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
| SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
#endif
@@ -150,6 +154,14 @@ static const jint supported_ssl_opts = 0
| SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG
#endif
+#ifdef SSL_OP_NO_COMPRESSION
+ | SSL_OP_NO_COMPRESSION
+#endif
+
+#ifdef SSL_OP_NO_QUERY_MTU
+ | SSL_OP_NO_QUERY_MTU
+#endif
+
#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
| SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
#endif
@@ -182,6 +194,10 @@ static const jint supported_ssl_opts = 0
| SSL_OP_SINGLE_DH_USE
#endif
+#ifdef SSL_OP_SINGLE_ECDH_USE
+ | SSL_OP_SINGLE_ECDH_USE
+#endif
+
#ifdef SSL_OP_SSLEAY_080_CLIENT_DH_BUG
| SSL_OP_SSLEAY_080_CLIENT_DH_BUG
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
