sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r5804: Revert the signing change by Nalin Dahyabhai <nalin@redhat.com>.

Browse Source 
Seems to be incorrect (several user reports).
Jeremy.
This commit is contained in:
Jeremy Allison 2005-03-15 18:21:35 +00:00 committed by Gerald (Jerry) Carter
parent 2e1f727184
commit 0abfb67c79
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/libsmb/smb_signing.c
View File

@ -277,14 +277,17 @@ static void simple_packet_signature(struct smb_basic_signing_context *data,
MD5Init(&md5_ctx); MD5Init(&md5_ctx);
/* intialise with the key */ /* intialise with the key */
MD5Update(&md5_ctx, data->mac_key.data, data->mac_key.length);
#if 0
/* JRA - apparently this is incorrect. */
/* NB. When making and verifying SMB signatures, Windows apparently /* NB. When making and verifying SMB signatures, Windows apparently
zero-pads the key to 128 bits if it isn't long enough. zero-pads the key to 128 bits if it isn't long enough.
From Nalin Dahyabhai <nalin@redhat.com> */ From Nalin Dahyabhai <nalin@redhat.com> */
MD5Update(&md5_ctx, data->mac_key.data, data->mac_key.length);
if (data->mac_key.length < sizeof(key_buf)) { if (data->mac_key.length < sizeof(key_buf)) {
memset(key_buf, 0, sizeof(key_buf)); memset(key_buf, 0, sizeof(key_buf));
MD5Update(&md5_ctx, key_buf, sizeof(key_buf) - data->mac_key.length); MD5Update(&md5_ctx, key_buf, sizeof(key_buf) - data->mac_key.length);
} }
#endif
/* copy in the first bit of the SMB header */ /* copy in the first bit of the SMB header */
MD5Update(&md5_ctx, buf + 4, smb_ss_field - 4); MD5Update(&md5_ctx, buf + 4, smb_ss_field - 4);