Commit 88702ebb authored by Steve Holme's avatar Steve Holme
Browse files

oauth2: Re-factored OAuth 2.0 state variable

parent d6d58dd5

lib/curl_sasl.c

+3 −3
Original line number Diff line number Diff line
@@ -1344,7 +1344,7 @@ static void state(struct SASL *sasl, struct connectdata *conn, 
    "GSSAPI",

    "GSSAPI_TOKEN",

    "GSSAPI_NO_DATA",

    "XOAUTH2",

    "OAUTH2",

    "CANCEL",

    "FINAL",

    /* LAST */
@@ -1458,7 +1458,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
    if((enabledmechs & SASL_MECH_XOAUTH2) && ((conn->oauth_bearer) ||

                                              (!conn->passwd))) {

      mech = SASL_MECH_STRING_XOAUTH2;

      state1 = SASL_XOAUTH2;

      state1 = SASL_OAUTH2;

      sasl->authused = SASL_MECH_XOAUTH2;



      if(force_ir || data->set.sasl_ir)
@@ -1640,7 +1640,7 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 
    break;

#endif



  case SASL_XOAUTH2:

  case SASL_OAUTH2:

    /* Create the authorisation message */

    result = sasl_create_oauth_bearer_message(data, conn->user,

                                              NULL, 0,

lib/curl_sasl.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ typedef enum { 
  SASL_GSSAPI,

  SASL_GSSAPI_TOKEN,

  SASL_GSSAPI_NO_DATA,

  SASL_XOAUTH2,

  SASL_OAUTH2,

  SASL_CANCEL,

  SASL_FINAL

} saslstate;