com php-src: Merge branch 'PHP-7.1': ext/openssl/openssl.c

From: Date: Wed, 18 Jan 2017 10:00:26 +0000
Subject: com php-src: Merge branch 'PHP-7.1': ext/openssl/openssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-96783@lists.php.net to get a copy of this message
Commit: a1fd706d7d3112be71094a28527e6eebeb3a277a Author: Joe Watkins <krakjoe@php.net> Wed, 18 Jan 2017 10:00:26 +0000 Parents: 7c17936c7014abfdf2d2c7c7cabac07eec8b4b4b 9977bdf9b3bd235899c980edda12315ad6fa1338 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a1fd706d7d3112be71094a28527e6eebeb3a277a Log: Merge branch 'PHP-7.1' * PHP-7.1: Remove more TSRMLS_CC macros Changed paths: MM ext/openssl/openssl.c Diff: diff --cc ext/openssl/openssl.c index 2ed6075,9aec7f9..72d0751 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@@ -3915,12 -3916,11 +3915,12 @@@ static EVP_PKEY * php_openssl_generate_ #ifdef HAVE_EVP_PKEY_EC case OPENSSL_KEYTYPE_EC: { + EC_KEY *eckey; if (req->curve_name == NID_undef) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Missing configuration value: 'curve_name' not set"); + php_error_docref(NULL, E_WARNING, "Missing configuration value: 'curve_name' not set"); return NULL; } - EC_KEY *eckey = EC_KEY_new_by_curve_name(req->curve_name); + eckey = EC_KEY_new_by_curve_name(req->curve_name); if (eckey) { EC_KEY_set_asn1_flag(eckey, OPENSSL_EC_NAMED_CURVE); if (EC_KEY_generate_key(eckey) &&

« previous php.cvs (#96783) next »