Author: rjung
Date: Tue Feb 10 08:53:09 2015
New Revision: 1658641
URL: http://svn.apache.org/r1658641
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.
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=1658641&r1=1658640&r2=1658641&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Tue Feb 10 08:53:09 2015
@@ -408,7 +408,7 @@ ssl_socket_recv(apr_socket_t *sock, char
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)) {
*len = 0;
return APR_EOF;
}
@@ -633,7 +633,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);
ecode = SSL_ERROR_WANT_READ;
while (ecode == SSL_ERROR_WANT_READ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
