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

Seems to be incorrect (several user reports).
Jeremy.

diff --git a/source/libsmb/smb_signing.c b/source/libsmb/smb_signing.c
index df69ff3e41f3e14be925cbe4262f44a7a9e4cb54..500ff7cc6e2113e7d43e97a0f432132044711d3a 100644 (file)
--- a/source/libsmb/smb_signing.c
+++ b/source/libsmb/smb_signing.c
@@ -277,14 +277,17 @@ static void simple_packet_signature(struct smb_basic_signing_context *data,
        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@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);