com php-src: Fixed broken build when EC unavailable: ext/openssl/openssl.c
| From: | rdlowrey@php.net | Date: | Mon, 17 Feb 2014 23:55:39 +0000 |
| Subject: | com php-src: Fixed broken build when EC unavailable: ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76052@lists.php.net to get a copy of this message | ||
Commit: a80cec1190e18cf8f23a7786de59e76e7f9fa022
Author: Daniel Lowrey <rdlowrey@php.net> Mon, 17 Feb 2014 18:55:39 -0500
Parents: b04159eed4c64572602ebafb6c94ad7df209e9f6
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a80cec1190e18cf8f23a7786de59e76e7f9fa022
Log:
Fixed broken build when EC unavailable
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
old mode 100644
new mode 100755
index a6e4d03..3e60cd5
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -3014,7 +3014,7 @@ static int php_openssl_is_private_key(EVP_PKEY* pkey TSRMLS_DC)
}
break;
#endif
-#ifdef EVP_PKEY_EC
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL && !defined(OPENSSL_NO_EC) &&
defined(EVP_PKEY_EC)
case EVP_PKEY_EC:
assert(pkey->pkey.ec != NULL);