MFH: fix accessing public key from x509 resource

add test
fix test under win32

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 638005a52c2560600296536740be04aadd602444..3ccde2f27b42d7ca74617d4dbc9531669c1055b8 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1958,10 +1958,10 @@ static EVP_PKEY * php_openssl_evp_from_zval(zval ** val, int public_key, char *
                                /* got the key - return it */
                                return (EVP_PKEY*)what;
                        }
+               } else {
+                       /* other types could be used here - eg: file pointers and read in the data from them */
+                       TMP_CLEAN;
                }
-
-               /* other types could be used here - eg: file pointers and read in the data from them */
-               TMP_CLEAN;
        } else {
                /* force it to be a string and check if it refers to a file */
                /* passing non string values leaks, object uses toString, it returns NULL 

diff --git a/ext/openssl/tests/005.phpt b/ext/openssl/tests/005.phpt
new file mode 100644 (file)
index 0000000..069c945
--- /dev/null
+++ b/ext/openssl/tests/005.phpt
@@ -0,0 +1,34 @@
+--TEST--
+openSSL: read public key from x.509 resource
+--SKIPIF--
+<?php 
+if (!extension_loaded("openssl")) die("skip"); 
+?>
+--FILE--
+<?php 
+$dir = dirname(__FILE__);
+$file_pub = $dir . '/bug37820cert.pem';
+$file_key = $dir . '/bug37820key.pem';
+
+$priv_key = file_get_contents($file_key);
+$priv_key_id = openssl_get_privatekey($priv_key);
+
+$x509 = openssl_x509_read(file_get_contents($file_pub));
+
+$pub_key_id = openssl_get_publickey($x509);
+$data = "some custom data";
+if (!openssl_sign($data, $signature, $priv_key_id, OPENSSL_ALGO_MD5)) {
+       echo "openssl_sign failed.";
+}
+
+$ok = openssl_verify($data, $signature, $pub_key_id, OPENSSL_ALGO_MD5);
+if ($ok == 1) {
+   echo "Ok";
+} elseif ($ok == 0) {
+   echo "openssl_verify failed.";
+}
+
+
+?>
+--EXPECTF--
+Ok

diff --git a/ext/openssl/tests/bug38261.phpt b/ext/openssl/tests/bug38261.phpt
index e7d806083e857018f09a6f889a3cecb899d09c13..b06fa4f8fe40e6522ce763fa89776b72d1f1fe53 100644 (file)
--- a/ext/openssl/tests/bug38261.phpt
+++ b/ext/openssl/tests/bug38261.phpt
@@ -27,8 +27,8 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: openssl_x509_parse() expects at least 1 parameter, 0 given in %s/bug38261.php on line %d
+Warning: openssl_x509_parse() expects at least 1 parameter, 0 given in %sbug38261.php on line %d
 NULL
 bool(false)
 
-Catchable fatal error: Object of class stdClass could not be converted to string in %s/bug38261.php on line %d 
+Catchable fatal error: Object of class stdClass could not be converted to string in %sbug38261.php on line %d