Permalink
Browse files

sasl: Renamed Curl_sasl_decode_ntlm_type2_message()

For consistency with other SASL based functions renamed this function
to Curl_sasl_create_ntlm_type3_message() which better describes its
usage.
  • Loading branch information...
1 parent 38dfe52 commit 64510fe917be0508bb4fa381af966ece7dfd4775 @captain-caveman2k captain-caveman2k committed Jun 4, 2012
Showing with 10 additions and 10 deletions.
  1. +7 −7 lib/curl_sasl.c
  2. +1 −1 lib/curl_sasl.h
  3. +1 −1 lib/pop3.c
  4. +1 −1 lib/smtp.c
View
@@ -167,7 +167,7 @@ CURLcode Curl_sasl_create_login_message(struct SessionHandle *data,
* Parameters:
*
* data [in] - The session handle.
- * chlg64 [in] - Pointer to the input buffer.
+ * chlg64 [in] - Pointer to the base64 encoded challenge buffer.
* userp [in] - The user name.
* passdwp [in] - The user's password.
* outptr [in/out] - The address where a pointer to newly allocated memory
@@ -237,7 +237,7 @@ CURLcode Curl_sasl_create_cram_md5_message(struct SessionHandle *data,
* Parameters:
*
* data [in] - The session handle.
- * chlg64 [in] - Pointer to the input buffer.
+ * chlg64 [in] - Pointer to the base64 encoded challenge buffer.
* userp [in] - The user name.
* passdwp [in] - The user's password.
* service [in] - The service type such as www, smtp or pop
@@ -441,15 +441,15 @@ CURLcode Curl_sasl_create_ntlm_type1_message(const char *userp,
}
/*
- * Curl_sasl_decode_ntlm_type2_message()
+ * Curl_sasl_create_ntlm_type3_message()
*
- * This is used to decode a ntlm type-2 message received from a recipient and
- * generate the already encoded NTLM type-3 message ready for sending back.
+ * This is used to generate an already encoded NTLM type-3 message ready for
+ * sending to the recipient.
*
* Parameters:
*
* data [in] - Pointer to session handle.
- * header [in] - Pointer to the input buffer.
+ * header [in] - Pointer to the base64 encoded type-2 message buffer.
* userp [in] - The user name in the format User or Domain\User.
* passdwp [in] - The user's password.
* ntlm [in/out] - The ntlm data struct being used and modified.
@@ -459,7 +459,7 @@ CURLcode Curl_sasl_create_ntlm_type1_message(const char *userp,
*
* Returns CURLE_OK on success.
*/
-CURLcode Curl_sasl_decode_ntlm_type2_message(struct SessionHandle *data,
+CURLcode Curl_sasl_create_ntlm_type3_message(struct SessionHandle *data,
const char *header,
const char *userp,
const char *passwdp,
View
@@ -72,7 +72,7 @@ CURLcode Curl_sasl_create_ntlm_type1_message(const char *userp,
/* This is used to decode an incoming NTLM type-2 message and generate a
base64 encoded type-3 response */
-CURLcode Curl_sasl_decode_ntlm_type2_message(struct SessionHandle *data,
+CURLcode Curl_sasl_create_ntlm_type3_message(struct SessionHandle *data,
const char *header,
const char *userp,
const char *passwdp,
View
@@ -814,7 +814,7 @@ static CURLcode pop3_state_auth_ntlm_type2msg_resp(struct connectdata *conn,
}
else {
/* Create the type-3 message */
- result = Curl_sasl_decode_ntlm_type2_message(data,
+ result = Curl_sasl_create_ntlm_type3_message(data,
data->state.buffer + 2,
conn->user, conn->passwd,
&conn->ntlm,
View
@@ -848,7 +848,7 @@ static CURLcode smtp_state_auth_ntlm_type2msg_resp(struct connectdata *conn,
result = CURLE_LOGIN_DENIED;
}
else {
- result = Curl_sasl_decode_ntlm_type2_message(data,
+ result = Curl_sasl_create_ntlm_type3_message(data,
data->state.buffer + 4,
conn->user, conn->passwd,
&conn->ntlm,

0 comments on commit 64510fe

Please sign in to comment.