sniper Mon Mar 14 16:00:04 2005 EDT
Modified files:
/php-src/ext/openssl openssl.c
Log:
- Fixed bug #18613 (Multiple OUs in x509 certificate not handled properly)
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.93&r2=1.94&ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.93 php-src/ext/openssl/openssl.c:1.94
--- php-src/ext/openssl/openssl.c:1.93 Wed Oct 27 07:07:25 2004
+++ php-src/ext/openssl/openssl.c Mon Mar 14 16:00:02 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.93 2004/10/27 11:07:25 wez Exp $ */
+/* $Id: openssl.c,v 1.94 2005/03/14 21:00:02 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -227,9 +227,9 @@
static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int
shortname TSRMLS_DC)
{
- zval * subitem;
- int i;
- char * sn, * ln;
+ zval *subitem, *subentries;
+ int i, j = -1, last = -1, obj_cnt = 0;
+ char *sname;
int nid;
X509_NAME_ENTRY * ne;
ASN1_STRING * str;
@@ -241,14 +241,39 @@
for (i = 0; i < X509_NAME_entry_count(name); i++) {
ne = X509_NAME_get_entry(name, i);
obj = X509_NAME_ENTRY_get_object(ne);
- str = X509_NAME_ENTRY_get_data(ne);
nid = OBJ_obj2nid(obj);
+ obj_cnt = 0;
+
if (shortname) {
- sn = (char*)OBJ_nid2sn(nid);
- add_assoc_stringl(subitem, sn, str->data, str->length,
1);
+ sname = (char *) OBJ_nid2sn(nid);
+ } else {
+ sname = (char *) OBJ_nid2ln(nid);
+ }
+
+ MAKE_STD_ZVAL(subentries);
+ array_init(subentries);
+
+ last = -1;
+ for (;;) {
+ j = X509_NAME_get_index_by_OBJ(name, obj, last);
+ if (j < 0) {
+ if (last != -1) break;
+ } else {
+ obj_cnt++;
+ ne = X509_NAME_get_entry(name, j);
+ str = X509_NAME_ENTRY_get_data(ne);
+ add_next_index_stringl(subentries, str->data,
str->length, 1);
+ }
+ last = j;
+ }
+ i = last;
+
+ if (obj_cnt > 1) {
+ add_assoc_zval_ex(subitem, sname, strlen(sname) + 1,
subentries);
} else {
- ln = (char*)OBJ_nid2ln(nid);
- add_assoc_stringl(subitem, ln, str->data, str->length,
1);
+ zval_dtor(subentries);
+ FREE_ZVAL(subentries);
+ add_assoc_stringl(subitem, sname, str->data,
str->length, 1);
}
}
zend_hash_update(HASH_OF(val), key, strlen(key) + 1, (void *)&subitem,
sizeof(subitem), NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
