generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

curl_sasl: Reinstate the sasl_ prefix for locally scoped functions

Browse Source 
Commit 7a8b2885e2 made some functions static and removed the public
Curl_ prefix. Unfortunately, it also removed the sasl_ prefix, which
is the naming convention we use in this source file.
This commit is contained in:
Steve Holme
2015-01-22 20:58:15 +00:00
parent c260c9fad3
commit 12e45b8462
1 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
lib/curl_sasl.c
View File

@@ -280,7 +280,7 @@ char *Curl_sasl_build_spn(const char *service, const char *host)
#endif #endif
/* /*
* create_plain_message() * sasl_create_plain_message()
* *
* This is used to generate an already encoded PLAIN message ready * This is used to generate an already encoded PLAIN message ready
* for sending to the recipient. * for sending to the recipient.
@@ -296,9 +296,10 @@ char *Curl_sasl_build_spn(const char *service, const char *host)
* *
* Returns CURLE_OK on success. * Returns CURLE_OK on success.
*/ */
static CURLcode create_plain_message(struct SessionHandle *data, static CURLcode sasl_create_plain_message(struct SessionHandle *data,
const char *userp, const char *passwdp, const char *userp,
char **outptr, size_t *outlen) const char *passwdp,
char **outptr, size_t *outlen)
{ {
CURLcode result; CURLcode result;
char *plainauth; char *plainauth;
@@ -330,7 +331,7 @@ static CURLcode create_plain_message(struct SessionHandle *data,
} }
/* /*
* create_login_message() * sasl_create_login_message()
* *
* This is used to generate an already encoded LOGIN message containing the * This is used to generate an already encoded LOGIN message containing the
* user name or password ready for sending to the recipient. * user name or password ready for sending to the recipient.
@@ -345,9 +346,9 @@ static CURLcode create_plain_message(struct SessionHandle *data,
* *
* Returns CURLE_OK on success. * Returns CURLE_OK on success.
*/ */
static CURLcode create_login_message(struct SessionHandle *data, static CURLcode sasl_create_login_message(struct SessionHandle *data,
const char *valuep, char **outptr, const char *valuep, char **outptr,
size_t *outlen) size_t *outlen)
{ {
size_t vlen = strlen(valuep); size_t vlen = strlen(valuep);
@@ -369,7 +370,7 @@ static CURLcode create_login_message(struct SessionHandle *data,
#ifndef CURL_DISABLE_CRYPTO_AUTH #ifndef CURL_DISABLE_CRYPTO_AUTH
/* /*
* decode_cram_md5_message() * sasl_decode_cram_md5_message()
* *
* This is used to decode an already encoded CRAM-MD5 challenge message. * This is used to decode an already encoded CRAM-MD5 challenge message.
* *
@@ -382,8 +383,8 @@ static CURLcode create_login_message(struct SessionHandle *data,
* *
* Returns CURLE_OK on success. * Returns CURLE_OK on success.
*/ */
static CURLcode decode_cram_md5_message(const char *chlg64, char **outptr, static CURLcode sasl_decode_cram_md5_message(const char *chlg64, char **outptr,
size_t *outlen) size_t *outlen)
{ {
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
size_t chlg64len = strlen(chlg64); size_t chlg64len = strlen(chlg64);
@@ -399,7 +400,7 @@ static CURLcode decode_cram_md5_message(const char *chlg64, char **outptr,
} }
/* /*
* create_cram_md5_message() * sasl_create_cram_md5_message()
* *
* This is used to generate an already encoded CRAM-MD5 response message ready * This is used to generate an already encoded CRAM-MD5 response message ready
* for sending to the recipient. * for sending to the recipient.
@@ -416,11 +417,11 @@ static CURLcode decode_cram_md5_message(const char *chlg64, char **outptr,
* *
* Returns CURLE_OK on success. * Returns CURLE_OK on success.
*/ */
static CURLcode create_cram_md5_message(struct SessionHandle *data, static CURLcode sasl_create_cram_md5_message(struct SessionHandle *data,
const char *chlg, const char *chlg,
const char *userp, const char *userp,
const char *passwdp, const char *passwdp,
char **outptr, size_t *outlen) char **outptr, size_t *outlen)
{ {
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
size_t chlglen = 0; size_t chlglen = 0;
@@ -1128,7 +1129,7 @@ void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm)
#endif /* USE_NTLM && !USE_WINDOWS_SSPI*/ #endif /* USE_NTLM && !USE_WINDOWS_SSPI*/
/* /*
* create_xoauth2_message() * sasl_create_xoauth2_message()
* *
* This is used to generate an already encoded OAuth 2.0 message ready for * This is used to generate an already encoded OAuth 2.0 message ready for
* sending to the recipient. * sending to the recipient.
@@ -1144,9 +1145,10 @@ void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm)
* *
* Returns CURLE_OK on success. * Returns CURLE_OK on success.
*/ */
static CURLcode create_xoauth2_message(struct SessionHandle *data, static CURLcode sasl_create_xoauth2_message(struct SessionHandle *data,
const char *user, const char *bearer, const char *user,
char **outptr, size_t *outlen) const char *bearer,
char **outptr, size_t *outlen)
{ {
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
char *xoauth = NULL; char *xoauth = NULL;
@@ -1394,8 +1396,8 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn,
sasl->authused = SASL_MECH_XOAUTH2; sasl->authused = SASL_MECH_XOAUTH2;
if(force_ir || data->set.sasl_ir) if(force_ir || data->set.sasl_ir)
result = create_xoauth2_message(data, conn->user, conn->xoauth2_bearer, result = sasl_create_xoauth2_message(data, conn->user,
&resp, &len); conn->xoauth2_bearer, &resp, &len);
} }
else if(enabledmechs & SASL_MECH_LOGIN) { else if(enabledmechs & SASL_MECH_LOGIN) {
mech = SASL_MECH_STRING_LOGIN; mech = SASL_MECH_STRING_LOGIN;
@@ -1404,7 +1406,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn,
sasl->authused = SASL_MECH_LOGIN; sasl->authused = SASL_MECH_LOGIN;
if(force_ir || data->set.sasl_ir) if(force_ir || data->set.sasl_ir)
result = create_login_message(data, conn->user, &resp, &len); result = sasl_create_login_message(data, conn->user, &resp, &len);
} }
else if(enabledmechs & SASL_MECH_PLAIN) { else if(enabledmechs & SASL_MECH_PLAIN) {
mech = SASL_MECH_STRING_PLAIN; mech = SASL_MECH_STRING_PLAIN;
@@ -1412,8 +1414,8 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn,
sasl->authused = SASL_MECH_PLAIN; sasl->authused = SASL_MECH_PLAIN;
if(force_ir || data->set.sasl_ir) if(force_ir || data->set.sasl_ir)
result = create_plain_message(data, conn->user, conn->passwd, result = sasl_create_plain_message(data, conn->user, conn->passwd,
&resp, &len); &resp, &len);
} }
else else
state2 = SASL_STOP; /* No authentication started */ state2 = SASL_STOP; /* No authentication started */
@@ -1478,23 +1480,24 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn,
*progress = SASL_DONE; *progress = SASL_DONE;
return result; return result;
case SASL_PLAIN: case SASL_PLAIN:
result = create_plain_message(data, conn->user, conn->passwd, &resp, &len); result = sasl_create_plain_message(data, conn->user, conn->passwd, &resp,
&len);
break; break;
case SASL_LOGIN: case SASL_LOGIN:
result = create_login_message(data, conn->user, &resp, &len); result = sasl_create_login_message(data, conn->user, &resp, &len);
newstate = SASL_LOGIN_PASSWD; newstate = SASL_LOGIN_PASSWD;
break; break;
case SASL_LOGIN_PASSWD: case SASL_LOGIN_PASSWD:
result = create_login_message(data, conn->passwd, &resp, &len); result = sasl_create_login_message(data, conn->passwd, &resp, &len);
break; break;
#ifndef CURL_DISABLE_CRYPTO_AUTH #ifndef CURL_DISABLE_CRYPTO_AUTH
case SASL_CRAMMD5: case SASL_CRAMMD5:
sasl->params->getmessage(data->state.buffer, &serverdata); sasl->params->getmessage(data->state.buffer, &serverdata);
result = decode_cram_md5_message(serverdata, &chlg, &chlglen); result = sasl_decode_cram_md5_message(serverdata, &chlg, &chlglen);
if(!result) if(!result)
result = create_cram_md5_message(data, chlg, conn->user, conn->passwd, result = sasl_create_cram_md5_message(data, chlg, conn->user,
&resp, &len); conn->passwd, &resp, &len);
Curl_safefree(chlg); Curl_safefree(chlg);
break; break;
case SASL_DIGESTMD5: case SASL_DIGESTMD5:
@@ -1569,8 +1572,8 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn,
case SASL_XOAUTH2: case SASL_XOAUTH2:
/* Create the authorisation message */ /* Create the authorisation message */
result = create_xoauth2_message(data, conn->user, conn->xoauth2_bearer, result = sasl_create_xoauth2_message(data, conn->user,
&resp, &len); conn->xoauth2_bearer, &resp, &len);
break; break;
case SASL_CANCEL: case SASL_CANCEL:
/* Remove the offending mechanism from the supported list */ /* Remove the offending mechanism from the supported list */