svn commit: r1658646 - in /tomcat/native/branches/1.1.x: ./ native/src/sslnetwork.c

[rjung]

Author: rjung
Date: Tue Feb 10 09:00:11 2015
New Revision: 1658646

URL: http://svn.apache.org/r1658646
Log:
Replace access to OpenSSL SSL internals
by accessor function. Internals are no longer
available for OpenSSL master.

Not compiled or tested, waiting for GUMP.

Backport of r1658641 from trunk.

Modified:
    tomcat/native/branches/1.1.x/   (props changed)
    tomcat/native/branches/1.1.x/native/src/sslnetwork.c

Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 10 09:00:11 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1658557
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1658557,1658641-1658642
 /tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
 
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083

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=1658646&r1=1658645&r2=1658646&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/sslnetwork.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslnetwork.c Tue Feb 10 09:00:11 
2015
@@ -410,7 +410,7 @@ ssl_socket_recv(apr_socket_t *sock, char
             rv  = apr_get_netos_error();
             i   = SSL_get_error(con->ssl, s);
             /* Special case if the "close notify" alert send by peer */
-            if (s == 0 && (con->ssl->shutdown & SSL_RECEIVED_SHUTDOWN)) {
+            if (s == 0 && (SSL_get_shutdown(con->ssl) & 
SSL_RECEIVED_SHUTDOWN)) {
                 con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
                 return APR_EOF;
             }
@@ -647,7 +647,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
     if (SSL_get_state(con->ssl) != SSL_ST_OK) {
         return APR_EGENERAL;
     }
-    con->ssl->state = SSL_ST_ACCEPT;
+    SSL_set_state(con->ssl, SSL_ST_ACCEPT);
 
     apr_socket_timeout_get(con->sock, &timeout);
     ecode = SSL_ERROR_WANT_READ;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org