1
0
mirror of https://github.com/php/php-src.git synced 2026-04-20 06:21:12 +02:00

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed broken build when EC unavailable
This commit is contained in:
Daniel Lowrey
2014-02-17 19:38:49 -05:00

2
ext/openssl/openssl.c Normal file → Executable file
View File

@@ -3468,7 +3468,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);