diff options
| author | Jakub Zelenka <bukka@php.net> | 2018-05-22 13:40:23 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2018-05-22 13:40:23 +0100 |
| commit | a231860b026baf8a2dfd34852c0cc196e7c7ebfb (patch) | |
| tree | 477aab9d5619d879a9563904afd501f7be3e186c /ext/openssl/xp_ssl.c | |
| parent | 1c8c06a403c0216cdbcf6a90b5ae8ba87639ff6c (diff) | |
| parent | 68c3d09c2c1b88eafcf8b82af24f77756fd1d77f (diff) | |
| download | php-git-a231860b026baf8a2dfd34852c0cc196e7c7ebfb.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
Diffstat (limited to 'ext/openssl/xp_ssl.c')
| -rw-r--r-- | ext/openssl/xp_ssl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 9eca6411e2..e37671368e 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -94,7 +94,7 @@ #define PHP_X509_NAME_ENTRY_TO_UTF8(ne, i, out) \ ASN1_STRING_to_UTF8(&out, X509_NAME_ENTRY_get_data(X509_NAME_get_entry(ne, i))) -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) +#if PHP_OPENSSL_API_VERSION < 0x10100 static RSA *php_openssl_tmp_rsa_cb(SSL *s, int is_export, int keylength); #endif @@ -1139,7 +1139,7 @@ static void php_openssl_init_server_reneg_limit(php_stream *stream, php_openssl_ } /* }}} */ -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) +#if PHP_OPENSSL_API_VERSION < 0x10100 static RSA *php_openssl_tmp_rsa_cb(SSL *s, int is_export, int keylength) { BIGNUM *bn = NULL; @@ -1208,7 +1208,7 @@ static int php_openssl_set_server_dh_param(php_stream * stream, SSL_CTX *ctx) /* } /* }}} */ -#if defined(HAVE_ECDH) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)) +#if defined(HAVE_ECDH) && PHP_OPENSSL_API_VERSION < 0x10100 static int php_openssl_set_server_ecdh_curve(php_stream *stream, SSL_CTX *ctx) /* {{{ */ { zval *zvcurve; @@ -1251,13 +1251,13 @@ static int php_openssl_set_server_specific_opts(php_stream *stream, SSL_CTX *ctx zval *zv; long ssl_ctx_options = SSL_CTX_get_options(ctx); -#if defined(HAVE_ECDH) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)) +#if defined(HAVE_ECDH) && PHP_OPENSSL_API_VERSION < 0x10100 if (php_openssl_set_server_ecdh_curve(stream, ctx) == FAILURE) { return FAILURE; } #endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) +#if PHP_OPENSSL_API_VERSION < 0x10100 SSL_CTX_set_tmp_rsa_callback(ctx, php_openssl_tmp_rsa_cb); #endif /* We now use php_openssl_tmp_rsa_cb to generate a key of appropriate size whenever necessary */ |