com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c
| From: | Jakub Zelenka | Date: | Thu, 27 Aug 2015 19:17:33 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88782@lists.php.net to get a copy of this message | ||
Commit: 6b9f31ab741eea5c2e590b312827f5a779cd1773
Author: Jakub Zelenka <bukka@php.net> Thu, 27 Aug 2015 20:17:33 +0100
Parents: 859712a89c65605477fbfd10300f2ebad25f9970 c39336d1d866866de629695fbd9971fb48f27ea9
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6b9f31ab741eea5c2e590b312827f5a779cd1773
Log:
Merge branch 'PHP-5.6'
Changed paths:
MM ext/openssl/openssl.c
Diff:
diff --cc ext/openssl/openssl.c
index cf05c1b,0421524..2ba50c9
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -3625,18 -3593,14 +3625,15 @@@ PHP_FUNCTION(openssl_pkey_new
if (pkey) {
DH *dh = DH_new();
if (dh) {
- OPENSSL_PKEY_SET_BN(Z_ARRVAL_PP(data), dh, p);
- 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, pub_key);
+ OPENSSL_PKEY_SET_BN(Z_ARRVAL_P(data), dh, p);
+ OPENSSL_PKEY_SET_BN(Z_ARRVAL_P(data), dh, g);
+ OPENSSL_PKEY_SET_BN(Z_ARRVAL_P(data), dh, priv_key);
+ OPENSSL_PKEY_SET_BN(Z_ARRVAL_P(data), dh, pub_key);
- if (dh->p && dh->g) {
- if (!dh->pub_key) {
- DH_generate_key(dh);
- }
- if (EVP_PKEY_assign_DH(pkey, dh)) {
- ZVAL_COPY_VALUE(return_value, zend_list_insert(pkey, le_key));
- return;
- }
+ if (dh->p && dh->g &&
+ (dh->pub_key || DH_generate_key(dh)) &&
+ EVP_PKEY_assign_DH(pkey, dh)) {
- RETURN_RESOURCE(zend_list_insert(pkey, le_key TSRMLS_CC));
++ ZVAL_COPY_VALUE(return_value, zend_list_insert(pkey, le_key));
++ return;
}
DH_free(dh);
}