r7970: This SMB signing code (merged from 3.0) turned out to be bogus.

Andrew Bartlett
(This used to be commit 817160ec1a85724c8bf482f128ea687396de0888)

diff --git a/source4/libcli/raw/smb_signing.c b/source4/libcli/raw/smb_signing.c
index 4204f3b4dc455de69fa0c200524b128db30d3e69..14dfc6473750bde5a6d6f7cae87728b060dd9948 100644 (file)
--- a/source4/libcli/raw/smb_signing.c
+++ b/source4/libcli/raw/smb_signing.c
@@ -118,15 +118,7 @@ void sign_outgoing_message(struct request_buffer *out, DATA_BLOB *mac_key, uint_
 
        /* Calculate the 16 byte MAC and place first 8 bytes into the field. */
        MD5Init(&md5_ctx);
-
-       /* 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, mac_key->data, mac_key->length);
-        if (mac_key->length < sizeof(key_buf)) {
-                memset(key_buf, 0, sizeof(key_buf));
-                MD5Update(&md5_ctx, key_buf, sizeof(key_buf) - mac_key->length);
-        }
        MD5Update(&md5_ctx, 
                  out->buffer + NBT_HDR_SIZE, 
                  out->size - NBT_HDR_SIZE);