diff options
| author | Jakub Zelenka <bukka@php.net> | 2020-10-10 21:02:26 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2020-11-01 20:10:37 +0000 |
| commit | c3a6debc08ebdc1cc336eb2d13aae1988ccbe688 (patch) | |
| tree | d46d45cfd116c843c268a6ce586a1119c6a2917d /ext/openssl/xp_ssl.c | |
| parent | 347a3f8736dabd0e2862ac5f673eab7650b0286e (diff) | |
| download | php-git-c3a6debc08ebdc1cc336eb2d13aae1988ccbe688.tar.gz | |
Bump minimal OpenSSL version to 1.0.2
Diffstat (limited to 'ext/openssl/xp_ssl.c')
| -rw-r--r-- | ext/openssl/xp_ssl.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index feb9ee52c1..6fdbf1df16 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -33,11 +33,8 @@ #include <openssl/x509.h> #include <openssl/x509v3.h> #include <openssl/err.h> - -#if OPENSSL_VERSION_NUMBER >= 0x10002000L #include <openssl/bn.h> #include <openssl/dh.h> -#endif #ifdef PHP_WIN32 #include "win32/winutil.h" @@ -80,10 +77,8 @@ #ifndef OPENSSL_NO_TLSEXT #define HAVE_TLS_SNI 1 -#if OPENSSL_VERSION_NUMBER >= 0x10002000L #define HAVE_TLS_ALPN 1 #endif -#endif #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) #define HAVE_SEC_LEVEL 1 @@ -1294,12 +1289,8 @@ static int php_openssl_set_server_ecdh_curve(php_stream *stream, SSL_CTX *ctx) / zvcurve = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "ecdh_curve"); if (zvcurve == NULL) { -#if OPENSSL_VERSION_NUMBER >= 0x10002000L SSL_CTX_set_ecdh_auto(ctx, 1); return SUCCESS; -#else - curve_nid = NID_X9_62_prime256v1; -#endif } else { if (!try_convert_to_string(zvcurve)) { return FAILURE; |