generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

asfcrypt: fix unaligned read in ff_asfcrypt_dec()

Browse Source 
Originally committed as revision 24886 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2010-08-23 15:38:57 +00:00
parent 573af7545e
commit e955bf3b42
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/asfcrypt.c
View File

@@ -156,7 +156,7 @@ void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len) {
av_rc4_crypt(&rc4, (uint8_t *)rc4buff, NULL, sizeof(rc4buff), NULL, 1); av_rc4_crypt(&rc4, (uint8_t *)rc4buff, NULL, sizeof(rc4buff), NULL, 1);
multiswap_init((uint8_t *)rc4buff, ms_keys); multiswap_init((uint8_t *)rc4buff, ms_keys);
packetkey = qwords[num_qwords - 1]; packetkey = AV_RN64(&qwords[num_qwords - 1]);
packetkey ^= rc4buff[7]; packetkey ^= rc4buff[7];
av_des_init(&des, key + 12, 64, 1); av_des_init(&des, key + 12, 64, 1);
av_des_crypt(&des, (uint8_t *)&packetkey, (uint8_t *)&packetkey, 1, NULL, 1); av_des_crypt(&des, (uint8_t *)&packetkey, (uint8_t *)&packetkey, 1, NULL, 1);