svn commit: samba r5803 - in trunk/source/libsmb: .

[jra at samba.org]

Author: jra
Date: 2005-03-15 18:21:29 +0000 (Tue, 15 Mar 2005)
New Revision: 5803

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5803

Log:
Revert the signing change by Nalin Dahyabhai <nalin at redhat.com>.
Seems to be incorrect (several user reports).
Jeremy.

Modified:
   trunk/source/libsmb/smb_signing.c


Changeset:
Modified: trunk/source/libsmb/smb_signing.c
===================================================================
--- trunk/source/libsmb/smb_signing.c	2005-03-15 17:26:21 UTC (rev 5802)
+++ trunk/source/libsmb/smb_signing.c	2005-03-15 18:21:29 UTC (rev 5803)
@@ -277,14 +277,17 @@
 	MD5Init(&md5_ctx);
 
 	/* 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
 		zero-pads the key to 128 bits if it isn't long enough.
 		From Nalin Dahyabhai <nalin at redhat.com> */
-	MD5Update(&md5_ctx, data->mac_key.data, data->mac_key.length); 
 	if (data->mac_key.length < sizeof(key_buf)) {
 		memset(key_buf, 0, sizeof(key_buf));
 		MD5Update(&md5_ctx, key_buf, sizeof(key_buf) - data->mac_key.length);
 	}
+#endif
 
 	/* copy in the first bit of the SMB header */
 	MD5Update(&md5_ctx, buf + 4, smb_ss_field - 4);