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

Merge branch 'PHP-7.1'

Browse Source
This commit is contained in:
Jakub Zelenka 2016-08-14 20:44:08 +01:00
commit f13fd9e72a
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/openssl/openssl.c
View File

@ -4059,11 +4059,8 @@ zend_bool php_openssl_pkey_init_dsa(DSA *dsa, zval *data)
OPENSSL_PKEY_SET_BN(data, pub_key);
OPENSSL_PKEY_SET_BN(data, priv_key);
if (priv_key || pub_key) {
return 1;
}
if (!DSA_set0_key(dsa, pub_key, priv_key)) {
return 0;
if (pub_key) {
return DSA_set0_key(dsa, pub_key, priv_key);
}
/* generate key */
@ -4098,11 +4095,8 @@ zend_bool php_openssl_pkey_init_dh(DH *dh, zval *data)
OPENSSL_PKEY_SET_BN(data, priv_key);
OPENSSL_PKEY_SET_BN(data, pub_key);
if (priv_key || pub_key) {
return 1;
}
if (!DH_set0_key(dh, pub_key, priv_key)) {
return 0;
if (pub_key) {
return DH_set0_key(dh, pub_key, priv_key);
}
/* generate key */