Author: kkolinko
Date: Mon Feb 9 23:26:44 2015
New Revision: 1658603
URL: http://svn.apache.org/r1658603
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.
It is merge of r1658557 from tomcat/native/trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/sslinfo.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 9 23:26:44 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
+/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/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/sslinfo.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslinfo.c?rev=1658603&r1=1658602&r2=1658603&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/sslinfo.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslinfo.c Mon Feb 9 23:26:44 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);
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1658603&r1=1658602&r2=1658603&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Mon Feb 9
23:26:44 2015
@@ -36,6 +36,14 @@
new documentation project for Tomcat Native was started.
</p>
</section>
+<section name="Changes between 1.1.32 and 1.1.33">
+ <changelog>
+ <fix>
+ Fix compilation failures with master branch of OpenSSL. Replace access
+ to OpenSSL session internals by accessor function. (rjung)
+ </fix>
+ </changelog>
+</section>
<section name="Changes between 1.1.31 and 1.1.32">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
