Commit 3b738a16 authored by Steve Holme's avatar Steve Holme
Browse files

ntlm: Return CURLcode from Curl_ntlm_core_mk_lm_hash()

parent 9c5f851e

lib/curl_ntlm_core.c

+6 −4
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ void Curl_ntlm_core_lm_resp(const unsigned char *keys, 
/*

 * Set up lanmanager hashed password

 */

void Curl_ntlm_core_mk_lm_hash(struct SessionHandle *data,

CURLcode Curl_ntlm_core_mk_lm_hash(struct SessionHandle *data,

                                   const char *password,

                                   unsigned char *lmbuffer /* 21 bytes */)

{
@@ -331,7 +331,7 @@ void Curl_ntlm_core_mk_lm_hash(struct SessionHandle *data, 
   */

  result = Curl_convert_to_network(data, (char *)pw, 14);

  if(result)

    return;

    return result;



  {

    /* Create LanManager hashed password. */
@@ -371,6 +371,8 @@ void Curl_ntlm_core_mk_lm_hash(struct SessionHandle *data, 


    memset(lmbuffer + 16, 0, 21 - 16);

  }



  return CURLE_OK;

}



#if USE_NTRESPONSES

lib/curl_ntlm_core.h

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void Curl_ntlm_core_lm_resp(const unsigned char *keys, 
                            const unsigned char *plaintext,

                            unsigned char *results);



void Curl_ntlm_core_mk_lm_hash(struct SessionHandle *data,

CURLcode Curl_ntlm_core_mk_lm_hash(struct SessionHandle *data,

                                   const char *password,

                                   unsigned char *lmbuffer /* 21 bytes */);

lib/curl_ntlm_msgs.c

+5 −1
Original line number Diff line number Diff line
@@ -830,8 +830,12 @@ CURLcode Curl_ntlm_create_type3_message(struct SessionHandle *data, 
    Curl_ntlm_core_lm_resp(ntbuffer, &ntlm->nonce[0], ntresp);

#endif



    Curl_ntlm_core_mk_lm_hash(data, passwdp, lmbuffer);

    result = Curl_ntlm_core_mk_lm_hash(data, passwdp, lmbuffer);

    if(result)

      return result;



    Curl_ntlm_core_lm_resp(lmbuffer, &ntlm->nonce[0], lmresp);



    /* A safer but less compatible alternative is:

     *   Curl_ntlm_core_lm_resp(ntbuffer, &ntlm->nonce[0], lmresp);

     * See http://davenport.sourceforge.net/ntlm.html#ntlmVersion2 */