com php-src: Fix build, decls first: ext/openssl/openssl.c
| From: | Kalle Sommer Nielsen | Date: | Sun, 16 Oct 2016 04:36:54 +0000 |
| Subject: | com php-src: Fix build, decls first: ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95114@lists.php.net to get a copy of this message | ||
Commit: e63c8646093c3cb1329cf94b074feb28743becce
Author: Kalle Sommer Nielsen <kalle@php.net> Sun, 16 Oct 2016 06:36:54 +0200
Parents: 5c169af7c9f5761810cac84fe402ef3e9e79168c
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e63c8646093c3cb1329cf94b074feb28743becce
Log:
Fix build, decls first
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 58053d2..9768c6f 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -3866,11 +3866,12 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request *
req
#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");
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) &&