Author: rjung Date: Thu Mar 26 09:17:16 2015 New Revision: 1669303 URL: http://svn.apache.org/r1669303 Log: Replace access to OpenSSL SSL internals by accessor function. Internals are no longer available for OpenSSL master.
Not tested, waiting for GUMP. Backport of 1669302 from 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 Thu Mar 26 09:17:16 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,1650304,1658557,1658641-1658642,1658724 +/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,1650304,1658557,1658641-1658642,1658724,1669302 /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=1669303&r1=1669302&r2=1669303&view=diff ============================================================================== --- tomcat/native/branches/1.1.x/native/src/sslinfo.c (original) +++ tomcat/native/branches/1.1.x/native/src/sslinfo.c Thu Mar 26 09:17:16 2015 @@ -177,12 +177,10 @@ static char *lookup_ssl_cert_dn(X509_NAM for (i = 0; info_cert_dn_rec[i].fid != 0; i++) { if (info_cert_dn_rec[i].fid == dnidx) { - for (j = 0; j < sk_X509_NAME_ENTRY_num((STACK_OF(X509_NAME_ENTRY) *) - (xsname->entries)); j++) { - xsne = sk_X509_NAME_ENTRY_value((STACK_OF(X509_NAME_ENTRY) *) - (xsname->entries), j); - n =OBJ_obj2nid((ASN1_OBJECT *)X509_NAME_ENTRY_get_object(xsne)); + for (j = 0; j < X509_NAME_entry_count(xsname); j++) { + xsne = X509_NAME_get_entry(xsname, j); + n = OBJ_obj2nid((ASN1_OBJECT *)X509_NAME_ENTRY_get_object(xsne)); if (n == info_cert_dn_rec[i].nid && idx-- == 0) { result = malloc(xsne->value->length + 1); memcpy(result, xsne->value->data, 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=1669303&r1=1669302&r2=1669303&view=diff ============================================================================== --- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Thu Mar 26 09:17:16 2015 @@ -36,6 +36,14 @@ new documentation project for Tomcat Native was started. </p> </section> +<section name="Changes between 1.1.33 and 1.1.34"> + <changelog> + <fix> + Fix compilation failures with master branch of OpenSSL. Replace access + to OpenSSL internals by accessor functions. (rjung) + </fix> + </changelog> +</section> <section name="Changes between 1.1.32 and 1.1.33"> <changelog> <fix> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org