summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-08-03 09:57:19 +0200
committerStefan Metzmacher <metze@samba.org>2012-08-04 09:10:20 +0200
commitb1c5efbfeab2b597d8b7878fbe47afb2d9786f10 (patch)
treef630b709896aa53476dc89d1b48613e2891e2322 /source3
parentd88a6c1dc3bb90b5ac82e09eb1c96df434f6ce69 (diff)
downloadsamba-b1c5efbfeab2b597d8b7878fbe47afb2d9786f10.tar.gz
samba-b1c5efbfeab2b597d8b7878fbe47afb2d9786f10.tar.bz2
samba-b1c5efbfeab2b597d8b7878fbe47afb2d9786f10.zip
s3:smbd: skip nbt header in srv_check_sign_mac()
metze
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/signing.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index f4a8d2a2fd..1661b1bebf 100644
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -32,29 +32,35 @@ bool srv_check_sign_mac(struct smbd_server_connection *conn,
const char *inbuf, uint32_t *seqnum,
bool trusted_channel)
{
+ const uint8_t *inhdr;
+ size_t len;
+
/* Check if it's a non-session message. */
if(CVAL(inbuf,0)) {
return true;
}
+ len = smb_len(inbuf);
+ inhdr = (const uint8_t *)inbuf + NBT_HDR_SIZE;
+
if (trusted_channel) {
NTSTATUS status;
- if (smb_len(inbuf) < (smb_ss_field + 8 - 4)) {
+ if (len < (HDR_SS_FIELD + 8)) {
DEBUG(1,("smb_signing_check_pdu: Can't check signature "
"on short packet! smb_len = %u\n",
- smb_len(inbuf)));
+ (unsigned)len));
return false;
}
- status = NT_STATUS(IVAL(inbuf, smb_ss_field + 4));
+ status = NT_STATUS(IVAL(inhdr, HDR_SS_FIELD + 4));
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1,("smb_signing_check_pdu: trusted channel passed %s\n",
nt_errstr(status)));
return false;
}
- *seqnum = IVAL(inbuf, smb_ss_field);
+ *seqnum = IVAL(inhdr, HDR_SS_FIELD);
return true;
}