Context |
Check |
Description |
andriy/commit_msg_armv7_RPi4 |
warning
|
The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ".
|
yinshiyou/commit_msg_loongarch64 |
warning
|
The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ".
|
andriy/commit_msg_x86 |
warning
|
The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ".
|
yinshiyou/make_loongarch64 |
success
|
Make finished
|
yinshiyou/make_fate_loongarch64 |
success
|
Make fate finished
|
andriy/make_x86 |
success
|
Make finished
|
andriy/make_fate_x86 |
success
|
Make fate finished
|
andriy/make_armv7_RPi4 |
success
|
Make finished
|
andriy/make_fate_armv7_RPi4 |
success
|
Make fate finished
|
@@ -6819,9 +6819,6 @@ static int cenc_scheme_decrypt(MOVContext *c, MOVStreamContext *sc, AVEncryption
{
int i, ret;
int bytes_of_protected_data;
- int partially_encrypted_block_size;
- uint8_t *partially_encrypted_block;
- uint8_t block[16];
if (!sc->cenc.aes_ctr) {
/* initialize the cipher */
@@ -6844,8 +6841,6 @@ static int cenc_scheme_decrypt(MOVContext *c, MOVStreamContext *sc, AVEncryption
return 0;
}
- partially_encrypted_block_size = 0;
-
for (i = 0; i < sample->subsample_count; i++) {
if (sample->subsamples[i].bytes_of_clear_data + sample->subsamples[i].bytes_of_protected_data > size) {
av_log(c->fc, AV_LOG_ERROR, "subsample size exceeds the packet size left\n");
@@ -6858,28 +6853,8 @@ static int cenc_scheme_decrypt(MOVContext *c, MOVStreamContext *sc, AVEncryption
/* decrypt the encrypted bytes */
- if (partially_encrypted_block_size) {
- memcpy(block, partially_encrypted_block, partially_encrypted_block_size);
- memcpy(block+partially_encrypted_block_size, input, 16-partially_encrypted_block_size);
- av_aes_ctr_crypt(sc->cenc.aes_ctr, block, block, 16);
- memcpy(partially_encrypted_block, block, partially_encrypted_block_size);
- memcpy(input, block+partially_encrypted_block_size, 16-partially_encrypted_block_size);
- input += 16-partially_encrypted_block_size;
- size -= 16-partially_encrypted_block_size;
- bytes_of_protected_data = sample->subsamples[i].bytes_of_protected_data - (16-partially_encrypted_block_size);
- } else {
- bytes_of_protected_data = sample->subsamples[i].bytes_of_protected_data;
- }
-
- if (i < sample->subsample_count-1) {
- int num_of_encrypted_blocks = bytes_of_protected_data/16;
- partially_encrypted_block_size = bytes_of_protected_data%16;
- if (partially_encrypted_block_size)
- partially_encrypted_block = input + 16*num_of_encrypted_blocks;
- av_aes_ctr_crypt(sc->cenc.aes_ctr, input, input, 16*num_of_encrypted_blocks);
- } else {
- av_aes_ctr_crypt(sc->cenc.aes_ctr, input, input, bytes_of_protected_data);
- }
+ bytes_of_protected_data = sample->subsamples[i].bytes_of_protected_data;
+ av_aes_ctr_crypt(sc->cenc.aes_ctr, input, input, bytes_of_protected_data);
input += bytes_of_protected_data;
size -= bytes_of_protected_data;
Fixes ticket #9807. Signed-off-by: ShuangxiLi <lishuangxi@huawei.com> --- libavformat/mov.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-)