Merge branch 'PHP-7.1'

This commit is contained in:
Jakub Zelenka 2016-10-30 19:13:21 +00:00
commit 17dc15b51e

View file

@ -668,7 +668,7 @@ int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key)
return 1; return 1;
} }
#if OPENSSL_VERSION_NUMBER < 0x10002000L #if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER)
static int X509_get_signature_nid(const X509 *x) static int X509_get_signature_nid(const X509 *x)
{ {