[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 99/150: sasl: prefer PLAIN mechanism over LOGIN
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 99/150: sasl: prefer PLAIN mechanism over LOGIN |
Date: |
Fri, 30 Mar 2018 16:49:13 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit de97b5fcefb110f3f34338b8292652340ddb1f63
Author: Patrick Monnerat <address@hidden>
AuthorDate: Wed Feb 21 17:42:25 2018 +0100
sasl: prefer PLAIN mechanism over LOGIN
SASL PLAIN is a standard, LOGIN only a draft. The LOGIN draft says
PLAIN should be used instead if available.
---
lib/curl_sasl.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 550433d67..7052bd913 100644
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2012 - 2017, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 2012 - 2018, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -361,15 +361,6 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct
connectdata *conn,
conn->oauth_bearer,
&resp, &len);
}
- else if(enabledmechs & SASL_MECH_LOGIN) {
- mech = SASL_MECH_STRING_LOGIN;
- state1 = SASL_LOGIN;
- state2 = SASL_LOGIN_PASSWD;
- sasl->authused = SASL_MECH_LOGIN;
-
- if(force_ir || data->set.sasl_ir)
- result = Curl_auth_create_login_message(data, conn->user, &resp, &len);
- }
else if(enabledmechs & SASL_MECH_PLAIN) {
mech = SASL_MECH_STRING_PLAIN;
state1 = SASL_PLAIN;
@@ -379,6 +370,15 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct
connectdata *conn,
result = Curl_auth_create_plain_message(data, conn->user, conn->passwd,
&resp, &len);
}
+ else if(enabledmechs & SASL_MECH_LOGIN) {
+ mech = SASL_MECH_STRING_LOGIN;
+ state1 = SASL_LOGIN;
+ state2 = SASL_LOGIN_PASSWD;
+ sasl->authused = SASL_MECH_LOGIN;
+
+ if(force_ir || data->set.sasl_ir)
+ result = Curl_auth_create_login_message(data, conn->user, &resp, &len);
+ }
}
if(!result && mech) {
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 34/150: file: Check the return code from Curl_range and bail out on error, (continued)
- [GNUnet-SVN] [gnurl] 34/150: file: Check the return code from Curl_range and bail out on error, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 48/150: build-openssl.bat: Extend VC15 support to include Enterprise and Professional, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 63/150: sha256: avoid redefine, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 79/150: non-ascii: fix implicit declaration warning, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 84/150: CURLOPT_HEADERFUNCTION.3: mention folded headers, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 91/150: TODO: "Support in-memory certs/ca certs/keys", gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 107/150: winbuild: Use macros for the names of some build utilities, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 93/150: examples/sftpuploadresume: resume upload via CURLOPT_APPEND, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 97/150: url: Add option CURLOPT_HAPPY_EYEBALLS_TIMEOUT, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 87/150: test1154: verify that long HTTP headers get rejected, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 99/150: sasl: prefer PLAIN mechanism over LOGIN,
gnunet <=
- [GNUnet-SVN] [gnurl] 123/150: RELEASE-NOTES/THANKS: synced with cc1d4c505, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 88/150: header callback: don't chop headers into smaller pieces, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 113/150: travis: update compiler versions, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 118/150: NO_PROXY: fix for IPv6 numericals in the URL, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 132/150: SECURITY.md: call it the security process, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 100/150: lib: CURLOPT_HAPPY_EYEBALLS_TIMEOUT => CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 117/150: build: get CFLAGS (including -werror) used for examples and tests, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 114/150: unit1309: fix warning on Windows x64, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 135/150: BUGS: updated link to security process, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 142/150: FAQ: fix a broken URL [ci skip], gnunet, 2018/03/30