diff options
author | Stefan Metzmacher <metze@samba.org> | 2004-06-01 08:30:34 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:23 -0500 |
commit | 98d291423ff581786a369ce373c861f94c654aa0 (patch) | |
tree | cfcc2391f71a4f3373c5fff359a285aeee558639 /source4/libcli/util | |
parent | fa2e9ec311b99dee2fbff5ee5fa2c743298dacad (diff) | |
download | samba-98d291423ff581786a369ce373c861f94c654aa0.tar.gz samba-98d291423ff581786a369ce373c861f94c654aa0.tar.bz2 samba-98d291423ff581786a369ce373c861f94c654aa0.zip |
r961: convert 'uchar' to 'uint8_t'
metze
(This used to be commit 9f914e4af99e18b469d4cf9d8b1514a2bd28ddec)
Diffstat (limited to 'source4/libcli/util')
-rw-r--r-- | source4/libcli/util/smbdes.c | 32 | ||||
-rw-r--r-- | source4/libcli/util/smbencrypt.c | 58 |
2 files changed, 45 insertions, 45 deletions
diff --git a/source4/libcli/util/smbdes.c b/source4/libcli/util/smbdes.c index b2e46e759d..90724cb778 100644 --- a/source4/libcli/util/smbdes.c +++ b/source4/libcli/util/smbdes.c @@ -46,9 +46,9 @@ */ -#define uchar unsigned char +#define uint8_t unsigned char -static const uchar perm1[56] = {57, 49, 41, 33, 25, 17, 9, +static const uint8_t perm1[56] = {57, 49, 41, 33, 25, 17, 9, 1, 58, 50, 42, 34, 26, 18, 10, 2, 59, 51, 43, 35, 27, 19, 11, 3, 60, 52, 44, 36, @@ -57,7 +57,7 @@ static const uchar perm1[56] = {57, 49, 41, 33, 25, 17, 9, 14, 6, 61, 53, 45, 37, 29, 21, 13, 5, 28, 20, 12, 4}; -static const uchar perm2[48] = {14, 17, 11, 24, 1, 5, +static const uint8_t perm2[48] = {14, 17, 11, 24, 1, 5, 3, 28, 15, 6, 21, 10, 23, 19, 12, 4, 26, 8, 16, 7, 27, 20, 13, 2, @@ -66,7 +66,7 @@ static const uchar perm2[48] = {14, 17, 11, 24, 1, 5, 44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32}; -static const uchar perm3[64] = {58, 50, 42, 34, 26, 18, 10, 2, +static const uint8_t perm3[64] = {58, 50, 42, 34, 26, 18, 10, 2, 60, 52, 44, 36, 28, 20, 12, 4, 62, 54, 46, 38, 30, 22, 14, 6, 64, 56, 48, 40, 32, 24, 16, 8, @@ -75,7 +75,7 @@ static const uchar perm3[64] = {58, 50, 42, 34, 26, 18, 10, 2, 61, 53, 45, 37, 29, 21, 13, 5, 63, 55, 47, 39, 31, 23, 15, 7}; -static const uchar perm4[48] = { 32, 1, 2, 3, 4, 5, +static const uint8_t perm4[48] = { 32, 1, 2, 3, 4, 5, 4, 5, 6, 7, 8, 9, 8, 9, 10, 11, 12, 13, 12, 13, 14, 15, 16, 17, @@ -84,7 +84,7 @@ static const uchar perm4[48] = { 32, 1, 2, 3, 4, 5, 24, 25, 26, 27, 28, 29, 28, 29, 30, 31, 32, 1}; -static const uchar perm5[32] = { 16, 7, 20, 21, +static const uint8_t perm5[32] = { 16, 7, 20, 21, 29, 12, 28, 17, 1, 15, 23, 26, 5, 18, 31, 10, @@ -94,7 +94,7 @@ static const uchar perm5[32] = { 16, 7, 20, 21, 22, 11, 4, 25}; -static const uchar perm6[64] ={ 40, 8, 48, 16, 56, 24, 64, 32, +static const uint8_t perm6[64] ={ 40, 8, 48, 16, 56, 24, 64, 32, 39, 7, 47, 15, 55, 23, 63, 31, 38, 6, 46, 14, 54, 22, 62, 30, 37, 5, 45, 13, 53, 21, 61, 29, @@ -104,9 +104,9 @@ static const uchar perm6[64] ={ 40, 8, 48, 16, 56, 24, 64, 32, 33, 1, 41, 9, 49, 17, 57, 25}; -static const uchar sc[16] = {1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1}; +static const uint8_t sc[16] = {1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1}; -static const uchar sbox[8][4][16] = { +static const uint8_t sbox[8][4][16] = { {{14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7}, {0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8}, {4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0}, @@ -147,7 +147,7 @@ static const uchar sbox[8][4][16] = { {7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8}, {2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11}}}; -static void permute(char *out, const char *in, const uchar *p, int n) +static void permute(char *out, const char *in, const uint8_t *p, int n) { int i; for (i=0;i<n;i++) @@ -412,14 +412,14 @@ void SamOEMhash(uint8_t *data, const uint8_t keystr[16], int len) /* Decode a sam password hash into a password. The password hash is the same method used to store passwords in the NT registry. The DES key used is based on the RID of the user. */ -void sam_pwd_hash(uint_t rid, const uchar *in, uchar *out, int forw) +void sam_pwd_hash(uint_t rid, const uint8_t *in, uint8_t *out, int forw) { - uchar s[14]; + uint8_t s[14]; - s[0] = s[4] = s[8] = s[12] = (uchar)(rid & 0xFF); - s[1] = s[5] = s[9] = s[13] = (uchar)((rid >> 8) & 0xFF); - s[2] = s[6] = s[10] = (uchar)((rid >> 16) & 0xFF); - s[3] = s[7] = s[11] = (uchar)((rid >> 24) & 0xFF); + s[0] = s[4] = s[8] = s[12] = (uint8_t)(rid & 0xFF); + s[1] = s[5] = s[9] = s[13] = (uint8_t)((rid >> 8) & 0xFF); + s[2] = s[6] = s[10] = (uint8_t)((rid >> 16) & 0xFF); + s[3] = s[7] = s[11] = (uint8_t)((rid >> 24) & 0xFF); smbhash(out, in, s, forw); smbhash(out+8, in+8, s+7, forw); diff --git a/source4/libcli/util/smbencrypt.c b/source4/libcli/util/smbencrypt.c index d52d24e1e1..fdd5838798 100644 --- a/source4/libcli/util/smbencrypt.c +++ b/source4/libcli/util/smbencrypt.c @@ -32,10 +32,10 @@ Returns False if password must have been truncated to create LM hash */ -BOOL SMBencrypt(const char *passwd, const uchar *c8, uchar p24[24]) +BOOL SMBencrypt(const char *passwd, const uint8_t *c8, uint8_t p24[24]) { BOOL ret; - uchar p21[21]; + uint8_t p21[21]; memset(p21,'\0',21); ret = E_deshash(passwd, p21); @@ -58,7 +58,7 @@ BOOL SMBencrypt(const char *passwd, const uchar *c8, uchar p24[24]) * @param p16 return password hashed with md4, caller allocated 16 byte buffer */ -void E_md4hash(const char *passwd, uchar p16[16]) +void E_md4hash(const char *passwd, uint8_t p16[16]) { int len; smb_ucs2_t wpwd[129]; @@ -80,7 +80,7 @@ void E_md4hash(const char *passwd, uchar p16[16]) * @note p16 is filled in regardless */ -BOOL E_deshash(const char *passwd, uchar p16[16]) +BOOL E_deshash(const char *passwd, uint8_t p16[16]) { BOOL ret = True; fstring dospwd; @@ -110,7 +110,7 @@ BOOL E_deshash(const char *passwd, 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]) +void nt_lm_owf_gen(const char *pwd, uint8_t nt_p16[16], uint8_t p16[16]) { /* Calculate the MD4 hash (NT compatible) of the password */ memset(nt_p16, '\0', 16); @@ -122,7 +122,7 @@ void nt_lm_owf_gen(const char *pwd, uchar nt_p16[16], uchar p16[16]) dump_data(100, (char *)nt_p16, 16); #endif - E_deshash(pwd, (uchar *)p16); + E_deshash(pwd, (uint8_t *)p16); #ifdef DEBUG_PASSWORD DEBUG(100,("nt_lm_owf_gen: pwd, lm#\n")); @@ -132,10 +132,10 @@ void nt_lm_owf_gen(const char *pwd, uchar nt_p16[16], uchar p16[16]) } /* Does both the NTLMv2 owfs of a user's password */ -BOOL ntv2_owf_gen(const uchar owf[16], +BOOL ntv2_owf_gen(const uint8_t owf[16], const char *user_in, const char *domain_in, BOOL upper_case_domain, /* Transform the domain into UPPER case */ - uchar kr_buf[16]) + uint8_t kr_buf[16]) { smb_ucs2_t *user; smb_ucs2_t *domain; @@ -188,9 +188,9 @@ BOOL ntv2_owf_gen(const uchar owf[16], } /* Does the des encryption from the NT or LM MD4 hash. */ -void SMBOWFencrypt(const uchar passwd[16], const uchar *c8, uchar p24[24]) +void SMBOWFencrypt(const uint8_t passwd[16], const uint8_t *c8, uint8_t p24[24]) { - uchar p21[21]; + uint8_t p21[21]; ZERO_STRUCT(p21); @@ -200,9 +200,9 @@ void SMBOWFencrypt(const uchar passwd[16], const uchar *c8, uchar p24[24]) /* Does the NT MD4 hash then des encryption. */ -void SMBNTencrypt(const char *passwd, uchar *c8, uchar *p24) +void SMBNTencrypt(const char *passwd, uint8_t *c8, uint8_t *p24) { - uchar p21[21]; + uint8_t p21[21]; memset(p21,'\0',21); @@ -218,10 +218,10 @@ void SMBNTencrypt(const char *passwd, uchar *c8, uchar *p24) } /* Does the md5 encryption from the Key Response for NTLMv2. */ -void SMBOWFencrypt_ntv2(const uchar kr[16], +void SMBOWFencrypt_ntv2(const uint8_t kr[16], const DATA_BLOB *srv_chal, const DATA_BLOB *cli_chal, - uchar resp_buf[16]) + uint8_t resp_buf[16]) { HMACMD5Context ctx; @@ -238,8 +238,8 @@ void SMBOWFencrypt_ntv2(const uchar kr[16], #endif } -void SMBsesskeygen_ntv2(const uchar kr[16], - const uchar * nt_resp, uint8_t sess_key[16]) +void SMBsesskeygen_ntv2(const uint8_t kr[16], + const uint8_t * nt_resp, uint8_t sess_key[16]) { /* a very nice, 128 bit, variable session key */ @@ -255,7 +255,7 @@ void SMBsesskeygen_ntv2(const uchar kr[16], #endif } -void SMBsesskeygen_ntv1(const uchar kr[16], uint8_t sess_key[16]) +void SMBsesskeygen_ntv1(const uint8_t kr[16], uint8_t sess_key[16]) { /* yes, this session key does not change - yes, this is a problem - but it is 128 bits */ @@ -268,14 +268,14 @@ void SMBsesskeygen_ntv1(const uchar kr[16], uint8_t sess_key[16]) #endif } -void SMBsesskeygen_lm_sess_key(const uchar lm_hash[16], - const uchar lm_resp[24], /* only uses 8 */ +void SMBsesskeygen_lm_sess_key(const uint8_t lm_hash[16], + const uint8_t lm_resp[24], /* only uses 8 */ uint8_t sess_key[16]) { /* Calculate the LM session key (effective length 40 bits, but changes with each session) */ - uchar p24[24]; - uchar p21[21]; + uint8_t p24[24]; + uint8_t p21[21]; memset(p21,'\0',21); memcpy(p21, lm_hash, 8); @@ -306,7 +306,7 @@ DATA_BLOB NTLMv2_generate_names_blob(TALLOC_CTX *mem_ctx, static DATA_BLOB NTLMv2_generate_client_data(TALLOC_CTX *mem_ctx, const DATA_BLOB *names_blob) { - uchar client_chal[8]; + uint8_t client_chal[8]; DATA_BLOB response = data_blob(NULL, 0); char long_date[8]; NTTIME nttime; @@ -330,11 +330,11 @@ static DATA_BLOB NTLMv2_generate_client_data(TALLOC_CTX *mem_ctx, const DATA_BLO return response; } -static DATA_BLOB NTLMv2_generate_response(const uchar ntlm_v2_hash[16], +static DATA_BLOB NTLMv2_generate_response(const uint8_t ntlm_v2_hash[16], const DATA_BLOB *server_chal, const DATA_BLOB *names_blob) { - uchar ntlmv2_response[16]; + uint8_t ntlmv2_response[16]; DATA_BLOB ntlmv2_client_data; DATA_BLOB final_response; @@ -364,10 +364,10 @@ static DATA_BLOB NTLMv2_generate_response(const uchar ntlm_v2_hash[16], return final_response; } -static DATA_BLOB LMv2_generate_response(const uchar ntlm_v2_hash[16], +static DATA_BLOB LMv2_generate_response(const uint8_t ntlm_v2_hash[16], const DATA_BLOB *server_chal) { - uchar lmv2_response[16]; + uint8_t lmv2_response[16]; DATA_BLOB lmv2_client_data = data_blob(NULL, 8); DATA_BLOB final_response = data_blob(NULL, 24); @@ -395,8 +395,8 @@ BOOL SMBNTLMv2encrypt(const char *user, const char *domain, const char *password DATA_BLOB *lm_response, DATA_BLOB *nt_response, DATA_BLOB *user_session_key) { - uchar nt_hash[16]; - uchar ntlm_v2_hash[16]; + uint8_t nt_hash[16]; + uint8_t ntlm_v2_hash[16]; E_md4hash(password, nt_hash); /* We don't use the NT# directly. Instead we use it mashed up with @@ -434,7 +434,7 @@ BOOL SMBNTLMv2encrypt(const char *user, const char *domain, const char *password ************************************************************/ BOOL encode_pw_buffer(char buffer[516], const char *password, int string_flags) { - uchar new_pw[512]; + uint8_t new_pw[512]; size_t new_pw_len; new_pw_len = push_string(NULL, new_pw, |