Commit 58a7bc96 authored by Steve Holme's avatar Steve Holme
Browse files

vauth: Refactored function names after move to new vauth directory 

Renamed all the SASL functions that moved to the new vauth directory to
include the correct module name.
parent 7d2a5a05

lib/curl_ntlm.c

+6 −6
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -76,7 +76,7 @@ CURLcode Curl_input_ntlm(struct connectdata *conn, 
      header++;



    if(*header) {

      result = Curl_sasl_decode_ntlm_type2_message(conn->data, header, ntlm);

      result = Curl_auth_decode_ntlm_type2_message(conn->data, header, ntlm);

      if(result)

        return result;
@@ -170,7 +170,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy) 
  case NTLMSTATE_TYPE1:

  default: /* for the weird cases we (re)start here */

    /* Create a type-1 message */

    result = Curl_sasl_create_ntlm_type1_message(userp, passwdp, ntlm, &base64,

    result = Curl_auth_create_ntlm_type1_message(userp, passwdp, ntlm, &base64,

                                                 &len);

    if(result)

      return result;
@@ -190,7 +190,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy) 


  case NTLMSTATE_TYPE2:

    /* We already received the type-2 message, create a type-3 message */

    result = Curl_sasl_create_ntlm_type3_message(conn->data, userp, passwdp,

    result = Curl_auth_create_ntlm_type3_message(conn->data, userp, passwdp,

                                                 ntlm, &base64, &len);

    if(result)

      return result;
@@ -227,8 +227,8 @@ CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy) 


void Curl_http_ntlm_cleanup(struct connectdata *conn)

{

  Curl_sasl_ntlm_cleanup(&conn->ntlm);

  Curl_sasl_ntlm_cleanup(&conn->proxyntlm);

  Curl_auth_ntlm_cleanup(&conn->ntlm);

  Curl_auth_ntlm_cleanup(&conn->proxyntlm);



#if defined(NTLM_WB_ENABLED)

  Curl_ntlm_wb_cleanup(conn);

lib/curl_sasl.c

+44 −42
Original line number Diff line number Diff line
@@ -86,14 +86,14 @@ void Curl_sasl_cleanup(struct connectdata *conn, unsigned int authused) 
#if defined(USE_KERBEROS5)

  /* Cleanup the gssapi structure */

  if(authused == SASL_MECH_GSSAPI) {

    Curl_sasl_gssapi_cleanup(&conn->krb5);

    Curl_auth_gssapi_cleanup(&conn->krb5);

  }

#endif



#if defined(USE_NTLM)

  /* Cleanup the NTLM structure */

  if(authused == SASL_MECH_NTLM) {

    Curl_sasl_ntlm_cleanup(&conn->ntlm);

    Curl_auth_ntlm_cleanup(&conn->ntlm);

  }

#endif
@@ -279,7 +279,8 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
    sasl->authused = SASL_MECH_EXTERNAL;



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

      result = sasl_create_external_message(data, conn->user, &resp, &len);

      result = Curl_auth_create_external_message(data, conn->user, &resp,

                                                 &len);

  }

  else if(conn->bits.user_passwd) {

#if defined(USE_KERBEROS5)
@@ -291,7 +292,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
      sasl->authused = SASL_MECH_GSSAPI;



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

        result = Curl_sasl_create_gssapi_user_message(data, conn->user,

        result = Curl_auth_create_gssapi_user_message(data, conn->user,

                                                      conn->passwd,

                                                      sasl->params->service,

                                                      sasl->mutual_auth,
@@ -321,7 +322,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
      sasl->authused = SASL_MECH_NTLM;



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

        result = Curl_sasl_create_ntlm_type1_message(conn->user, conn->passwd,

        result = Curl_auth_create_ntlm_type1_message(conn->user, conn->passwd,

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

      }

    else
@@ -333,7 +334,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
      sasl->authused = SASL_MECH_OAUTHBEARER;



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

        result = sasl_create_oauth_bearer_message(data, conn->user,

        result = Curl_auth_create_oauth_bearer_message(data, conn->user,

                                                       conn->host.name,

                                                       conn->port,

                                                       conn->oauth_bearer,
@@ -345,7 +346,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_oauth_bearer_message(data, conn->user,

        result = Curl_auth_create_oauth_bearer_message(data, conn->user,

                                                       NULL, 0,

                                                       conn->oauth_bearer,

                                                       &resp, &len);
@@ -357,7 +358,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
      sasl->authused = SASL_MECH_LOGIN;



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

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

        result = Curl_auth_create_login_message(data, conn->user, &resp, &len);

    }

    else if(enabledmechs & SASL_MECH_PLAIN) {

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



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

        result = sasl_create_plain_message(data, conn->user, conn->passwd,

        result = Curl_auth_create_plain_message(data, conn->user, conn->passwd,

                                                &resp, &len);

    }

  }
@@ -432,32 +433,33 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 
    *progress = SASL_DONE;

    return result;

  case SASL_PLAIN:

    result = sasl_create_plain_message(data, conn->user, conn->passwd, &resp,

    result = Curl_auth_create_plain_message(data, conn->user, conn->passwd,

                                            &resp,

                                            &len);

    break;

  case SASL_LOGIN:

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

    result = Curl_auth_create_login_message(data, conn->user, &resp, &len);

    newstate = SASL_LOGIN_PASSWD;

    break;

  case SASL_LOGIN_PASSWD:

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

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

    break;

  case SASL_EXTERNAL:

    result = sasl_create_external_message(data, conn->user, &resp, &len);

    result = Curl_auth_create_external_message(data, conn->user, &resp, &len);

    break;



#ifndef CURL_DISABLE_CRYPTO_AUTH

  case SASL_CRAMMD5:

    sasl->params->getmessage(data->state.buffer, &serverdata);

    result = sasl_decode_cram_md5_message(serverdata, &chlg, &chlglen);

    result = Curl_auth_decode_cram_md5_message(serverdata, &chlg, &chlglen);

    if(!result)

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

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

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

    free(chlg);

    break;

  case SASL_DIGESTMD5:

    sasl->params->getmessage(data->state.buffer, &serverdata);

    result = Curl_sasl_create_digest_md5_message(data, serverdata,

    result = Curl_auth_create_digest_md5_message(data, serverdata,

                                                 conn->user, conn->passwd,

                                                 sasl->params->service,

                                                 &resp, &len);
@@ -473,17 +475,17 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 
#ifdef USE_NTLM

  case SASL_NTLM:

    /* Create the type-1 message */

    result = Curl_sasl_create_ntlm_type1_message(conn->user, conn->passwd,

    result = Curl_auth_create_ntlm_type1_message(conn->user, conn->passwd,

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

    newstate = SASL_NTLM_TYPE2MSG;

    break;

  case SASL_NTLM_TYPE2MSG:

    /* Decode the type-2 message */

    sasl->params->getmessage(data->state.buffer, &serverdata);

    result = Curl_sasl_decode_ntlm_type2_message(data, serverdata,

    result = Curl_auth_decode_ntlm_type2_message(data, serverdata,

                                                 &conn->ntlm);

    if(!result)

      result = Curl_sasl_create_ntlm_type3_message(data, conn->user,

      result = Curl_auth_create_ntlm_type3_message(data, conn->user,

                                                   conn->passwd, &conn->ntlm,

                                                   &resp, &len);

    break;
@@ -491,7 +493,7 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 


#if defined(USE_KERBEROS5)

  case SASL_GSSAPI:

    result = Curl_sasl_create_gssapi_user_message(data, conn->user,

    result = Curl_auth_create_gssapi_user_message(data, conn->user,

                                                  conn->passwd,

                                                  sasl->params->service,

                                                  sasl->mutual_auth, NULL,
@@ -504,7 +506,7 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 
    if(sasl->mutual_auth) {

      /* Decode the user token challenge and create the optional response

         message */

      result = Curl_sasl_create_gssapi_user_message(data, NULL, NULL, NULL,

      result = Curl_auth_create_gssapi_user_message(data, NULL, NULL, NULL,

                                                    sasl->mutual_auth,

                                                    serverdata, &conn->krb5,

                                                    &resp, &len);
@@ -512,14 +514,14 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 
    }

    else

      /* Decode the security challenge and create the response message */

      result = Curl_sasl_create_gssapi_security_message(data, serverdata,

      result = Curl_auth_create_gssapi_security_message(data, serverdata,

                                                        &conn->krb5,

                                                        &resp, &len);

    break;

  case SASL_GSSAPI_NO_DATA:

    sasl->params->getmessage(data->state.buffer, &serverdata);

    /* Decode the security challenge and create the response message */

    result = Curl_sasl_create_gssapi_security_message(data, serverdata,

    result = Curl_auth_create_gssapi_security_message(data, serverdata,

                                                      &conn->krb5,

                                                      &resp, &len);

    break;
@@ -528,7 +530,7 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 
  case SASL_OAUTH2:

    /* Create the authorisation message */

    if(sasl->authused == SASL_MECH_OAUTHBEARER) {

      result = sasl_create_oauth_bearer_message(data, conn->user,

      result = Curl_auth_create_oauth_bearer_message(data, conn->user,

                                                     conn->host.name,

                                                     conn->port,

                                                     conn->oauth_bearer,
@@ -538,7 +540,7 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 
      newstate = SASL_OAUTH2_RESP;

    }

    else

      result = sasl_create_oauth_bearer_message(data, conn->user,

      result = Curl_auth_create_oauth_bearer_message(data, conn->user,

                                                     NULL, 0,

                                                     conn->oauth_bearer,

                                                     &resp, &len);

lib/http_digest.c

+5 −5
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -65,7 +65,7 @@ CURLcode Curl_input_digest(struct connectdata *conn, 
  while(*header && ISSPACE(*header))

    header++;



  return Curl_sasl_decode_digest_http_message(header, digest);

  return Curl_auth_decode_digest_http_message(header, digest);

}



CURLcode Curl_output_digest(struct connectdata *conn,
@@ -152,7 +152,7 @@ CURLcode Curl_output_digest(struct connectdata *conn, 
  if(!path)

    return CURLE_OUT_OF_MEMORY;



  result = Curl_sasl_create_digest_http_message(data, userp, passwdp, request,

  result = Curl_auth_create_digest_http_message(data, userp, passwdp, request,

                                                path, digest, &response, &len);

  free(path);

  if(result)
@@ -172,8 +172,8 @@ CURLcode Curl_output_digest(struct connectdata *conn, 


void Curl_digest_cleanup(struct SessionHandle *data)

{

  Curl_sasl_digest_cleanup(&data->state.digest);

  Curl_sasl_digest_cleanup(&data->state.proxydigest);

  Curl_auth_digest_cleanup(&data->state.digest);

  Curl_auth_digest_cleanup(&data->state.proxydigest);

}



#endif

lib/http_negotiate.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -62,7 +62,7 @@ CURLcode Curl_input_negotiate(struct connectdata *conn, bool proxy, 


  if(!neg_ctx->server_name) {

    /* Generate our SPN */

    char *spn = Curl_sasl_build_gssapi_spn(

    char *spn = Curl_auth_build_gssapi_spn(

      proxy ? data->set.str[STRING_PROXY_SERVICE_NAME] :

      data->set.str[STRING_SERVICE_NAME],

      proxy ? conn->proxy.name : conn->host.name);

lib/http_negotiate_sspi.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -94,7 +94,7 @@ CURLcode Curl_input_negotiate(struct connectdata *conn, bool proxy, 
      return CURLE_BAD_FUNCTION_ARGUMENT;



    /* Generate our SPN */

    neg_ctx->server_name = Curl_sasl_build_spn(

    neg_ctx->server_name = Curl_auth_build_spn(

      proxy ? data->set.str[STRING_PROXY_SERVICE_NAME] :

      data->set.str[STRING_SERVICE_NAME],

      proxy ? conn->proxy.name : conn->host.name);