diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-03-28 16:04:56 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-03-28 16:15:36 +0200 |
| commit | 4c5b427124a2af3d951fed869cc86452e8b6290c (patch) | |
| tree | d75d1716d61fdec9fe09e8d3a8a2fa9eee21ca2e | |
| parent | fa7f215d19b3546c028b2cfb9864d28a06ac29af (diff) | |
| download | php-git-4c5b427124a2af3d951fed869cc86452e8b6290c.tar.gz | |
Fix bug #61404 ext\openssl\tests\021.phpt fails
| -rw-r--r-- | ext/openssl/tests/021.phpt | 13 |
1 files changed, 8 insertions, 5 deletions
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) |