[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  bb38a79 s3: Fix bug #8674.
      from  6b72809 Third part of fix for bug #8673 - NT ACL issue.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit bb38a79656b6ddee01327c328435043a7d0a112b
Author: Jeremy Allison <jra at samba.org>
Date:   Sat Jan 21 21:16:19 2012 +0100

    s3: Fix bug #8674.
    
    Buffer overflow issue with AES encryption in samba traffic analyzer.

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_smb_traffic_analyzer.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index 07264be..5c91e3c 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;	
 }


-- 
Samba Shared Repository