com php-src: Add ifdef on ecdh for single_ecdh_use: ext /openssl/xp_ssl.c
| From: | rdlowrey@php.net | Date: | Tue, 15 Jul 2014 21:10:29 +0000 |
| Subject: | com php-src: Add ifdef on ecdh for single_ecdh_use: ext /openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79475@lists.php.net to get a copy of this message | ||
Commit: cbcbf73fe8fe4a12739d502a2704a9a4cf7f5790
Author: Lior Kaplan <kaplanlior@gmail.com> Wed, 16 Jul 2014 00:10:29 +0300
Parents: 236365a016df0f1976b0f9d063340231eb1fb4c8
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cbcbf73fe8fe4a12739d502a2704a9a4cf7f5790
Log:
Add ifdef on ecdh for single_ecdh_use
Allows build with OpenSSL < 0.9.8
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index c6a9157..948bb14 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -1164,12 +1164,14 @@ static int set_server_specific_opts(php_stream *stream, SSL_CTX *ctx
TSRMLS_DC)
ssl_ctx_options |= SSL_OP_SINGLE_DH_USE;
}
+#ifdef HAVE_ECDH
if (SUCCESS == php_stream_context_get_option(
stream->context, "ssl", "single_ecdh_use", &val) &&
zend_is_true(*val)
) {
ssl_ctx_options |= SSL_OP_SINGLE_ECDH_USE;
}
+#endif
SSL_CTX_set_options(ctx, ssl_ctx_options);