Commit 7023d8aa authored by Steve Holme's avatar Steve Holme
Browse files

oauth2: Don't use XAUTH2 in OAuth 2.0 function name

parent eaa98cef

lib/curl_sasl.c

+10 −10
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm) 
#endif /* USE_NTLM && !USE_WINDOWS_SSPI*/



/*

 * sasl_create_xoauth2_message()

 * sasl_create_oauth_bearer_message()

 *

 * This is used to generate an already encoded OAuth 2.0 message ready for

 * sending to the recipient.
@@ -1170,7 +1170,7 @@ void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm) 
 *

 * Returns CURLE_OK on success.

 */

static CURLcode sasl_create_xoauth2_message(struct SessionHandle *data,

static CURLcode sasl_create_oauth_bearer_message(struct SessionHandle *data,

                                                 const char *user,

                                                 const char *bearer,

                                                 char **outptr, size_t *outlen)
@@ -1450,7 +1450,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
      sasl->authused = SASL_MECH_XOAUTH2;



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

        result = sasl_create_xoauth2_message(data, conn->user,

        result = sasl_create_oauth_bearer_message(data, conn->user,

                                                  conn->oauth_bearer,

                                                  &resp, &len);

    }
@@ -1629,7 +1629,7 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 


  case SASL_XOAUTH2:

    /* Create the authorisation message */

    result = sasl_create_xoauth2_message(data, conn->user,

    result = sasl_create_oauth_bearer_message(data, conn->user,

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

    break;

  case SASL_CANCEL: