Author: billbarker
Date: Sat Oct 31 01:34:30 2015
New Revision: 1711567
URL: http://svn.apache.org/viewvc?rev=1711567&view=rev
Log:
Constant name changed in OpenSSL master
Modified:
tomcat/native/branches/1.1.x/native/src/sslnetwork.c
Modified: tomcat/native/branches/1.1.x/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslnetwork.c?rev=1711567&r1=1711566&r2=1711567&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/sslnetwork.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslnetwork.c Sat Oct 31 01:34:30
2015
@@ -638,8 +638,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;
}
#if OPENSSL_VERSION_NUMBER >= 0x1000100fL
@@ -665,8 +668,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
