diff options
| author | Jeremy Allison <jra@samba.org> | 2004-10-27 17:40:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:04 -0500 |
| commit | e798a6b9fee3874ea7bb2589e1ecc66b3c012353 (patch) | |
| tree | aaf073fcfb9b3da49bce04f4a6289aa6fc0a7482 /source3 | |
| parent | e53aa4700fdcc966d9b2de0f0d82495b7b69cbfc (diff) | |
| download | samba-e798a6b9fee3874ea7bb2589e1ecc66b3c012353.tar.gz samba-e798a6b9fee3874ea7bb2589e1ecc66b3c012353.tar.bz2 samba-e798a6b9fee3874ea7bb2589e1ecc66b3c012353.zip | |
r3294: Fix for SMB signing with 56-bit DES session keys. From Nalin Dahyabhai <nalin@redhat.com>.
Jeremy.
(This used to be commit 55d23cb253d869e58bd51cf179c6dc0f3cfab9d2)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libsmb/smb_signing.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source3/libsmb/smb_signing.c b/source3/libsmb/smb_signing.c index 39131debf5..b02a13c73e 100644 --- a/source3/libsmb/smb_signing.c +++ b/source3/libsmb/smb_signing.c @@ -255,6 +255,7 @@ static void simple_packet_signature(struct smb_basic_signing_context *data, const size_t offset_end_of_sig = (smb_ss_field + 8); unsigned char sequence_buf[8]; struct MD5Context md5_ctx; + unsigned char key_buf[16]; /* * Firstly put the sequence number into the first 4 bytes. @@ -276,8 +277,14 @@ 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); + /* 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); + } /* copy in the first bit of the SMB header */ MD5Update(&md5_ctx, buf + 4, smb_ss_field - 4); |