diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-02-17 19:38:30 -0500 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-02-17 19:38:30 -0500 |
| commit | bd9aa181dc903a886ac76c45b11bf218948ee31b (patch) | |
| tree | 99a57aa0dde48be67cbe739860dc7c3e455446ab | |
| parent | 66f76ec1f9bfd57d4c64b4c721c1452cc4f97604 (diff) | |
| parent | a80cec1190e18cf8f23a7786de59e76e7f9fa022 (diff) | |
| download | php-git-bd9aa181dc903a886ac76c45b11bf218948ee31b.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed broken build when EC unavailable
| -rwxr-xr-x[-rw-r--r--] | ext/openssl/openssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 8ba24026b4..f1e582b20a 100644..100755 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -3026,7 +3026,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); |