You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by bi...@apache.org on 2015/05/20 06:22:59 UTC
svn commit: r1680456 - in /tomcat/native/branches/1.1.x/native/src:
sslcontext.c sslutils.c
Author: billbarker
Date: Wed May 20 04:22:58 2015
New Revision: 1680456
URL: http://svn.apache.org/r1680456
Log:
Fix errors when compiling against openssl master
Modified:
tomcat/native/branches/1.1.x/native/src/sslcontext.c
tomcat/native/branches/1.1.x/native/src/sslutils.c
Modified: tomcat/native/branches/1.1.x/native/src/sslcontext.c
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslcontext.c?rev=1680456&r1=1680455&r2=1680456&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/sslcontext.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslcontext.c Wed May 20 04:22:58 2015
@@ -121,12 +121,21 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
/* requested but not supported */
#endif
} else {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
if (mode == SSL_MODE_CLIENT)
ctx = SSL_CTX_new(SSLv23_client_method());
else if (mode == SSL_MODE_SERVER)
ctx = SSL_CTX_new(SSLv23_server_method());
else
ctx = SSL_CTX_new(SSLv23_method());
+#else
+ if (mode == SSL_MODE_CLIENT)
+ ctx = SSL_CTX_new(TLS_client_method());
+ else if (mode == SSL_MODE_SERVER)
+ ctx = SSL_CTX_new(TLS_server_method());
+ else
+ ctx = SSL_CTX_new(TLS_method());
+#endif
}
if (!ctx) {
Modified: tomcat/native/branches/1.1.x/native/src/sslutils.c
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslutils.c?rev=1680456&r1=1680455&r2=1680456&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/sslutils.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslutils.c Wed May 20 04:22:58 2015
@@ -720,7 +720,10 @@ void SSL_callback_handshake(const SSL *s
int state = SSL_get_state(ssl);
if (state == SSL3_ST_SR_CLNT_HELLO_A
- || state == SSL23_ST_SR_CLNT_HELLO_A) {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ || state == SSL23_ST_SR_CLNT_HELLO_A
+#endif
+ ) {
con->reneg_state = RENEG_ABORT;
/* XXX: rejecting client initiated renegotiation
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org