[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 146/153: url, vtls: make CURLOPT{, _PROXY}_TLS13_CI
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 146/153: url, vtls: make CURLOPT{, _PROXY}_TLS13_CIPHERS work |
Date: |
Tue, 11 Sep 2018 12:53:37 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 52c13d6328ff56b2d2e8313e88cfdfc78acda365
Author: Kamil Dudka <address@hidden>
AuthorDate: Mon Sep 3 13:04:00 2018 +0200
url, vtls: make CURLOPT{,_PROXY}_TLS13_CIPHERS work
This is a follow-up to PR #2607 and PR #2926.
Closes #2936
---
lib/url.c | 4 ++++
lib/vtls/vtls.c | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/url.c b/lib/url.c
index 12f0f8ae7..6c9caffab 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -4334,6 +4334,10 @@ static CURLcode create_conn(struct Curl_easy *data,
data->set.str[STRING_SSL_CIPHER_LIST_ORIG];
data->set.proxy_ssl.primary.cipher_list =
data->set.str[STRING_SSL_CIPHER_LIST_PROXY];
+ data->set.ssl.primary.cipher_list13 =
+ data->set.str[STRING_SSL_CIPHER13_LIST_ORIG];
+ data->set.proxy_ssl.primary.cipher_list13 =
+ data->set.str[STRING_SSL_CIPHER13_LIST_PROXY];
data->set.ssl.CRLfile = data->set.str[STRING_SSL_CRLFILE_ORIG];
data->set.proxy_ssl.CRLfile = data->set.str[STRING_SSL_CRLFILE_PROXY];
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index bf96518bc..b61c64034 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -96,7 +96,8 @@ Curl_ssl_config_matches(struct ssl_primary_config* data,
Curl_safe_strcasecompare(data->clientcert, needle->clientcert) &&
Curl_safe_strcasecompare(data->random_file, needle->random_file) &&
Curl_safe_strcasecompare(data->egdsocket, needle->egdsocket) &&
- Curl_safe_strcasecompare(data->cipher_list, needle->cipher_list))
+ Curl_safe_strcasecompare(data->cipher_list, needle->cipher_list) &&
+ Curl_safe_strcasecompare(data->cipher_list13, needle->cipher_list13))
return TRUE;
return FALSE;
@@ -119,6 +120,7 @@ Curl_clone_primary_ssl_config(struct ssl_primary_config
*source,
CLONE_STRING(random_file);
CLONE_STRING(egdsocket);
CLONE_STRING(cipher_list);
+ CLONE_STRING(cipher_list13);
return TRUE;
}
@@ -131,6 +133,7 @@ void Curl_free_primary_ssl_config(struct
ssl_primary_config* sslc)
Curl_safefree(sslc->random_file);
Curl_safefree(sslc->egdsocket);
Curl_safefree(sslc->cipher_list);
+ Curl_safefree(sslc->cipher_list13);
}
#ifdef USE_SSL
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] branch master updated (87430bf69 -> d95fbcb04), gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 14/153: header output: switch off all styles, not just unbold, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 149/153: Curl_getoff_all_pipelines: ignore unused return values, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 132/153: CURLOPT_ACCEPT_ENCODING.3: list them comma-separated [ci skip], gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 144/153: openssl: Fix setting TLS 1.3 cipher suites, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 153/153: guix.scm: adjust to version., gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 150/153: RELEASE-NOTES: 7.61.1, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 151/153: THANKS: 7.61.1 status, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 148/153: sftp: fix indentation, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 145/153: tool_operate: Add http code 408 to transient list for --retry, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 146/153: url, vtls: make CURLOPT{, _PROXY}_TLS13_CIPHERS work,
gnunet <=
- [GNUnet-SVN] [gnurl] 143/153: Curl_ntlm_core_mk_nt_hash: return error on too long password, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 138/153: tool_operate: Fix setting proxy TLS 1.3 ciphers, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 133/153: RELEASE-NOTES: synced, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 137/153: cookies: support creation-time attribute for cookies, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 134/153: THANKS-filter: dedup Daniel JeliĆski, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 152/153: Merge tag 'curl-7_61_1', gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 141/153: test1148: fix precheck output, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 127/153: lib1522: fix curl_easy_setopt argument type, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 135/153: CURLOPT_SSL_CTX_FUNCTION.3: clarify connection reuse warning, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 129/153: cmdline-opts/page-footer: fix edit mistake, gnunet, 2018/09/11