clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix accessing public key from x509 resource

Browse Source 
add test
fix test under win32
This commit is contained in:
Rob Richards 2007-01-19 19:23:20 +00:00
parent 7ae095f947
commit e053dcc066
3 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/openssl/openssl.c
View File

@ -1945,11 +1945,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

34
ext/openssl/tests/005.phpt Normal file
View File

@ -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

4
ext/openssl/tests/bug38261.phpt
View File

@ -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