SMB parameters and setup
Copyright (C) Andrew Tridgell 1992-1998
Modified by Jeremy Allison 1995.
+ Copyright (C) Jeremy Allison 1995-2000.
+ Copyright (C) Luke Kennethc Casson Leighton 1996-2000.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
#include "includes.h"
-
-extern int DEBUGLEVEL;
-
#include "byteorder.h"
/*
This implements the X/Open SMB password encryption
It takes a password, a 8 byte "crypt key" and puts 24 bytes of
encrypted password into p24 */
-void SMBencrypt(uchar *passwd, uchar *c8, uchar *p24)
+void SMBencrypt(const uchar *passwd, const uchar *c8, uchar *p24)
{
- uchar p21[21];
+ uchar p14[15], p21[21];
- lm_owf_gen(passwd, p21);
- SMBOWFencrypt(p21, c8, p24);
+ memset(p21,'\0',21);
+ memset(p14,'\0',14);
+ StrnCpy((char *)p14,(const char *)passwd,14);
-#ifdef DEBUG_PASSWORD
- DEBUG(100,("SMBencrypt: lm#, challenge, response\n"));
- dump_data(100, p21, 16);
- dump_data(100, c8, 8);
- dump_data(100, p24, 24);
-#endif
-}
+ strupper((char *)p14);
+ E_P16(p14, p21);
-void SMBNTencrypt(uchar *passwd, uchar *c8, uchar *p24)
-{
- uchar p21[21];
-
- memset(p21,'\0',21);
-
- nt_owf_gen(passwd, p21);
SMBOWFencrypt(p21, c8, p24);
#ifdef DEBUG_PASSWORD
- DEBUG(100,("SMBNTencrypt: nt#, challenge, response\n"));
- dump_data(100, p21, 16);
- dump_data(100, c8, 8);
- dump_data(100, p24, 24);
+ DEBUG(100,("SMBencrypt: lm#, challenge, response\n"));
+ dump_data(100, (char *)p21, 16);
+ dump_data(100, (const char *)c8, 8);
+ dump_data(100, (char *)p24, 24);
#endif
}
-/* Routines for Windows NT MD4 Hash functions. */
-static int _my_wcslen(int16 *str)
-{
- int len = 0;
- while(*str++ != 0)
- len++;
- return len;
-}
-
-/*
- * Convert a string into an NT UNICODE string.
- * Note that regardless of processor type
- * this must be in intel (little-endian)
- * format.
- */
-
-static int _my_mbstowcsupper(int16 *dst, const uchar *src, int len)
-{
- int i;
- int16 val;
-
- for(i = 0; i < len; i++) {
- val = toupper(*src);
- SSVAL(dst,0,val);
- dst++;
- src++;
- if(val == 0)
- break;
- }
- return i;
-}
-
-static int _my_mbstowcs(int16 *dst, const uchar *src, int len)
-{
- int i;
- int16 val;
-
- for(i = 0; i < len; i++) {
- val = *src;
- SSVAL(dst,0,val);
- dst++;
- src++;
- if(val == 0)
- break;
- }
- return i;
-}
-
/*
* Creates the MD4 Hash of the users password in NT UNICODE.
*/
-void E_md4hash(uchar *passwd, uchar *p16)
+void E_md4hash(const uchar *passwd, uchar *p16)
{
int len;
- int16 wpwd[129];
+ smb_ucs2_t wpwd[129];
/* Password cannot be longer than 128 characters */
- len = strlen((char *)passwd);
+ len = strlen((const char *)passwd);
if(len > 128)
len = 128;
- /* Password must be converted to NT unicode */
- _my_mbstowcs(wpwd, passwd, len);
- wpwd[len] = 0; /* Ensure string is null terminated */
+ /* Password must be converted to NT unicode - null terminated. */
+ push_ucs2(NULL, wpwd, (const char *)passwd, 256, STR_UNICODE|STR_NOALIGN|STR_TERMINATE);
/* Calculate length in bytes */
- len = _my_wcslen(wpwd) * sizeof(int16);
+ len = strlen_w(wpwd) * sizeof(int16);
mdfour(p16, (unsigned char *)wpwd, len);
}
-/* Does the LM owf of a user's password */
-void lm_owf_genW(const UNISTR2 *pwd, uchar p16[16])
+/* Does both the NT and LM owfs of a user's password */
+void nt_lm_owf_gen(const char *pwd, uchar nt_p16[16], uchar p16[16])
{
- char passwd[15];
+ char passwd[514];
- memset(passwd,'\0',15);
- if (pwd != NULL)
- {
- unistr2_to_ascii( passwd, pwd, sizeof(passwd)-1);
- }
+ memset(passwd,'\0',514);
+ safe_strcpy( passwd, pwd, sizeof(passwd)-1);
- /* Mangle the passwords into Lanman format */
- passwd[14] = '\0';
- strupper(passwd);
-
- /* Calculate the SMB (lanman) hash functions of the password */
-
- memset(p16, '\0', 16);
- E_P16((uchar *) passwd, (uchar *)p16);
+ /* Calculate the MD4 hash (NT compatible) of the password */
+ memset(nt_p16, '\0', 16);
+ E_md4hash((uchar *)passwd, nt_p16);
#ifdef DEBUG_PASSWORD
- DEBUG(100,("nt_lm_owf_gen: pwd, lm#\n"));
+ DEBUG(100,("nt_lm_owf_gen: pwd, nt#\n"));
dump_data(120, passwd, strlen(passwd));
- dump_data(100, p16, 16);
+ dump_data(100, (char *)nt_p16, 16);
#endif
- /* clear out local copy of user's password (just being paranoid). */
- bzero(passwd, sizeof(passwd));
-}
-
-/* Does the LM owf of a user's password */
-void lm_owf_gen(const char *pwd, uchar p16[16])
-{
- char passwd[15];
-
- memset(passwd,'\0',15);
- if (pwd != NULL)
- {
- safe_strcpy( passwd, pwd, sizeof(passwd)-1);
- }
/* Mangle the passwords into Lanman format */
passwd[14] = '\0';
#ifdef DEBUG_PASSWORD
DEBUG(100,("nt_lm_owf_gen: pwd, lm#\n"));
dump_data(120, passwd, strlen(passwd));
- dump_data(100, p16, 16);
+ dump_data(100, (char *)p16, 16);
#endif
/* clear out local copy of user's password (just being paranoid). */
- bzero(passwd, sizeof(passwd));
+ memset(passwd, '\0', sizeof(passwd));
}
-/* Does both the NT and LM owfs of a user's password */
-void nt_owf_genW(const UNISTR2 *pwd, uchar nt_p16[16])
+/* Does both the NTLMv2 owfs of a user's password */
+void ntv2_owf_gen(const uchar owf[16],
+ const char *user_n, const char *domain_n, uchar kr_buf[16])
{
- UNISTR2 passwd;
-
- memset(&passwd,'\0',sizeof(passwd));
- if (pwd != NULL)
- {
- copy_unistr2(&passwd, pwd);
- }
-
- /* Calculate the MD4 hash (NT compatible) of the password */
- memset(nt_p16, '\0', 16);
- mdfour(nt_p16, (unsigned char *)passwd.buffer, passwd.uni_str_len * 2);
-
-#ifdef DEBUG_PASSWORD
- DEBUG(100,("nt_owf_gen: pwd, nt#\n"));
- dump_data(120, (const char*)passwd.buffer, passwd.uni_str_len * 2);
- dump_data(100, nt_p16, 16);
-#endif
- /* clear out local copy of user's password (just being paranoid). */
- memset(&passwd, 0, sizeof(passwd));
-}
+ pstring user_u;
+ pstring dom_u;
+ HMACMD5Context ctx;
-/* Does both the NT and LM owfs of a user's password */
-void nt_owf_gen(const char *pwd, uchar nt_p16[16])
-{
- char passwd[130];
+ int user_l = strlen(user_n);
+ int domain_l = strlen(domain_n);
- memset(passwd,'\0',130);
- if (pwd != NULL)
- {
- safe_strcpy( passwd, pwd, sizeof(passwd)-1);
- }
+ push_ucs2(NULL, user_u, user_n, (user_l+1)*2, STR_UNICODE|STR_NOALIGN|STR_TERMINATE|STR_UPPER);
+ push_ucs2(NULL, dom_u, domain_n, (domain_l+1)*2, STR_UNICODE|STR_NOALIGN|STR_TERMINATE|STR_UPPER);
- /* Calculate the MD4 hash (NT compatible) of the password */
- memset(nt_p16, '\0', 16);
- E_md4hash((uchar *)passwd, nt_p16);
+ hmac_md5_init_limK_to_64(owf, 16, &ctx);
+ hmac_md5_update((const unsigned char *)user_u, user_l * 2, &ctx);
+ hmac_md5_update((const unsigned char *)dom_u, domain_l * 2, &ctx);
+ hmac_md5_final(kr_buf, &ctx);
#ifdef DEBUG_PASSWORD
- DEBUG(100,("nt_owf_gen: pwd, nt#\n"));
- dump_data(120, passwd, strlen(passwd));
- dump_data(100, nt_p16, 16);
+ DEBUG(100, ("ntv2_owf_gen: user, domain, owfkey, kr\n"));
+ dump_data(100, user_u, user_l * 2);
+ dump_data(100, dom_u, domain_l * 2);
+ dump_data(100, owf, 16);
+ dump_data(100, kr_buf, 16);
#endif
- /* clear out local copy of user's password (just being paranoid). */
- bzero(passwd, sizeof(passwd));
-}
-
-/* Does both the NT and LM owfs of a user's UNICODE password */
-void nt_lm_owf_genW(const UNISTR2 *pwd, uchar nt_p16[16], uchar lm_p16[16])
-{
- nt_owf_genW(pwd, nt_p16);
- lm_owf_genW(pwd, lm_p16);
-}
-
-/* Does both the NT and LM owfs of a user's password */
-void nt_lm_owf_gen(const char *pwd, uchar nt_p16[16], uchar lm_p16[16])
-{
- nt_owf_gen(pwd, nt_p16);
- lm_owf_gen(pwd, lm_p16);
}
/* Does the des encryption from the NT or LM MD4 hash. */
-void SMBOWFencrypt(uchar passwd[16], uchar *c8, uchar p24[24])
+void SMBOWFencrypt(const uchar passwd[16], const uchar *c8, uchar p24[24])
{
uchar p21[21];
E_P24(p21, c8, p24);
}
-void SMBOWFencrypt_ntv2(const uchar kr[16],
- const uchar *srv_chal, int srv_chal_len,
- const uchar *cli_chal, int cli_chal_len,
- char resp_buf[16])
-{
- HMACMD5Context ctx;
-
- hmac_md5_init_limK_to_64(kr, 16, &ctx);
- hmac_md5_update(srv_chal, srv_chal_len, &ctx);
- hmac_md5_update(cli_chal, cli_chal_len, &ctx);
- hmac_md5_final(resp_buf, &ctx);
-
-#ifdef DEBUG_PASSWORD
- DEBUG(100,("SMBOWFencrypt_ntv2: srv_chal, cli_chal, resp_buf\n"));
- dump_data(100, srv_chal, srv_chal_len);
- dump_data(100, cli_chal, cli_chal_len);
- dump_data(100, resp_buf, 16);
-#endif
-}
-
-void SMBsesskeygen_ntv2(const uchar kr[16],
- const uchar *nt_resp,
- char sess_key[16])
-{
- HMACMD5Context ctx;
-
- hmac_md5_init_limK_to_64(kr, 16, &ctx);
- hmac_md5_update(nt_resp, 16, &ctx);
- hmac_md5_final(sess_key, &ctx);
-
-#ifdef DEBUG_PASSWORD
- DEBUG(100,("SMBsesskeygen_ntv2:\n"));
- dump_data(100, sess_key, 16);
-#endif
-}
-
-void SMBsesskeygen_ntv1(const uchar kr[16],
- const uchar *nt_resp,
- char sess_key[16])
+/* Does the des encryption from the FIRST 8 BYTES of the NT or LM MD4 hash. */
+void NTLMSSPOWFencrypt(const uchar passwd[8], const uchar *ntlmchalresp, uchar p24[24])
{
- mdfour(sess_key, kr, 16);
+ uchar p21[21];
+
+ memset(p21,'\0',21);
+ memcpy(p21, passwd, 8);
+ memset(p21 + 8, 0xbd, 8);
+ E_P24(p21, ntlmchalresp, p24);
#ifdef DEBUG_PASSWORD
- DEBUG(100,("SMBsesskeygen_ntv2:\n"));
- dump_data(100, sess_key, 16);
+ DEBUG(100,("NTLMSSPOWFencrypt: p21, c8, p24\n"));
+ dump_data(100, (char *)p21, 21);
+ dump_data(100, (const char *)ntlmchalresp, 8);
+ dump_data(100, (char *)p24, 24);
#endif
}
-void SMBgenclientchals(char *lm_cli_chal,
- char *nt_cli_chal, int *nt_cli_chal_len,
- const char *srv, const char *dom)
-{
- NTTIME nt_time;
- int srv_len = strlen(srv);
- int dom_len = strlen(dom);
- fstring server;
- fstring domain;
- fstrcpy(server, srv);
- fstrcpy(domain, dom);
- strupper(server);
- strupper(domain);
-
- generate_random_buffer(lm_cli_chal, 8, False);
- unix_to_nt_time(&nt_time, time(NULL));
-
- CVAL(nt_cli_chal,0) = 0x1;
- CVAL(nt_cli_chal,1) = 0x1;
- SSVAL(nt_cli_chal, 2, 0x0);
- SIVAL(nt_cli_chal, 4, 0x0);
- SIVAL(nt_cli_chal, 8, nt_time.low);
- SIVAL(nt_cli_chal, 12, nt_time.high);
- memcpy(nt_cli_chal+16, lm_cli_chal, 8);
- /* fill in offset 24, size of structure, later */
-
- *nt_cli_chal_len = 28;
-
- SSVAL(nt_cli_chal, *nt_cli_chal_len, 2);
- *nt_cli_chal_len += 2;
- SSVAL(nt_cli_chal, *nt_cli_chal_len, dom_len*2);
- *nt_cli_chal_len += 2;
- ascii_to_unibuf(nt_cli_chal+(*nt_cli_chal_len), domain, dom_len*2);
- *nt_cli_chal_len += dom_len*2;
- *nt_cli_chal_len += 4 - ((*nt_cli_chal_len) % 4);
-
- SSVAL(nt_cli_chal, *nt_cli_chal_len, 2);
- *nt_cli_chal_len += 2;
- SSVAL(nt_cli_chal, 30, srv_len*2);
- *nt_cli_chal_len += 2;
- ascii_to_unibuf(nt_cli_chal+(*nt_cli_chal_len), server, srv_len*2);
- *nt_cli_chal_len += srv_len*2;
-
- SSVAL(nt_cli_chal, 24, (*nt_cli_chal_len)+16);
- SSVAL(nt_cli_chal, 26, (*nt_cli_chal_len)+15);
-
- DEBUG(100,("SMBgenclientchals: srv %s, dom %s\n", server, domain));
- dump_data(100, nt_cli_chal, *nt_cli_chal_len);
-}
-
-void ntv2_owf_gen(const uchar owf[16],
- const char *user_n,
- const char *domain_n,
- uchar kr_buf[16])
-{
- pstring user_u;
- pstring dom_u;
- HMACMD5Context ctx;
- int user_l = strlen(user_n );
- int domain_l = strlen(domain_n);
-
- _my_mbstowcsupper((int16*)user_u, user_n , user_l*2 );
- _my_mbstowcsupper((int16*)dom_u , domain_n, domain_l*2);
-
- hmac_md5_init_limK_to_64(owf, 16, &ctx);
- hmac_md5_update(user_u, user_l*2, &ctx);
- hmac_md5_update(dom_u, domain_l*2, &ctx);
- hmac_md5_final(kr_buf, &ctx);
-
-#ifdef DEBUG_PASSWORD
- DEBUG(100,("ntv2_owf_gen: user, domain, owfkey, kr\n"));
- dump_data(100, user_u, user_l*2);
- dump_data(100, dom_u, domain_l*2);
- dump_data(100, owf, 16);
- dump_data(100, kr_buf, 16);
-#endif
-}
-
-/* Does the des encryption from the FIRST 8 BYTES of the NT or LM MD4 hash. */
-void NTLMSSPOWFencrypt(uchar passwd[8], uchar *ntlmchalresp, uchar p24[24])
+/* Does the NT MD4 hash then des encryption. */
+
+void SMBNTencrypt(const uchar *passwd, uchar *c8, uchar *p24)
{
uchar p21[21];
memset(p21,'\0',21);
- memcpy(p21, passwd, 8);
- memset(p21 + 8, 0xbd, 8);
+
+ E_md4hash(passwd, p21);
+ SMBOWFencrypt(p21, c8, p24);
- E_P24(p21, ntlmchalresp, p24);
#ifdef DEBUG_PASSWORD
- DEBUG(100,("NTLMSSPOWFencrypt: p21, c8, p24\n"));
- dump_data(100, p21, 21);
- dump_data(100, ntlmchalresp, 8);
- dump_data(100, p24, 24);
+ DEBUG(100,("SMBNTencrypt: nt#, challenge, response\n"));
+ dump_data(100, (char *)p21, 16);
+ dump_data(100, (char *)c8, 8);
+ dump_data(100, (char *)p24, 24);
#endif
}
* decrypt. JRA.
*/
generate_random_buffer((unsigned char *)data, 516, False);
- if (unicode)
- {
- ascii_to_unibuf(&data[512 - new_pw_len], passwd, new_pw_len);
- }
- else
- {
- fstrcpy( &data[512 - new_pw_len], passwd);
- }
+ push_string(NULL, &data[512 - new_pw_len], passwd, new_pw_len,
+ STR_NOALIGN | (unicode?STR_UNICODE:STR_ASCII));
SIVAL(data, 512, new_pw_len);
#ifdef DEBUG_PASSWORD
DEBUG(100,("make_oem_passwd_hash\n"));
dump_data(100, data, 516);
#endif
- SamOEMhash( (unsigned char *)data, (unsigned char *)old_pw_hash, True);
+ SamOEMhash( (unsigned char *)data, (unsigned char *)old_pw_hash, 516);
return True;
}
-BOOL nt_decrypt_string2(STRING2 *out, const STRING2 *in, char nt_hash[16])
+/* Does the md5 encryption from the NT hash for NTLMv2. */
+void SMBOWFencrypt_ntv2(const uchar kr[16],
+ const DATA_BLOB srv_chal,
+ const DATA_BLOB cli_chal,
+ char resp_buf[16])
{
- uchar bufhdr[8];
- int datalen;
+ HMACMD5Context ctx;
- uchar key[16];
- uchar *keyptr = key;
- uchar *keyend = key + sizeof(key);
+ hmac_md5_init_limK_to_64(kr, 16, &ctx);
+ hmac_md5_update(srv_chal.data, srv_chal.length, &ctx);
+ hmac_md5_update(cli_chal.data, cli_chal.length, &ctx);
+ hmac_md5_final((unsigned char *)resp_buf, &ctx);
- uchar *outbuf = (uchar *)out->buffer;
- const uchar *inbuf = (const uchar *)in->buffer;
- const uchar *inbufend;
+#ifdef DEBUG_PASSWORD
+ DEBUG(100, ("SMBOWFencrypt_ntv2: srv_chal, cli_chal, resp_buf\n"));
+ dump_data(100, srv_chal.data, srv_chal.length);
+ dump_data(100, cli_chal.data, cli_chal.length);
+ dump_data(100, resp_buf, 16);
+#endif
+}
- mdfour(key, nt_hash, 16);
+void SMBsesskeygen_ntv2(const uchar kr[16],
+ const uchar * nt_resp, uint8 sess_key[16])
+{
+ HMACMD5Context ctx;
- smbhash(bufhdr, inbuf, keyptr, 0);
- datalen = IVAL(bufhdr, 0);
+ hmac_md5_init_limK_to_64(kr, 16, &ctx);
+ hmac_md5_update(nt_resp, 16, &ctx);
+ hmac_md5_final((unsigned char *)sess_key, &ctx);
- if ((datalen > in->str_str_len) || (datalen > MAX_STRINGLEN))
- {
- DEBUG(0, ("nt_decrypt_string2: failed\n"));
- return False;
- }
+#ifdef DEBUG_PASSWORD
+ DEBUG(100, ("SMBsesskeygen_ntv2:\n"));
+ dump_data(100, sess_key, 16);
+#endif
+}
- out->str_max_len = out->str_str_len = datalen;
- inbuf += 8;
- inbufend = inbuf + datalen;
+void SMBsesskeygen_ntv1(const uchar kr[16],
+ const uchar * nt_resp, uint8 sess_key[16])
+{
+ mdfour((unsigned char *)sess_key, kr, 16);
- while (inbuf < inbufend)
- {
- keyptr += 7;
- if (keyptr + 7 > keyend)
- {
- keyptr = (keyend - keyptr) + key;
- }
+#ifdef DEBUG_PASSWORD
+ DEBUG(100, ("SMBsesskeygen_ntv1:\n"));
+ dump_data(100, sess_key, 16);
+#endif
+}
- smbhash(outbuf, inbuf, keyptr, 0);
+/***********************************************************
+ encode a password buffer
+************************************************************/
+BOOL encode_pw_buffer(char buffer[516], const char *new_pass,
+ int new_pw_len, BOOL nt_pass_set)
+{
+ generate_random_buffer((unsigned char *)buffer, 516, True);
- inbuf += 8;
- outbuf += 8;
+ if (nt_pass_set) {
+ new_pw_len *= 2;
+ push_ucs2(NULL, &buffer[512 - new_pw_len], new_pass,
+ new_pw_len, 0);
+ } else {
+ push_ascii(&buffer[512 - new_pw_len], new_pass,
+ new_pw_len, 0);
}
- return True;
-}
-
-/*******************************************************************
- creates a DCE/RPC bind authentication response
-
- - initialises the parse structure.
- - dynamically allocates the header data structure
- - caller is expected to free the header data structure once used.
+ /*
+ * The length of the new password is in the last 4 bytes of
+ * the data buffer.
+ */
+ SIVAL(buffer, 512, new_pw_len);
- ********************************************************************/
-void create_ntlmssp_resp(struct pwd_info *pwd,
- char *domain, char *user_name, char *my_name,
- uint32 ntlmssp_cli_flgs,
- prs_struct *auth_resp)
-{
- RPC_AUTH_NTLMSSP_RESP ntlmssp_resp;
- unsigned char lm_owf[24];
- unsigned char nt_owf[128];
- size_t nt_owf_len;
-
- pwd_get_lm_nt_owf(pwd, lm_owf, nt_owf, &nt_owf_len, NULL);
-
- make_rpc_auth_ntlmssp_resp(&ntlmssp_resp,
- lm_owf, nt_owf, nt_owf_len,
- domain, user_name, my_name,
- ntlmssp_cli_flgs);
-
- smb_io_rpc_auth_ntlmssp_resp("ntlmssp_resp", &ntlmssp_resp, auth_resp, 0);
- mem_realloc_data(auth_resp->data, auth_resp->offset);
+ return True;
}
/***********************************************************
decode a password buffer
+ *new_pw_len is the length in bytes of the possibly mulitbyte
+ returned password including termination.
************************************************************/
-BOOL decode_pw_buffer(const char buffer[516], char *new_passwd,
- int new_passwd_size, uint32 *new_pw_len)
+BOOL decode_pw_buffer(char in_buffer[516], char *new_pwrd,
+ int new_pwrd_size, uint32 *new_pw_len)
{
- /*
- * The length of the new password is in the last 4 bytes of
- * the data buffer.
- */
+ int byte_len=0;
+
+ /*
+ Warning !!! : This function is called from some rpc call.
+ The password IN the buffer is a UNICODE string.
+ The password IN new_pwrd is an ASCII string
+ If you reuse that code somewhere else check first.
+ */
+
+ /* The length of the new password is in the last 4 bytes of the data buffer. */
- (*new_pw_len) = IVAL(buffer, 512);
+ byte_len = IVAL(in_buffer, 512);
#ifdef DEBUG_PASSWORD
- dump_data(100, buffer, 516);
+ dump_data(100, in_buffer, 516);
#endif
- if ((*new_pw_len) < 0 || (*new_pw_len) > new_passwd_size - 1)
- {
- DEBUG(0,("check_oem_password: incorrect password length (%d).\n", (*new_pw_len)));
+ /* Password cannot be longer than 128 characters */
+ if ( (byte_len < 0) || (byte_len > new_pwrd_size - 1)) {
+ DEBUG(0, ("decode_pw_buffer: incorrect password length (%d).\n", byte_len));
+ DEBUG(0, ("decode_pw_buffer: check that 'encrypt passwords = yes'\n"));
return False;
}
- memcpy(new_passwd, &buffer[512-(*new_pw_len)], (*new_pw_len));
- new_passwd[(*new_pw_len)] = '\0';
+ /* decode into the return buffer. Buffer must be a pstring */
+ *new_pw_len = pull_string(NULL, new_pwrd, &in_buffer[512 - byte_len], new_pwrd_size, byte_len, STR_UNICODE);
+#ifdef DEBUG_PASSWORD
+ DEBUG(100,("decode_pw_buffer: new_pwrd: "));
+ dump_data(100, (char *)new_pwrd, *new_pw_len);
+ DEBUG(100,("multibyte len:%d\n", *new_pw_len));
+ DEBUG(100,("original char len:%d\n", byte_len/2));
+#endif
+
return True;
+
}
-/***********************************************************
- encode a password buffer
-************************************************************/
-BOOL encode_pw_buffer(char buffer[516], const char *new_pass,
- int new_pw_len, BOOL nt_pass_set)
+/* Calculate the NT owfs of a user's password */
+void nt_owf_genW(const UNISTR2 *pwd, uchar nt_p16[16])
{
- generate_random_buffer(buffer, 516, True);
+ char buf[512];
+ int i;
- if (nt_pass_set)
- {
- /*
- * nt passwords are in unicode. last char overwrites NULL
- * in ascii_to_unibuf, so use SIVAL *afterwards*.
- */
- new_pw_len *= 2;
- ascii_to_unibuf(&buffer[512-new_pw_len], new_pass, new_pw_len);
- }
- else
+ for (i = 0; i < MIN(pwd->uni_str_len, sizeof(buf) / 2); i++)
{
- memcpy(&buffer[512-new_pw_len], new_pass, new_pw_len);
+ SIVAL(buf, i * 2, pwd->buffer[i]);
}
+ /* Calculate the MD4 hash (NT compatible) of the password */
+ mdfour(nt_p16, (const unsigned char *)buf, pwd->uni_str_len * 2);
- /*
- * The length of the new password is in the last 4 bytes of
- * the data buffer.
- */
-
- SIVAL(buffer, 512, new_pw_len);
-
-#ifdef DEBUG_PASSWORD
- dump_data(100, buffer, 516);
-#endif
-
- return True;
+ /* clear out local copy of user's password (just being paranoid). */
+ ZERO_STRUCT(buf);
}
git.samba.org / ira / wip.git / blobdiff