diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-03-06 12:35:45 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-07-17 17:46:14 +0100 |
| commit | 069d20a33bd45c41257caa5da013f7a42be4467c (patch) | |
| tree | 42724187237d69021781df0128524b49252b1dfb | |
| parent | 1123c85d7900b1a3822f29ea65df04dcceda37ce (diff) | |
| download | php-git-069d20a33bd45c41257caa5da013f7a42be4467c.tar.gz | |
Hide setting server ECDH curve for OpenSSL 1.1
It seems to be done automatically
| -rw-r--r-- | ext/openssl/xp_ssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 9500437acf..f2e23da57f 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1179,7 +1179,7 @@ static int set_server_dh_param(php_stream * stream, SSL_CTX *ctx) /* {{{ */ /* }}} */ #endif -#ifdef HAVE_ECDH +#if defined(HAVE_ECDH) && OPENSSL_VERSION_NUMBER < 0x10100000L static int set_server_ecdh_curve(php_stream *stream, SSL_CTX *ctx) /* {{{ */ { zval *zvcurve; @@ -1222,7 +1222,7 @@ static int set_server_specific_opts(php_stream *stream, SSL_CTX *ctx) /* {{{ */ zval *zv; long ssl_ctx_options = SSL_CTX_get_options(ctx); -#ifdef HAVE_ECDH +#if defined(HAVE_ECDH) && OPENSSL_VERSION_NUMBER < 0x10100000L if (set_server_ecdh_curve(stream, ctx) == FAILURE) { return FAILURE; } |