Author: markt
Date: Mon Nov 2 10:32:58 2015
New Revision: 1711934
URL: http://svn.apache.org/viewvc?rev=1711934&view=rev
Log:
Port Bill's fix for OpenSSL constant name change from 1.1.x to trunk.
Modified:
tomcat/native/trunk/native/src/sslnetwork.c
Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1711934&r1=1711933&r2=1711934&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Mon Nov 2 10:32:58 2015
@@ -627,8 +627,11 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
retVal = SSL_do_handshake(con->ssl);
if (retVal <= 0)
return APR_EGENERAL;
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
if (SSL_get_state(con->ssl) != SSL_ST_OK) {
+#else
+ if (SSL_get_state(con->ssl) != TLS_ST_OK) {
+#endif
return APR_EGENERAL;
}
SSL_set_state(con->ssl, SSL_ST_ACCEPT);
@@ -649,8 +652,11 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
break;
}
con->reneg_state = RENEG_REJECT;
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
if (SSL_get_state(con->ssl) != SSL_ST_OK) {
+#else
+ if (SSL_get_state(con->ssl) != TLS_ST_OK) {
+#endif
return APR_EGENERAL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
