cataphract                               Wed, 14 Sep 2011 10:55:46 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=316731

Log:
- ext/openssl/tests/bug36732.phpt more portable.

Bug: https://bugs.php.net/36732 (Closed) configargs req_extensions & 
x509_extensions broken
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/openssl/tests/bug36732.phpt
    A   php/php-src/branches/PHP_5_3/ext/openssl/tests/openssl.cnf
    U   php/php-src/branches/PHP_5_4/ext/openssl/tests/bug36732.phpt
    U   php/php-src/branches/PHP_5_4/ext/openssl/tests/openssl.cnf
    U   php/php-src/trunk/ext/openssl/tests/bug36732.phpt
    U   php/php-src/trunk/ext/openssl/tests/openssl.cnf

Modified: php/php-src/branches/PHP_5_3/ext/openssl/tests/bug36732.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/openssl/tests/bug36732.phpt        
2011-09-14 10:40:40 UTC (rev 316730)
+++ php/php-src/branches/PHP_5_3/ext/openssl/tests/bug36732.phpt        
2011-09-14 10:55:46 UTC (rev 316731)
@@ -9,7 +9,8 @@
 <?php
 $configargs = array(
         "req_extensions" => "v3_req",
-        "x509_extensions" => "usr_cert"
+        "x509_extensions" => "usr_cert",
+               "config" => __DIR__."/openssl.cnf",
 );

 $dn = array(

Added: php/php-src/branches/PHP_5_3/ext/openssl/tests/openssl.cnf
===================================================================
--- php/php-src/branches/PHP_5_3/ext/openssl/tests/openssl.cnf                  
        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/openssl/tests/openssl.cnf  2011-09-14 
10:55:46 UTC (rev 316731)
@@ -0,0 +1,43 @@
+[ req ]
+default_bits           = 1024
+default_keyfile        = privkey.pem
+distinguished_name     = req_distinguished_name
+attributes             = req_attributes
+x509_extensions        = v3_ca # The extentions to add to the self signed cert
+string_mask = MASK:4294967295
+
+
+[ req_distinguished_name ]
+countryName                    = Country Name (2 letter code)
+countryName_default            = AU
+countryName_min                        = 2
+countryName_max                        = 2
+stateOrProvinceName            = State or Province Name (full name)
+stateOrProvinceName_default    = Some-State
+localityName                   = Locality Name (eg, city)
+0.organizationName             = Organization Name (eg, company)
+0.organizationName_default     = Internet Widgits Pty Ltd
+organizationalUnitName         = Organizational Unit Name (eg, section)
+commonName                     = Common Name (eg, YOUR name)
+commonName_max                 = 64
+emailAddress                   = Email Address
+emailAddress_max               = 64
+
+[ req_attributes ]
+challengePassword              = A challenge password
+challengePassword_min          = 4
+challengePassword_max          = 20
+unstructuredName               = An optional company name
+
+[ v3_req ]
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+[ v3_ca ]
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid:always,issuer:always
+basicConstraints = CA:true
+
+[ usr_cert ]
+basicConstraints=CA:FALSE
+

Modified: php/php-src/branches/PHP_5_4/ext/openssl/tests/bug36732.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/openssl/tests/bug36732.phpt        
2011-09-14 10:40:40 UTC (rev 316730)
+++ php/php-src/branches/PHP_5_4/ext/openssl/tests/bug36732.phpt        
2011-09-14 10:55:46 UTC (rev 316731)
@@ -9,7 +9,8 @@
 <?php
 $configargs = array(
         "req_extensions" => "v3_req",
-        "x509_extensions" => "usr_cert"
+        "x509_extensions" => "usr_cert",
+               "config" => __DIR__."/openssl.cnf",
 );

 $dn = array(

Modified: php/php-src/branches/PHP_5_4/ext/openssl/tests/openssl.cnf
===================================================================
--- php/php-src/branches/PHP_5_4/ext/openssl/tests/openssl.cnf  2011-09-14 
10:40:40 UTC (rev 316730)
+++ php/php-src/branches/PHP_5_4/ext/openssl/tests/openssl.cnf  2011-09-14 
10:55:46 UTC (rev 316731)
@@ -38,3 +38,6 @@
 authorityKeyIdentifier=keyid:always,issuer:always
 basicConstraints = CA:true

+[ usr_cert ]
+basicConstraints=CA:FALSE
+

Modified: php/php-src/trunk/ext/openssl/tests/bug36732.phpt
===================================================================
--- php/php-src/trunk/ext/openssl/tests/bug36732.phpt   2011-09-14 10:40:40 UTC 
(rev 316730)
+++ php/php-src/trunk/ext/openssl/tests/bug36732.phpt   2011-09-14 10:55:46 UTC 
(rev 316731)
@@ -9,7 +9,8 @@
 <?php
 $configargs = array(
         "req_extensions" => "v3_req",
-        "x509_extensions" => "usr_cert"
+        "x509_extensions" => "usr_cert",
+               "config" => __DIR__."/openssl.cnf",
 );

 $dn = array(

Modified: php/php-src/trunk/ext/openssl/tests/openssl.cnf
===================================================================
--- php/php-src/trunk/ext/openssl/tests/openssl.cnf     2011-09-14 10:40:40 UTC 
(rev 316730)
+++ php/php-src/trunk/ext/openssl/tests/openssl.cnf     2011-09-14 10:55:46 UTC 
(rev 316731)
@@ -38,3 +38,6 @@
 authorityKeyIdentifier=keyid:always,issuer:always
 basicConstraints = CA:true

+[ usr_cert ]
+basicConstraints=CA:FALSE
+

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

Reply via email to