From 98d291423ff581786a369ce373c861f94c654aa0 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 1 Jun 2004 08:30:34 +0000 Subject: r961: convert 'uchar' to 'uint8_t' metze (This used to be commit 9f914e4af99e18b469d4cf9d8b1514a2bd28ddec) --- source4/auth/auth.c | 4 ++-- source4/auth/auth_domain.c | 6 +++--- source4/auth/auth_util.c | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'source4/auth') diff --git a/source4/auth/auth.c b/source4/auth/auth.c index 41389c0f87..49480eeac4 100644 --- a/source4/auth/auth.c +++ b/source4/auth/auth.c @@ -75,7 +75,7 @@ static const uint8_t *get_ntlm_challenge(struct auth_context *auth_context) } if (!challenge_set_by) { - uchar chal[8]; + uint8_t chal[8]; generate_random_buffer(chal, sizeof(chal), False); auth_context->challenge = data_blob_talloc(auth_context->mem_ctx, @@ -381,7 +381,7 @@ NTSTATUS make_auth_context_subsystem(struct auth_context **auth_context) Make a auth_info struct with a fixed challenge ***************************************************************************/ -NTSTATUS make_auth_context_fixed(struct auth_context **auth_context, uchar chal[8]) +NTSTATUS make_auth_context_fixed(struct auth_context **auth_context, uint8_t chal[8]) { NTSTATUS nt_status; if (!NT_STATUS_IS_OK(nt_status = make_auth_context_subsystem(auth_context))) { diff --git a/source4/auth/auth_domain.c b/source4/auth/auth_domain.c index f59c82c553..cd11bcdefe 100644 --- a/source4/auth/auth_domain.c +++ b/source4/auth/auth_domain.c @@ -290,7 +290,7 @@ static NTSTATUS find_connect_dc(struct cli_state **cli, static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx, const auth_usersupplied_info *user_info, const char *domain, - uchar chal[8], + uint8_t chal[8], auth_serversupplied_info **server_info, const char *server, const char *setup_creds_as, uint16_t sec_chan, @@ -447,7 +447,7 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context, password_server = lp_passwordserver(); nt_status = domain_client_validate(mem_ctx, user_info, domain, - (uchar *)auth_context->challenge.data, + (uint8_t *)auth_context->challenge.data, server_info, password_server, lp_netbios_name(), SEC_CHAN_WKSTA, trust_passwd, last_change_time); return nt_status; @@ -534,7 +534,7 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte #endif nt_status = domain_client_validate(mem_ctx, user_info, user_info->domain.str, - (uchar *)auth_context->challenge.data, + (uint8_t *)auth_context->challenge.data, server_info, "*" /* Do a lookup */, lp_workgroup(), SEC_CHAN_DOMAIN, trust_md4_password, last_change_time); diff --git a/source4/auth/auth_util.c b/source4/auth/auth_util.c index b04b93d63f..929390ad78 100644 --- a/source4/auth/auth_util.c +++ b/source4/auth/auth_util.c @@ -161,8 +161,8 @@ BOOL make_user_info_netlogon_network(auth_usersupplied_info **user_info, const char *smb_name, const char *client_domain, const char *wksta_name, - const uchar *lm_network_pwd, int lm_pwd_len, - const uchar *nt_network_pwd, int nt_pwd_len) + const uint8_t *lm_network_pwd, int lm_pwd_len, + const uint8_t *nt_network_pwd, int nt_pwd_len) { BOOL ret; NTSTATUS nt_status; @@ -193,10 +193,10 @@ BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info, const char *smb_name, const char *client_domain, const char *wksta_name, - const uchar chal[8], - const uchar lm_interactive_pwd[16], - const uchar nt_interactive_pwd[16], - const uchar *dc_sess_key) + const uint8_t chal[8], + const uint8_t lm_interactive_pwd[16], + const uint8_t nt_interactive_pwd[16], + const uint8_t *dc_sess_key) { char lm_pwd[16]; char nt_pwd[16]; @@ -222,10 +222,10 @@ BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info, #endif if (lm_interactive_pwd) - SamOEMhash((uchar *)lm_pwd, key, sizeof(lm_pwd)); + SamOEMhash((uint8_t *)lm_pwd, key, sizeof(lm_pwd)); if (nt_interactive_pwd) - SamOEMhash((uchar *)nt_pwd, key, sizeof(nt_pwd)); + SamOEMhash((uint8_t *)nt_pwd, key, sizeof(nt_pwd)); #ifdef DEBUG_PASSWORD DEBUG(100,("decrypt of lm owf password:")); @@ -314,7 +314,7 @@ BOOL make_user_info_for_reply(auth_usersupplied_info **user_info, dump_data(100, plaintext_password.data, plaintext_password.length); #endif - SMBencrypt( (const char *)plaintext_password.data, (const uchar*)chal, local_lm_response); + SMBencrypt( (const char *)plaintext_password.data, (const uint8_t *)chal, local_lm_response); local_lm_blob = data_blob(local_lm_response, 24); /* We can't do an NT hash here, as the password needs to be -- cgit