[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 52/205: openssl: unbreak the build after 6448f98c18
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 52/205: openssl: unbreak the build after 6448f98c1857de |
Date: |
Thu, 20 Apr 2017 16:19:52 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.
commit 6733acc9033d96b52d387f757ac39614b45c1913
Author: Daniel Stenberg <address@hidden>
AuthorDate: Wed Mar 8 23:38:26 2017 +0100
openssl: unbreak the build after 6448f98c1857de
Verified with OpenSSL 1.1.0e and OpenSSL master (1.1.1)
---
lib/vtls/openssl.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 8881b57ac..d4e412813 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -1693,11 +1693,17 @@ get_ssl_version_txt(SSL *ssl)
}
static CURLcode
-set_ssl_version_min_max(long *ctx_options, struct connectdata *conn)
+set_ssl_version_min_max(long *ctx_options, struct connectdata *conn,
+ int sockindex)
{
+#if (OPENSSL_VERSION_NUMBER < 0x1000100FL) || !defined(TLS1_3_VERSION)
+ /* convoluted #if condition just to avoid compiler warnings on unused
+ variable */
struct Curl_easy *data = conn->data;
+#endif
long ssl_version = SSL_CONN_CONFIG(version);
long ssl_version_max = SSL_CONN_CONFIG(version_max);
+
if(ssl_version_max == CURL_SSLVERSION_MAX_NONE) {
ssl_version_max = ssl_version << 16;
}
@@ -1705,9 +1711,13 @@ set_ssl_version_min_max(long *ctx_options, struct
connectdata *conn)
switch(ssl_version) {
case CURL_SSLVERSION_TLSv1_3:
#ifdef TLS1_3_VERSION
+ {
+ struct ssl_connect_data *connssl = &conn->ssl[sockindex];
SSL_CTX_set_max_proto_version(connssl->ctx, TLS1_3_VERSION);
*ctx_options |= SSL_OP_NO_TLSv1_2;
+ }
#else
+ (void)sockindex;
failf(data, OSSL_PACKAGE " was built without TLS 1.3 support");
return CURLE_NOT_BUILT_IN;
#endif
@@ -1956,7 +1966,7 @@ static CURLcode ossl_connect_step1(struct connectdata
*conn, int sockindex)
case CURL_SSLVERSION_TLSv1_1:
case CURL_SSLVERSION_TLSv1_2:
case CURL_SSLVERSION_TLSv1_3:
- result = set_ssl_version_min_max(&ctx_options, conn);
+ result = set_ssl_version_min_max(&ctx_options, conn, sockindex);
if(result != CURLE_OK)
return result;
break;
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 109/205: openssl: fix comparison between signed and unsigned integer expressions, (continued)
- [GNUnet-SVN] [gnurl] 109/205: openssl: fix comparison between signed and unsigned integer expressions, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 80/205: KNOWN_BUGS: remove libidn related issue, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 92/205: multi: fix streamclose() crash in debug mode, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 66/205: proxy: skip SSL initialization for closed connections, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 75/205: make: regenerate docs/curl.1 by runinng make in docs, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 100/205: test2033: flaky, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 89/205: tests: fixed the documented test server port numbers, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 101/205: make: introduce 'test-nonflaky' target, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 72/205: test1287: added verbose logs keyword, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 76/205: RELEASE-NOTES: synced with c25e0761d0fc49c4, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 52/205: openssl: unbreak the build after 6448f98c1857de,
gnunet <=
- [GNUnet-SVN] [gnurl] 91/205: CONTRIBUTE: mention referring to github issues in commit msgs, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 86/205: darwinssl: fix typo in variable name, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 94/205: RELEASE-NOTES: typo, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 85/205: tool_operate: Fix showing HTTPS-Proxy options on CURLE_SSL_CACERT, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 113/205: .gitattributes: turn off CRLF for *.am, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 120/205: http: do not treat FTPS over CONNECT as HTTPS, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 110/205: tests/README: make "Run" section foolproof, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 98/205: cmake: add support for building HTML and PDF docs, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 95/205: examples: comment typos in http2 examples, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 70/205: url: add option CURLOPT_SUPPRESS_CONNECT_HEADERS, gnunet, 2017/04/20