git.samba.org
/
ddiss
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6b72809
)
s3: Fix bug #8674.
author
Jeremy Allison
<jra@samba.org>
Sat, 21 Jan 2012 20:16:19 +0000
(21:16 +0100)
committer
Karolin Seeger
<kseeger@samba.org>
Sat, 21 Jan 2012 20:16:19 +0000
(21:16 +0100)
Buffer overflow issue with AES encryption in samba traffic analyzer.
source3/modules/vfs_smb_traffic_analyzer.c
patch
|
blob
|
history
diff --git
a/source3/modules/vfs_smb_traffic_analyzer.c
b/source3/modules/vfs_smb_traffic_analyzer.c
index 07264be0aa93913e841c8659ca25abe354aad3e3..5c91e3cf4dacc7164cc9c1de639a65c506d91263 100644
(file)
--- 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;
}