mirror of
https://github.com/php/php-src.git
synced 2024-12-15 21:05:51 +08:00
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fixed broken build when EC unavailable
This commit is contained in:
commit
bd9aa181dc
2
ext/openssl/openssl.c
Normal file → Executable file
2
ext/openssl/openssl.c
Normal file → Executable file
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user