From bd7bb973b1f4791f000a890b1c1387fcd28c65ee Mon Sep 17 00:00:00 2001 From: Anatoliy Belsky Date: Wed, 28 Mar 2012 16:04:56 +0200 Subject: Fix bug #61404 ext\openssl\tests\021.phpt fails --- ext/openssl/tests/021.phpt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'ext/openssl') diff --git a/ext/openssl/tests/021.phpt b/ext/openssl/tests/021.phpt index 00e2158f8d..391b6a5279 100644 --- a/ext/openssl/tests/021.phpt +++ b/ext/openssl/tests/021.phpt @@ -8,6 +8,8 @@ $cert = "file://" . dirname(__FILE__) . "/cert.crt"; $priv = "file://" . dirname(__FILE__) . "/private.key"; $wrong = "wrong"; $pub = "file://" . dirname(__FILE__) . "/public.key"; +$config = __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf'; +$config_arg = array('config' => $config); $dn = array( "countryName" => "BR", @@ -21,14 +23,15 @@ $args = array( "digest_alg" => "sha1", "private_key_bits" => 2048, "private_key_type" => OPENSSL_KEYTYPE_DSA, - "encrypt_key" => true + "encrypt_key" => true, + "config" => $config ); -$privkey = openssl_pkey_new(); +$privkey = openssl_pkey_new($config_arg); $csr = openssl_csr_new($dn, $privkey, $args); var_dump(openssl_csr_sign($csr, null, $privkey, 365, $args)); -var_dump(openssl_csr_sign($csr, null, $privkey, 365)); -var_dump(openssl_csr_sign($csr, $cert, $priv, 365)); +var_dump(openssl_csr_sign($csr, null, $privkey, 365, $config_arg)); +var_dump(openssl_csr_sign($csr, $cert, $priv, 365, $config_arg)); var_dump(openssl_csr_sign($csr, $wrong, $privkey, 365)); var_dump(openssl_csr_sign($csr, null, $wrong, 365)); var_dump(openssl_csr_sign($csr, null, $privkey, $wrong)); @@ -38,7 +41,7 @@ var_dump(openssl_csr_sign(array(), null, $privkey, 365)); var_dump(openssl_csr_sign($csr, array(), $privkey, 365)); var_dump(openssl_csr_sign($csr, null, array(), 365)); var_dump(openssl_csr_sign($csr, null, $privkey, array())); -var_dump(openssl_csr_sign($csr, null, $privkey, 365, array())); +var_dump(openssl_csr_sign($csr, null, $privkey, 365, $config_arg)); ?> --EXPECTF-- resource(%d) of type (OpenSSL X.509) -- cgit v1.2.1 From bff8152565375c863f67833b73e2629c4d50cf63 Mon Sep 17 00:00:00 2001 From: Anatoliy Belsky Date: Wed, 28 Mar 2012 17:11:58 +0200 Subject: Fix bug #61401 ext\openssl\tests\004.phpt fails --- ext/openssl/tests/004.phpt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/openssl') diff --git a/ext/openssl/tests/004.phpt b/ext/openssl/tests/004.phpt index b9c41590cf..aca9818ad1 100644 --- a/ext/openssl/tests/004.phpt +++ b/ext/openssl/tests/004.phpt @@ -9,12 +9,12 @@ $a = 1; var_dump(openssl_csr_new(1,$a)); var_dump(openssl_csr_new(1,$a,1,1)); $a = array(); -var_dump(openssl_csr_new(array(), $a, array(), array())); +var_dump(openssl_csr_new(array(), $a, array('config' => __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf'), array())); //this leaks $a = array(1,2); $b = array(1,2); -var_dump(openssl_csr_new($a, $b)); +var_dump(openssl_csr_new($a, $b, array('config' => __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf'))); echo "Done\n"; -- cgit v1.2.1