diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-08-03 09:58:29 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-08-04 09:10:21 +0200 |
| commit | b1a0fda73d13587fd63682bc8e47f6862289f66d (patch) | |
| tree | a2d0bc40687fd5ae3c5584722754ba9a28c6d9ac /libcli/smb/smb_signing.c | |
| parent | b1c5efbfeab2b597d8b7878fbe47afb2d9786f10 (diff) | |
| download | samba-b1a0fda73d13587fd63682bc8e47f6862289f66d.tar.gz samba-b1a0fda73d13587fd63682bc8e47f6862289f66d.tar.bz2 samba-b1a0fda73d13587fd63682bc8e47f6862289f66d.zip | |
libcli/smb: pass hdr/len to smb_signing_check/sign_pdu() and skip the nbt header
metze
Diffstat (limited to 'libcli/smb/smb_signing.c')
| -rw-r--r-- | libcli/smb/smb_signing.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libcli/smb/smb_signing.c b/libcli/smb/smb_signing.c index 6c598f50f7..2f7e8702ba 100644 --- a/libcli/smb/smb_signing.c +++ b/libcli/smb/smb_signing.c @@ -216,13 +216,12 @@ void smb_signing_cancel_reply(struct smb_signing_state *si, bool oneway) } void smb_signing_sign_pdu(struct smb_signing_state *si, - uint8_t *outbuf, uint32_t seqnum) + uint8_t *outhdr, size_t len, + uint32_t seqnum) { uint8_t calc_md5_mac[16]; uint8_t com; uint8_t flags; - uint8_t *outhdr = outbuf + NBT_HDR_SIZE; - size_t len = smb_len_nbt(outbuf); if (si->mac_key.length == 0) { if (!si->negotiated) { @@ -279,13 +278,12 @@ void smb_signing_sign_pdu(struct smb_signing_state *si, } bool smb_signing_check_pdu(struct smb_signing_state *si, - const uint8_t *inbuf, uint32_t seqnum) + const uint8_t *inhdr, size_t len, + uint32_t seqnum) { bool good; uint8_t calc_md5_mac[16]; const uint8_t *reply_sent_mac; - const uint8_t *inhdr = inbuf + NBT_HDR_SIZE; - size_t len = smb_len_nbt(inbuf); if (si->mac_key.length == 0) { return true; |