diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-08-25 20:26:11 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-08-25 20:26:11 +0100 |
| commit | c39336d1d866866de629695fbd9971fb48f27ea9 (patch) | |
| tree | e000f6a5c0789f7aa9eb52133134ea9017e535d5 | |
| parent | e5adf2b427915ff070ddcba24d7c4ed3014743e9 (diff) | |
| download | php-git-c39336d1d866866de629695fbd9971fb48f27ea9.tar.gz | |
Fix bug #55259 (openssl extension does not get the DH parameters from DH key resource)
| -rw-r--r-- | ext/openssl/openssl.c | 11 | ||||
| -rw-r--r-- | ext/openssl/tests/bug55259.phpt | 29 |
2 files changed, 33 insertions, 7 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index ef5162283b..0421524d64 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -3597,13 +3597,10 @@ PHP_FUNCTION(openssl_pkey_new) 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); - if (dh->p && dh->g) { - if (!dh->pub_key) { - DH_generate_key(dh); - } - if (EVP_PKEY_assign_DH(pkey, dh)) { - RETURN_RESOURCE(zend_list_insert(pkey, le_key TSRMLS_CC)); - } + 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)); } DH_free(dh); } diff --git a/ext/openssl/tests/bug55259.phpt b/ext/openssl/tests/bug55259.phpt new file mode 100644 index 0000000000..27ededdb18 --- /dev/null +++ b/ext/openssl/tests/bug55259.phpt @@ -0,0 +1,29 @@ +--TEST-- +Bug #55259 (openssl extension does not get the DH parameters from DH key resource) +--SKIPIF-- +<?php if (!extension_loaded("openssl")) die("skip"); ?> +--FILE-- +<?php + +$phex = 'dcf93a0b883972ec0e19989ac5a2ce310e1d37717e8d9571bb7623731866e61e' . + 'f75a2e27898b057f9891c2e27a639c3f29b60814581cd3b2ca3986d268370557' . + '7d45c2e7e52dc81c7a171876e5cea74b1448bfdfaf18828efd2519f14e45e382' . + '6634af1949e5b535cc829a483b8a76223e5d490a257f05bdff16f2fb22c583ab'; +$dh_details = array( 'p' => $phex, 'g' => '2' ); +$dh = openssl_pkey_new(array( 'dh'=> array( 'p' => $phex, 'g' => '2' ))); +var_dump($dh); +$dh = openssl_pkey_new(array( 'dh'=> array( 'p' => hex2bin($phex), 'g' => '2' ))); +$details = openssl_pkey_get_details($dh); +var_dump(bin2hex($details['dh']['p'])); +var_dump($details['dh']['g']); +var_dump(strlen($details['dh']['pub_key'])); +var_dump(strlen($details['dh']['priv_key'])); +echo "Done"; +?> +--EXPECT-- +bool(false) +string(256) "dcf93a0b883972ec0e19989ac5a2ce310e1d37717e8d9571bb7623731866e61ef75a2e27898b057f9891c2e27a639c3f29b60814581cd3b2ca3986d2683705577d45c2e7e52dc81c7a171876e5cea74b1448bfdfaf18828efd2519f14e45e3826634af1949e5b535cc829a483b8a76223e5d490a257f05bdff16f2fb22c583ab" +string(1) "2" +int(128) +int(128) +Done |