summaryrefslogtreecommitdiff
path: root/source4/libcli/auth
diff options
context:
space:
mode:
Diffstat (limited to 'source4/libcli/auth')
-rw-r--r--source4/libcli/auth/ntlm_check.c16
-rw-r--r--source4/libcli/auth/ntlmssp.c22
-rw-r--r--source4/libcli/auth/ntlmssp.h2
-rw-r--r--source4/libcli/auth/ntlmssp_sign.c18
-rw-r--r--source4/libcli/auth/schannel.c76
5 files changed, 67 insertions, 67 deletions
diff --git a/source4/libcli/auth/ntlm_check.c b/source4/libcli/auth/ntlm_check.c
index cdb092d1b5..d12a271420 100644
--- a/source4/libcli/auth/ntlm_check.c
+++ b/source4/libcli/auth/ntlm_check.c
@@ -30,12 +30,12 @@
****************************************************************************/
static BOOL smb_pwd_check_ntlmv1(const DATA_BLOB *nt_response,
- const uchar *part_passwd,
+ const uint8_t *part_passwd,
const DATA_BLOB *sec_blob,
DATA_BLOB *user_sess_key)
{
/* Finish the encryption of part_passwd. */
- uchar p24[24];
+ uint8_t p24[24];
if (part_passwd == NULL) {
DEBUG(10,("No password set - DISALLOWING access\n"));
@@ -81,16 +81,16 @@ static BOOL smb_pwd_check_ntlmv1(const DATA_BLOB *nt_response,
****************************************************************************/
static BOOL smb_pwd_check_ntlmv2(const DATA_BLOB *ntv2_response,
- const uchar *part_passwd,
+ const uint8_t *part_passwd,
const DATA_BLOB *sec_blob,
const char *user, const char *domain,
BOOL upper_case_domain, /* should the domain be transformed into upper case? */
DATA_BLOB *user_sess_key)
{
/* Finish the encryption of part_passwd. */
- uchar kr[16];
- uchar value_from_encryption[16];
- uchar client_response[16];
+ uint8_t kr[16];
+ uint8_t value_from_encryption[16];
+ uint8_t client_response[16];
DATA_BLOB client_key_data;
if (part_passwd == NULL) {
@@ -247,8 +247,8 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
username));
} else if (lm_pw && lm_response->length) {
- uchar dospwd[14];
- uchar p16[16];
+ uint8_t dospwd[14];
+ uint8_t p16[16];
ZERO_STRUCT(dospwd);
memcpy(dospwd, lm_response->data, MIN(lm_response->length, sizeof(dospwd)));
diff --git a/source4/libcli/auth/ntlmssp.c b/source4/libcli/auth/ntlmssp.c
index 4f6c6d02c9..49935f0acb 100644
--- a/source4/libcli/auth/ntlmssp.c
+++ b/source4/libcli/auth/ntlmssp.c
@@ -107,7 +107,7 @@ void debug_ntlmssp_flags(uint32_t neg_flags)
static const uint8_t *get_challenge(const struct ntlmssp_state *ntlmssp_state)
{
- static uchar chal[8];
+ static uint8_t chal[8];
generate_random_buffer(chal, sizeof(chal), False);
return chal;
@@ -548,7 +548,7 @@ static NTSTATUS ntlmssp_server_preauth(struct ntlmssp_state *ntlmssp_state,
uint32_t ntlmssp_command, auth_flags;
NTSTATUS nt_status;
- uchar session_nonce_hash[16];
+ uint8_t session_nonce_hash[16];
const char *parse_string;
char *domain = NULL;
@@ -735,7 +735,7 @@ static NTSTATUS ntlmssp_server_postauth(struct ntlmssp_state *ntlmssp_state,
} else {
/* When there is no LM response, just use zeros */
- static const uchar zeros[24];
+ static const uint8_t zeros[24];
session_key = data_blob_talloc(ntlmssp_state->mem_ctx, NULL, 16);
SMBsesskeygen_lm_sess_key(zeros, zeros,
session_key.data);
@@ -985,7 +985,7 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
char *server_domain;
const char *chal_parse_string;
const char *auth_gen_string;
- uchar lm_hash[16];
+ uint8_t lm_hash[16];
DATA_BLOB lm_response = data_blob(NULL, 0);
DATA_BLOB nt_response = data_blob(NULL, 0);
DATA_BLOB session_key = data_blob(NULL, 0);
@@ -1053,7 +1053,7 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
}
if (!ntlmssp_state->password) {
- static const uchar zeros[16];
+ static const uint8_t zeros[16];
/* do nothing - blobs are zero length */
/* session key is all zeros */
@@ -1088,10 +1088,10 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
} else if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
struct MD5Context md5_session_nonce_ctx;
- uchar nt_hash[16];
- uchar session_nonce[16];
- uchar session_nonce_hash[16];
- uchar user_session_key[16];
+ uint8_t nt_hash[16];
+ uint8_t session_nonce[16];
+ uint8_t session_nonce_hash[16];
+ uint8_t user_session_key[16];
E_md4hash(ntlmssp_state->password, nt_hash);
lm_response = data_blob_talloc(ntlmssp_state->mem_ctx, NULL, 24);
@@ -1124,7 +1124,7 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
/* LM Key is incompatible... */
ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
} else {
- uchar nt_hash[16];
+ uint8_t nt_hash[16];
if (ntlmssp_state->use_nt_response) {
nt_response = data_blob_talloc(ntlmssp_state->mem_ctx, NULL, 24);
@@ -1170,7 +1170,7 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
SMBsesskeygen_lm_sess_key(lm_session_key.data, lm_response.data,
new_session_key.data);
} else {
- static const uchar zeros[24];
+ static const uint8_t zeros[24];
SMBsesskeygen_lm_sess_key(lm_session_key.data, zeros,
new_session_key.data);
}
diff --git a/source4/libcli/auth/ntlmssp.h b/source4/libcli/auth/ntlmssp.h
index aa7aa7e02b..40592acf85 100644
--- a/source4/libcli/auth/ntlmssp.h
+++ b/source4/libcli/auth/ntlmssp.h
@@ -107,7 +107,7 @@ typedef struct ntlmssp_state
/* internal variables used by NTLM2 */
BOOL doing_ntlm2;
- uchar session_nonce[16];
+ uint8_t session_nonce[16];
/* internal variables used by KEY_EXCH (client-supplied user session key */
DATA_BLOB encrypted_session_key;
diff --git a/source4/libcli/auth/ntlmssp_sign.c b/source4/libcli/auth/ntlmssp_sign.c
index 22aa877b63..6b41ad7185 100644
--- a/source4/libcli/auth/ntlmssp_sign.c
+++ b/source4/libcli/auth/ntlmssp_sign.c
@@ -118,15 +118,15 @@ enum ntlmssp_direction {
static NTSTATUS ntlmssp_make_packet_signature(NTLMSSP_STATE *ntlmssp_state,
TALLOC_CTX *sig_mem_ctx,
- const uchar *data, size_t length,
+ const uint8_t *data, size_t length,
enum ntlmssp_direction direction,
DATA_BLOB *sig)
{
if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
HMACMD5Context ctx;
- uchar seq_num[4];
- uchar digest[16];
+ uint8_t seq_num[4];
+ uint8_t digest[16];
SIVAL(seq_num, 0, ntlmssp_state->ntlmssp_seq_num);
switch (direction) {
@@ -174,7 +174,7 @@ static NTSTATUS ntlmssp_make_packet_signature(NTLMSSP_STATE *ntlmssp_state,
NTSTATUS ntlmssp_sign_packet(NTLMSSP_STATE *ntlmssp_state,
TALLOC_CTX *sig_mem_ctx,
- const uchar *data, size_t length,
+ const uint8_t *data, size_t length,
DATA_BLOB *sig)
{
NTSTATUS nt_status;
@@ -199,7 +199,7 @@ NTSTATUS ntlmssp_sign_packet(NTLMSSP_STATE *ntlmssp_state,
NTSTATUS ntlmssp_check_packet(NTLMSSP_STATE *ntlmssp_state,
TALLOC_CTX *sig_mem_ctx,
- const uchar *data, size_t length,
+ const uint8_t *data, size_t length,
const DATA_BLOB *sig)
{
DATA_BLOB local_sig;
@@ -265,7 +265,7 @@ NTSTATUS ntlmssp_check_packet(NTLMSSP_STATE *ntlmssp_state,
NTSTATUS ntlmssp_seal_packet(NTLMSSP_STATE *ntlmssp_state,
TALLOC_CTX *sig_mem_ctx,
- uchar *data, size_t length,
+ uint8_t *data, size_t length,
DATA_BLOB *sig)
{
if (!ntlmssp_state->session_key.length) {
@@ -277,8 +277,8 @@ NTSTATUS ntlmssp_seal_packet(NTLMSSP_STATE *ntlmssp_state,
dump_data_pw("ntlmssp clear data\n", data, length);
if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
HMACMD5Context ctx;
- uchar seq_num[4];
- uchar digest[16];
+ uint8_t seq_num[4];
+ uint8_t digest[16];
SIVAL(seq_num, 0, ntlmssp_state->ntlmssp_seq_num);
hmac_md5_init_limK_to_64(ntlmssp_state->send_sign_key,
@@ -335,7 +335,7 @@ NTSTATUS ntlmssp_seal_packet(NTLMSSP_STATE *ntlmssp_state,
NTSTATUS ntlmssp_unseal_packet(NTLMSSP_STATE *ntlmssp_state,
TALLOC_CTX *sig_mem_ctx,
- uchar *data, size_t length,
+ uint8_t *data, size_t length,
DATA_BLOB *sig)
{
if (!ntlmssp_state->session_key.length) {
diff --git a/source4/libcli/auth/schannel.c b/source4/libcli/auth/schannel.c
index 0a26db3037..666eb811ae 100644
--- a/source4/libcli/auth/schannel.c
+++ b/source4/libcli/auth/schannel.c
@@ -26,12 +26,12 @@
Encode or Decode the sequence number (which is symmetric)
********************************************************************/
static void netsec_deal_with_seq_num(struct schannel_state *state,
- const uchar packet_digest[8],
- uchar seq_num[8])
+ const uint8_t packet_digest[8],
+ uint8_t seq_num[8])
{
- static const uchar zeros[4];
- uchar sequence_key[16];
- uchar digest1[16];
+ static const uint8_t zeros[4];
+ uint8_t sequence_key[16];
+ uint8_t digest1[16];
hmac_md5(state->session_key, zeros, sizeof(zeros), digest1);
hmac_md5(digest1, packet_digest, 8, sequence_key);
@@ -44,13 +44,13 @@ static void netsec_deal_with_seq_num(struct schannel_state *state,
/*******************************************************************
Calculate the key with which to encode the data payload
********************************************************************/
-static void netsec_get_sealing_key(const uchar session_key[16],
- const uchar seq_num[8],
- uchar sealing_key[16])
+static void netsec_get_sealing_key(const uint8_t session_key[16],
+ const uint8_t seq_num[8],
+ uint8_t sealing_key[16])
{
- static const uchar zeros[4];
- uchar digest2[16];
- uchar sess_kf0[16];
+ static const uint8_t zeros[4];
+ uint8_t digest2[16];
+ uint8_t sess_kf0[16];
int i;
for (i = 0; i < 16; i++) {
@@ -66,14 +66,14 @@ static void netsec_get_sealing_key(const uchar session_key[16],
Create a digest over the entire packet (including the data), and
MD5 it with the session key.
********************************************************************/
-static void schannel_digest(const uchar sess_key[16],
- const uchar netsec_sig[8],
- const uchar *confounder,
- const uchar *data, size_t data_len,
- uchar digest_final[16])
+static void schannel_digest(const uint8_t sess_key[16],
+ const uint8_t netsec_sig[8],
+ const uint8_t *confounder,
+ const uint8_t *data, size_t data_len,
+ uint8_t digest_final[16])
{
- uchar packet_digest[16];
- static const uchar zeros[4];
+ uint8_t packet_digest[16];
+ static const uint8_t zeros[4];
struct MD5Context ctx;
MD5Init(&ctx);
@@ -94,14 +94,14 @@ static void schannel_digest(const uchar sess_key[16],
*/
NTSTATUS schannel_unseal_packet(struct schannel_state *state,
TALLOC_CTX *mem_ctx,
- uchar *data, size_t length,
+ uint8_t *data, size_t length,
DATA_BLOB *sig)
{
- uchar digest_final[16];
- uchar confounder[8];
- uchar seq_num[8];
- uchar sealing_key[16];
- static const uchar netsec_sig[8] = NETSEC_SEAL_SIGNATURE;
+ uint8_t digest_final[16];
+ uint8_t confounder[8];
+ uint8_t seq_num[8];
+ uint8_t sealing_key[16];
+ static const uint8_t netsec_sig[8] = NETSEC_SEAL_SIGNATURE;
if (sig->length != 32) {
return NT_STATUS_ACCESS_DENIED;
@@ -141,12 +141,12 @@ NTSTATUS schannel_unseal_packet(struct schannel_state *state,
check the signature on a packet
*/
NTSTATUS schannel_check_packet(struct schannel_state *state,
- const uchar *data, size_t length,
+ const uint8_t *data, size_t length,
const DATA_BLOB *sig)
{
- uchar digest_final[16];
- uchar seq_num[8];
- static const uchar netsec_sig[8] = NETSEC_SIGN_SIGNATURE;
+ uint8_t digest_final[16];
+ uint8_t seq_num[8];
+ static const uint8_t netsec_sig[8] = NETSEC_SIGN_SIGNATURE;
if (sig->length != 32) {
return NT_STATUS_ACCESS_DENIED;
@@ -185,14 +185,14 @@ NTSTATUS schannel_check_packet(struct schannel_state *state,
*/
NTSTATUS schannel_seal_packet(struct schannel_state *state,
TALLOC_CTX *mem_ctx,
- uchar *data, size_t length,
+ uint8_t *data, size_t length,
DATA_BLOB *sig)
{
- uchar digest_final[16];
- uchar confounder[8];
- uchar seq_num[8];
- uchar sealing_key[16];
- static const uchar netsec_sig[8] = NETSEC_SEAL_SIGNATURE;
+ uint8_t digest_final[16];
+ uint8_t confounder[8];
+ uint8_t seq_num[8];
+ uint8_t sealing_key[16];
+ static const uint8_t netsec_sig[8] = NETSEC_SEAL_SIGNATURE;
generate_random_buffer(confounder, 8, False);
@@ -236,12 +236,12 @@ NTSTATUS schannel_seal_packet(struct schannel_state *state,
*/
NTSTATUS schannel_sign_packet(struct schannel_state *state,
TALLOC_CTX *mem_ctx,
- const uchar *data, size_t length,
+ const uint8_t *data, size_t length,
DATA_BLOB *sig)
{
- uchar digest_final[16];
- uchar seq_num[8];
- static const uchar netsec_sig[8] = NETSEC_SIGN_SIGNATURE;
+ uint8_t digest_final[16];
+ uint8_t seq_num[8];
+ static const uint8_t netsec_sig[8] = NETSEC_SIGN_SIGNATURE;
RSIVAL(seq_num, 0, state->seq_num);
SIVAL(seq_num, 4, state->initiator?0x80:0);
generated by cgit (git 2.34.1) at 2024-12-16 15:25:50 +0000