Author: rjung
Date: Fri Mar 27 03:08:44 2015
New Revision: 1669496
URL: http://svn.apache.org/r1669496
Log:
Replace access to OpenSSL SSL internals
by accessor function. Internals are no longer
available for OpenSSL master.
Not tested, waiting for GUMP.
Modified:
tomcat/native/trunk/native/src/sslinfo.c
Modified: tomcat/native/trunk/native/src/sslinfo.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=1669496&r1=1669495&r2=1669496&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslinfo.c (original)
+++ tomcat/native/trunk/native/src/sslinfo.c Fri Mar 27 03:08:44 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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
