2015-02-09 22:52 GMT+03:00 <rj...@apache.org>: > Author: rjung > Date: Mon Feb 9 19:52:36 2015 > New Revision: 1658557 > > URL: http://svn.apache.org/r1658557 > Log: > Replace access to OpenSSL session 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/sslinfo.c
This change is in native trunk, but Gump builds the 1.1.x branch... In project/tomcat-native.xml of Gump: <svn repository="asf" dir="tomcat/native/branches/1.1.x"/> > Modified: tomcat/native/trunk/native/src/sslinfo.c > URL: > http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=1658557&r1=1658556&r2=1658557&view=diff > ============================================================================== > --- tomcat/native/trunk/native/src/sslinfo.c (original) > +++ tomcat/native/trunk/native/src/sslinfo.c Mon Feb 9 19:52:36 2015 > @@ -218,8 +218,9 @@ TCN_IMPLEMENT_CALL(jobject, SSLSocket, g > { > SSL_SESSION *session = SSL_get_session(s->ssl); > if (session) { > - array = tcn_new_arrayb(e, &session->session_id[0], > - session->session_id_length); > + unsigned int len; > + const unsigned char *id = SSL_SESSION_get_id(session, &len); > + array = tcn_new_arrayb(e, id, len); > } > } > break; > @@ -298,8 +299,9 @@ TCN_IMPLEMENT_CALL(jstring, SSLSocket, g > { > SSL_SESSION *session = SSL_get_session(s->ssl); > if (session) { > - char *hs = convert_to_hex(&session->session_id[0], > - session->session_id_length); > + unsigned int len; > + const unsigned char *id = SSL_SESSION_get_id(session, &len); > + char *hs = convert_to_hex(id, len); > if (hs) { > value = tcn_new_string(e, hs); > free(hs); > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
