You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2015/03/27 04:09:53 UTC
svn commit: r1669497 - in /tomcat/native/branches/1.1.x: ./
native/src/sslinfo.c
Author: rjung
Date: Fri Mar 27 03:09:52 2015
New Revision: 1669497
URL: http://svn.apache.org/r1669497
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 r1669496 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/sslinfo.c
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 27 03:09:52 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,1669302
+/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,1669496
/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=1669497&r1=1669496&r2=1669497&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/sslinfo.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslinfo.c Fri Mar 27 03:09:52 2015
@@ -180,15 +180,16 @@ static char *lookup_ssl_cert_dn(X509_NAM
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));
+ n = OBJ_obj2nid(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,
- xsne->value->length);
- result[xsne->value->length] = '\0';
+ ASN1_STRING *adata = X509_NAME_ENTRY_get_data(xsne);
+ int len = ASN1_STRING_length(adata);
+ result = malloc(len + 1);
+ memcpy(result, ASN1_STRING_data(adata), len);
+ result[len] = '\0';
#if APR_CHARSET_EBCDIC
- ap_xlate_proto_from_ascii(result, xsne->value->length);
+ ap_xlate_proto_from_ascii(result, len);
#endif /* APR_CHARSET_EBCDIC */
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org