archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix segfault caused by openssl_pkey_new() in ext/openssl/tests/006.phpt

Browse source
This commit is contained in:
Henrique do Nascimento Angelo 2008-07-15 02:46:26 +00:00
parent 2ef07c40f5
commit f385e69fdb
2 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

30
ext/openssl/openssl.c
View file

@ -2950,8 +2950,10 @@ PHP_FUNCTION(openssl_pkey_new)
OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), rsa, dmp1); OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), rsa, dmp1);
OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), rsa, dmq1); OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), rsa, dmq1);
OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), rsa, iqmp); OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), rsa, iqmp);
if (EVP_PKEY_assign_RSA(pkey, rsa)) { if (rsa->n && rsa->d) {
RETURN_RESOURCE(zend_list_insert(pkey, le_key)); if (EVP_PKEY_assign_RSA(pkey, rsa)) {
RETURN_RESOURCE(zend_list_insert(pkey, le_key));
}
} }
RSA_free(rsa); RSA_free(rsa);
} }
@ -2969,11 +2971,13 @@ PHP_FUNCTION(openssl_pkey_new)
OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), dsa, g); OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), dsa, g);
OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), dsa, priv_key); OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), dsa, priv_key);
OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), dsa, pub_key); OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), dsa, pub_key);
if (!dsa->priv_key && !dsa->pub_key) { if (dsa->p && dsa->q && dsa->g) {
DSA_generate_key(dsa); if (!dsa->priv_key && !dsa->pub_key) {
} DSA_generate_key(dsa);
if (EVP_PKEY_assign_DSA(pkey, dsa)) { }
RETURN_RESOURCE(zend_list_insert(pkey, le_key)); if (EVP_PKEY_assign_DSA(pkey, dsa)) {
RETURN_RESOURCE(zend_list_insert(pkey, le_key));
}
} }
DSA_free(dsa); DSA_free(dsa);
} }
@ -2990,11 +2994,13 @@ PHP_FUNCTION(openssl_pkey_new)
OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), dh, g); OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), dh, g);
OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), dh, priv_key); OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), dh, priv_key);
OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), dh, pub_key); OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), dh, pub_key);
if (!dh->pub_key) { if (dh->p && dh->g) {
DH_generate_key(dh); if (!dh->pub_key) {
} DH_generate_key(dh);
if (EVP_PKEY_assign_DH(pkey, dh)) { }
RETURN_RESOURCE(zend_list_insert(pkey, le_key)); if (EVP_PKEY_assign_DH(pkey, dh)) {
RETURN_RESOURCE(zend_list_insert(pkey, le_key));
}
} }
DH_free(dh); DH_free(dh);
} }

25
ext/openssl/tests/006.phpt Normal file
View file

@ -0,0 +1,25 @@
--TEST--
openssl_pkey_new() with an empty sub-array arg generates a malformed resource
--SKIPIF--
<?php if (!extension_loaded("openssl")) print "skip"; ?>
--FILE--
<?php
/* openssl_pkey_get_details() segfaults when getting the information
from openssl_pkey_new() with an empty sub-array arg */
$rsa = array(b"rsa" => array());
$dsa = array(b"dsa" => array());
$dh = array(b"dh" => array());
openssl_pkey_get_details(openssl_pkey_new($rsa));
openssl_pkey_get_details(openssl_pkey_new($dsa));
openssl_pkey_get_details(openssl_pkey_new($dh));
?>
--EXPECTF--
Warning: openssl_pkey_get_details() expects parameter 1 to be resource, boolean given in %s on line %d
Warning: openssl_pkey_get_details() expects parameter 1 to be resource, boolean given in %s on line %d
Warning: openssl_pkey_get_details() expects parameter 1 to be resource, boolean given in %s on line %d