[PHP-CVS] cvs: php-src /ext/openssl openssl.c /ext/openssl/tests bug28382.phpt bug28382cert.txt

[Pierre-Alain Joye]

pajoye          Sun Jul 30 17:02:28 2006 UTC

  Added files:                 
    /php-src/ext/openssl/tests  bug28382.phpt bug28382cert.txt 

  Modified files:              
    /php-src/ext/openssl        openssl.c 
  Log:
  - #28382, add support for x509 extensions
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.113&r2=1.114&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.113 php-src/ext/openssl/openssl.c:1.114
--- php-src/ext/openssl/openssl.c:1.113 Sun Jul 30 16:27:02 2006
+++ php-src/ext/openssl/openssl.c       Sun Jul 30 17:02:27 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: openssl.c,v 1.113 2006/07/30 16:27:02 pajoye Exp $ */
+/* $Id: openssl.c,v 1.114 2006/07/30 17:02:27 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -940,6 +940,9 @@
        zend_bool useshortnames = 1;
        char * tmpstr;
        zval * subitem;
+       X509_EXTENSION *extension;
+       ASN1_OCTET_STRING *extdata;
+       char *extname;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|b", &zcert, 
&useshortnames) == FAILURE) {
                return;
@@ -1014,6 +1017,18 @@
        }
        add_assoc_zval(return_value, "purposes", subitem);
 
+       MAKE_STD_ZVAL(subitem);
+       array_init(subitem);
+
+
+       for (i = 0; i < X509_get_ext_count(cert); i++) {
+               extension = X509_get_ext(cert, i);
+               extdata = X509_EXTENSION_get_data(extension);
+               extname = 
strdup(OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(extension))));
+               add_assoc_asn1_string(subitem, extname, extdata);
+       }
+       add_assoc_zval(return_value, "extensions", subitem);
+
        if (certresource == -1 && cert) {
                X509_free(cert);
        }

http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug28382.phpt?view=markup&rev=1.1
Index: php-src/ext/openssl/tests/bug28382.phpt
+++ php-src/ext/openssl/tests/bug28382.phpt
--TEST--
#28382, openssl_x509_parse extensions support
--SKIPIF--
<?php 
if (!extension_loaded("openssl")) die("skip"); 
?>
--FILE--
<?php
$cert = file_get_contents(dirname(__FILE__) . "/bug28382cert.txt", "rb");
$ext = openssl_x509_parse($cert);
var_dump($ext['extensions']);
?>
--EXPECTF--
array(11) {
  ["basicConstraints"]=>
  string(2) "%s"
  ["nsComment"]=>
  string(40) "%s"
  ["nsCertType"]=>
  string(4) "%s"
  ["crlDistributionPoints"]=>
  string(56) "%s"
  ["nsCaPolicyUrl"]=>
  string(40) "%s"
  ["subjectAltName"]=>
  string(26) "%s"
  ["subjectKeyIdentifier"]=>
  string(22) "%s"
  ["authorityKeyIdentifier"]=>
  string(159) "%s"
  ["keyUsage"]=>
  string(4) "%s"
  ["nsBaseUrl"]=>
  string(22) "%s"
  ["UNDEF"]=>
  string(4) "%s"
}

http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug28382cert.txt?view=markup&rev=1.1
Index: php-src/ext/openssl/tests/bug28382cert.txt
+++ php-src/ext/openssl/tests/bug28382cert.txt
-----BEGIN CERTIFICATE-----
MIIEoDCCBAmgAwIBAgIBJzANBgkqhkiG9w0BAQQFADCBkDELMAkGA1UEBhMCUk8x
EDAOBgNVBAgTB1JvbWFuaWExEDAOBgNVBAcTB0NyYWlvdmExDzANBgNVBAoTBlNl
cmdpdTETMBEGA1UECxMKU2VyZ2l1IFNSTDESMBAGA1UEAxMJU2VyZ2l1IENBMSMw
IQYJKoZIhvcNAQkBFhRuX3NlcmdpdUBob3RtYWlsLmNvbTAeFw0wNDA1MTQxMzM0
NTZaFw0wNTA1MTQxMzM0NTZaMIGaMQswCQYDVQQGEwJSTzEQMA4GA1UECBMHUm9t
YW5pYTEQMA4GA1UEBxMHQ3JhaW92YTETMBEGA1UEChMKU2VyZ2l1IFNSTDETMBEG
A1UECxMKU2VyZ2l1IFNSTDEYMBYGA1UEAxMPU2VyZ2l1IHBlcnNvbmFsMSMwIQYJ
KoZIhvcNAQkBFhRuX3NlcmdpdUBob3RtYWlsLmNvbTCBnzANBgkqhkiG9w0BAQEF
AAOBjQAwgYkCgYEApNj7XXz8T8FcLIWpBniPYom3QcT6T7u0xRPHqtqzj5oboBYp
DJe5d354/y0gJTpiLt8+fTrPgWXnbHm3pOHgXzTcX6Arani0GDU0/xDi4VkCRGcS
YqX2sJpcDzAbmK9UDMt3xf/O1B8AJan3RfO0Bm3ozTEPziLMkmsiYr5b/L8CAwEA
AaOCAfwwggH4MAkGA1UdEwQCMAAwNQYJYIZIAYb4QgENBCgWJkZvciBHcmlkIHVz
ZSBvbmx5OyByZXF1ZXN0IHRhZyB1c2VyVGFnMBEGCWCGSAGG+EIBAQQEAwIF4DA/
BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vbW9iaWxlLmJsdWUtc29mdHdhcmUucm86
OTAvY2EvY3JsLnNodG1sMDUGCWCGSAGG+EIBCAQoFiZodHRwOi8vbW9iaWxlLmJs
dWUtc29mdHdhcmUucm86OTAvcHViLzAhBgNVHREEGjAYgRZzZXJnaXVAYmx1ZXNv
ZnR3YXJlLnJvMB0GA1UdDgQWBBSwp//5QRXeIzm93TEPl6CyonTg/DCBpwYDVR0j
BIGfMIGcoYGWpIGTMIGQMQswCQYDVQQGEwJSTzEQMA4GA1UECBMHUm9tYW5pYTEQ
MA4GA1UEBxMHQ3JhaW92YTEPMA0GA1UEChMGU2VyZ2l1MRMwEQYDVQQLEwpTZXJn
aXUgU1JMMRIwEAYDVQQDEwlTZXJnaXUgQ0ExIzAhBgkqhkiG9w0BCQEWFG5fc2Vy
Z2l1QGhvdG1haWwuY29tggEAMAsGA1UdDwQEAwIE8DAjBglghkgBhvhCAQIEFhYU
aHR0cDovLzYyLjIzMS45OC41Mi8wCwYDKgMEBAQ+52I0MA0GCSqGSIb3DQEBBAUA
A4GBAIBIOJ+iiLyQfNJEY+IMefayQea0nmuXYY+F+L1DFjSC7xChytgYoPNnKkhh
3dWPtxbswiqKYUnGi6y3Hi4UhDsOaDW29t2S305hSc2qgjOiNtRYQIVYQ8EHG1k7
Fl63S7uCOhnVJt+4MnUK1N6/pwgsp+Z2GvEsDG1qCKnvNpf6
-----END CERTIFICATE-----

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php