Commit 12e45b84 authored by Steve Holme's avatar Steve Holme
Browse files

curl_sasl: Reinstate the sasl_ prefix for locally scoped functions 

Commit 7a8b2885 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.
parent c260c9fa

lib/curl_sasl.c

+37 −34
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ char *Curl_sasl_build_spn(const char *service, const char *host) 
#endif



/*

 * create_plain_message()

 * sasl_create_plain_message()

 *

 * This is used to generate an already encoded PLAIN message ready

 * for sending to the recipient.
@@ -296,8 +296,9 @@ char *Curl_sasl_build_spn(const char *service, const char *host) 
 *

 * Returns CURLE_OK on success.

 */

static CURLcode create_plain_message(struct SessionHandle *data,

                                     const char *userp, const char *passwdp,

static CURLcode sasl_create_plain_message(struct SessionHandle *data,

                                          const char *userp,

                                          const char *passwdp,

                                          char **outptr, size_t *outlen)

{

  CURLcode result;
@@ -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

 * user name or password ready for sending to the recipient.
@@ -345,7 +346,7 @@ static CURLcode create_plain_message(struct SessionHandle *data, 
 *

 * 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,

                                          size_t *outlen)

{
@@ -369,7 +370,7 @@ static CURLcode create_login_message(struct SessionHandle *data, 


#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.

 *
@@ -382,7 +383,7 @@ static CURLcode create_login_message(struct SessionHandle *data, 
 *

 * 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)

{

  CURLcode result = CURLE_OK;
@@ -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

 * for sending to the recipient.
@@ -416,7 +417,7 @@ static CURLcode decode_cram_md5_message(const char *chlg64, char **outptr, 
 *

 * 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 *userp,

                                             const char *passwdp,
@@ -1128,7 +1129,7 @@ void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm) 
#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

 * sending to the recipient.
@@ -1144,8 +1145,9 @@ void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm) 
 *

 * Returns CURLE_OK on success.

 */

static CURLcode create_xoauth2_message(struct SessionHandle *data,

                                       const char *user, const char *bearer,

static CURLcode sasl_create_xoauth2_message(struct SessionHandle *data,

                                            const char *user,

                                            const char *bearer,

                                            char **outptr, size_t *outlen)

{

  CURLcode result = CURLE_OK;
@@ -1394,8 +1396,8 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
    sasl->authused = SASL_MECH_XOAUTH2;



    if(force_ir || data->set.sasl_ir)

      result = create_xoauth2_message(data, conn->user, conn->xoauth2_bearer,

                                      &resp, &len);

      result = sasl_create_xoauth2_message(data, conn->user,

                                           conn->xoauth2_bearer, &resp, &len);

  }

  else if(enabledmechs & SASL_MECH_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;



    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) {

    mech = SASL_MECH_STRING_PLAIN;
@@ -1412,7 +1414,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
    sasl->authused = SASL_MECH_PLAIN;



    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);

  }

  else
@@ -1478,23 +1480,24 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 
    *progress = SASL_DONE;

    return result;

  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;

  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;

    break;

  case SASL_LOGIN_PASSWD:

    result = create_login_message(data, conn->passwd, &resp, &len);

    result = sasl_create_login_message(data, conn->passwd, &resp, &len);

    break;



#ifndef CURL_DISABLE_CRYPTO_AUTH

  case SASL_CRAMMD5:

    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)

      result = create_cram_md5_message(data, chlg, conn->user, conn->passwd,

                                       &resp, &len);

      result = sasl_create_cram_md5_message(data, chlg, conn->user,

                                            conn->passwd, &resp, &len);

    Curl_safefree(chlg);

    break;

  case SASL_DIGESTMD5:
@@ -1569,8 +1572,8 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 


  case SASL_XOAUTH2:

    /* Create the authorisation message */

    result = create_xoauth2_message(data, conn->user, conn->xoauth2_bearer,

                                    &resp, &len);

    result = sasl_create_xoauth2_message(data, conn->user,

                                         conn->xoauth2_bearer, &resp, &len);

    break;

  case SASL_CANCEL:

    /* Remove the offending mechanism from the supported list */