[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 161/256: vtls: select ssl backend case-insensitive
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 161/256: vtls: select ssl backend case-insensitive (follow-up) |
Date: |
Fri, 06 Oct 2017 19:44:12 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 61825be02ba3d86dcf6ce8c3854d31d212796094
Author: Gisle Vanem <address@hidden>
AuthorDate: Wed Sep 6 02:22:49 2017 -0400
vtls: select ssl backend case-insensitive (follow-up)
- Do a case-insensitive comparison of CURL_SSL_BACKEND env as well.
- Change Curl_strcasecompare calls to strcasecompare
(maps to the former but shorter).
Follow-up to c290b8f.
Bug: https://github.com/curl/curl/commit/c290b8f#commitcomment-24094313
Co-authored-by: Jay Satiro
---
lib/vauth/digest_sspi.c | 4 ++--
lib/vtls/vtls.c | 13 ++++++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c
index f5d619c99..a3f96ed24 100644
--- a/lib/vauth/digest_sspi.c
+++ b/lib/vauth/digest_sspi.c
@@ -352,8 +352,8 @@ CURLcode Curl_auth_decode_digest_http_message(const char
*chlg,
if(!Curl_auth_digest_get_pair(p, value, content, &p))
break;
- if(Curl_strcasecompare(value, "stale")
- && Curl_strcasecompare(content, "true")) {
+ if(strcasecompare(value, "stale") &&
+ strcasecompare(content, "true")) {
stale = true;
break;
}
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 3647dff71..f15760342 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -1250,12 +1250,14 @@ static int multissl_init(const struct Curl_ssl *backend)
if(!env)
env = CURL_DEFAULT_SSL_BACKEND;
#endif
- if(env)
- for(i = 0; available_backends[i]; i++)
- if(!strcmp(env, available_backends[i]->info.name)) {
+ if(env) {
+ for(i = 0; available_backends[i]; i++) {
+ if(strcasecompare(env, available_backends[i]->info.name)) {
Curl_ssl = available_backends[i];
return 0;
}
+ }
+ }
/* Fall back to first available backend */
Curl_ssl = available_backends[0];
@@ -1270,12 +1272,13 @@ CURLsslset curl_global_sslset(curl_sslbackend id, const
char *name,
if(Curl_ssl != &Curl_ssl_multi)
return id == Curl_ssl->info.id ? CURLSSLSET_OK : CURLSSLSET_TOO_LATE;
- for(i = 0; available_backends[i]; i++)
+ for(i = 0; available_backends[i]; i++) {
if(available_backends[i]->info.id == id ||
- (name && Curl_strcasecompare(available_backends[i]->info.name, name))) {
+ (name && strcasecompare(available_backends[i]->info.name, name))) {
multissl_init(available_backends[i]);
return CURLSSLSET_OK;
}
+ }
if(avail)
*avail = (const curl_ssl_backend **)&available_backends;
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 197/256: escape.c: error: pointer targets differ in signedness, (continued)
- [GNUnet-SVN] [gnurl] 197/256: escape.c: error: pointer targets differ in signedness, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 243/256: TODO: remove deprecated form API items., gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 187/256: code style: use space after semicolon, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 182/256: checksrc: verify spaces around equals signs, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 209/256: ossfuzz: changes before merging the generated corpora, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 255/256: RELEASE-NOTES: curl 7.56.0, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 232/256: reuse_conn: don't copy flags that are known to be equal, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 186/256: checksrc: verify space after semicolons, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 231/256: curl.h: include <sys/select.h> on cygwin too, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 215/256: mime: rephrase the multipart output state machine (#1898) ..., gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 161/256: vtls: select ssl backend case-insensitive (follow-up),
gnunet <=
- [GNUnet-SVN] [gnurl] 174/256: form API: add new test 650., gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 223/256: ntlm: use strict order for SSL backend #if branches, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 178/256: rtsp: do not call fwrite() with NULL pointer FILE *, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 169/256: OpenSSL: fix erroneous SSL backend encapsulation, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 80/256: vtls: prepare the SSL backends for encapsulated private data, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 222/256: symbols-in-versions: add CURLSSLSET_NO_BACKENDS, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 248/256: examples: bring back curl_formadd-using examples, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 164/256: SSL: fix unused parameter warnings, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 240/256: test650: Use variable replacement to set the host address and port, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 229/256: tests: adjust .gitignore for new tests, gnunet, 2017/10/06