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/26 10:14:53 UTC

svn commit: r1669302 - /tomcat/native/trunk/native/src/sslinfo.c

Author: rjung
Date: Thu Mar 26 09:14:52 2015
New Revision: 1669302

URL: http://svn.apache.org/r1669302
Log:
Replace access to OpenSSL SSL 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

Modified: tomcat/native/trunk/native/src/sslinfo.c
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=1669302&r1=1669301&r2=1669302&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslinfo.c (original)
+++ tomcat/native/trunk/native/src/sslinfo.c Thu Mar 26 09:14:52 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,



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org