diff options
| author | Jeremy Allison <jra@samba.org> | 2012-01-21 21:16:19 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-01-23 21:30:43 +0100 |
| commit | 9bea09193bf86b73bccc9c8b0bde6a19d1ac59be (patch) | |
| tree | d1d6898b0475a54c247cdd17e776fa637feda538 | |
| parent | 5effeb2fa6a4f293a1c45b80496b30d76539be80 (diff) | |
| download | samba-9bea09193bf86b73bccc9c8b0bde6a19d1ac59be.tar.gz | |
s3: Fix bug #8674.
Buffer overflow issue with AES encryption in samba traffic analyzer.
(cherry picked from commit bb38a79656b6ddee01327c328435043a7d0a112b)
| -rw-r--r-- | source3/modules/vfs_smb_traffic_analyzer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c index 07264be0aa9..5c91e3cf4da 100644 --- a/source3/modules/vfs_smb_traffic_analyzer.c +++ b/source3/modules/vfs_smb_traffic_analyzer.c @@ -186,8 +186,7 @@ static char *smb_traffic_analyzer_encrypt( TALLOC_CTX *ctx, samba_AES_encrypt((unsigned char *) str+(16*h), crypted, &key); for (d = 0; d<16; d++) output[d+(16*h)]=crypted[d]; } - samba_AES_encrypt( (unsigned char *) str+(16*h), filler, &key ); - for (d = 0;d < 16; d++) output[d+(16*h)]=*(filler+d); + samba_AES_encrypt(filler, (unsigned char *)(output+(16*h)), &key); *len = (s1*16)+16; return output; } |