diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-03-06 12:22:24 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-07-17 17:46:14 +0100 |
| commit | 1123c85d7900b1a3822f29ea65df04dcceda37ce (patch) | |
| tree | 213cb1a7225ed172571a01397b64dbcb93098951 | |
| parent | 0afa0b1f8328db0d37426134e84b64ba2490191e (diff) | |
| download | php-git-1123c85d7900b1a3822f29ea65df04dcceda37ce.tar.gz | |
Do not use tmp_rsa_cb for OpenSSL 1.1
The SSL_CTX_set_tmp_rsa_callback has been removed
| -rw-r--r-- | ext/openssl/xp_ssl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index dae1d22e7f..9500437acf 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -91,7 +91,7 @@ /* Used for peer verification in windows */ #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))) -#ifndef OPENSSL_NO_RSA +#if !defined(OPENSSL_NO_RSA) && OPENSSL_VERSION_NUMBER < 0x10100000L static RSA *tmp_rsa_cb(SSL *s, int is_export, int keylength); #endif @@ -1108,7 +1108,7 @@ static void init_server_reneg_limit(php_stream *stream, php_openssl_netstream_da } /* }}} */ -#ifndef OPENSSL_NO_RSA +#if !defined(OPENSSL_NO_RSA) && OPENSSL_VERSION_NUMBER < 0x10100000L static RSA *tmp_rsa_cb(SSL *s, int is_export, int keylength) { BIGNUM *bn = NULL; @@ -1228,7 +1228,7 @@ static int set_server_specific_opts(php_stream *stream, SSL_CTX *ctx) /* {{{ */ } #endif -#ifndef OPENSSL_NO_RSA +#if !defined(OPENSSL_NO_RSA) && OPENSSL_VERSION_NUMBER < 0x10100000L SSL_CTX_set_tmp_rsa_callback(ctx, tmp_rsa_cb); #endif /* We now use tmp_rsa_cb to generate a key of appropriate size whenever necessary */ |