summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-10-24 09:39:16 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-25 00:24:08 +0200
commit13a5f27db20f3bc17f7da516871b0011711dfd14 (patch)
tree00f47eeb99541a60e5a36b9858c6c25622bbfe94 /source3/libsmb
parent4db071cca4c2e22ca33bd246b239986f7e9a4225 (diff)
downloadsamba-13a5f27db20f3bc17f7da516871b0011711dfd14.tar.gz
samba-13a5f27db20f3bc17f7da516871b0011711dfd14.tar.bz2
samba-13a5f27db20f3bc17f7da516871b0011711dfd14.zip
s3:libsmb/smb_signing: make use of smb_len_nbt()
metze
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/smb_signing.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/libsmb/smb_signing.c b/source3/libsmb/smb_signing.c
index 18752b9fc2..2250348707 100644
--- a/source3/libsmb/smb_signing.c
+++ b/source3/libsmb/smb_signing.c
@@ -176,7 +176,7 @@ static void smb_signing_md5(const DATA_BLOB *mac_key,
/* copy in the rest of the packet in, skipping the signature */
MD5Update(&md5_ctx, buf + offset_end_of_sig,
- smb_len(buf) - (offset_end_of_sig - 4));
+ smb_len_nbt(buf) - (offset_end_of_sig - 4));
/* calculate the MD5 sig */
MD5Final(calc_md5_mac, &md5_ctx);
@@ -227,10 +227,10 @@ void smb_signing_sign_pdu(struct smb_signing_state *si,
}
/* JRA Paranioa test - we should be able to get rid of this... */
- if (smb_len(outbuf) < (HDR_SS_FIELD + 8)) {
+ if (smb_len_nbt(outbuf) < (HDR_SS_FIELD + 8)) {
DEBUG(1,("smb_signing_sign_pdu: Logic error. "
"Can't check signature on short packet! smb_len = %u\n",
- smb_len(outbuf)));
+ smb_len_nbt(outbuf)));
abort();
}
@@ -285,11 +285,11 @@ bool smb_signing_check_pdu(struct smb_signing_state *si,
return true;
}
- if (smb_len(inbuf) < (HDR_SS_FIELD + 8)) {
+ if (smb_len_nbt(inbuf) < (HDR_SS_FIELD + 8)) {
DEBUG(1,("smb_signing_check_pdu: Can't check signature "
"on short packet! smb_len = %u\n",
- smb_len(inbuf)));
- return False;
+ smb_len_nbt(inbuf)));
+ return false;
}
smb_signing_md5(&si->mac_key, inbuf,