highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/aes_ctr: Add method to set 16-byte IV.

Browse Source 
Signed-off-by: Jacob Trimble <modmaker@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Jacob Trimble
2018-01-08 14:12:43 -08:00
committed by Michael Niedermayer
parent 9b1ec24835
commit 9f07cf7c00
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -15,6 +15,9 @@ libavutil: 2017-10-21
API changes, most recent first: API changes, most recent first:
2018-xx-xx - xxxxxxx - lavu 56.9.100 - aes_ctr.h
Add method to set the 16-byte IV.
2018-01-xx - xxxxxxx - lavf 58.5.100 - avformat.h 2018-01-xx - xxxxxxx - lavf 58.5.100 - avformat.h
Explicitly make avformat_network_init() and avformat_network_deinit() optional. Explicitly make avformat_network_init() and avformat_network_deinit() optional.
If these are not called, network initialization and deinitialization is If these are not called, network initialization and deinitialization is

6
libavutil/aes_ctr.c
View File

@ -45,6 +45,12 @@ void av_aes_ctr_set_iv(struct AVAESCTR *a, const uint8_t* iv)
a->block_offset = 0; a->block_offset = 0;
} }
void av_aes_ctr_set_full_iv(struct AVAESCTR *a, const uint8_t* iv)
{
memcpy(a->counter, iv, sizeof(a->counter));
a->block_offset = 0;
}
const uint8_t* av_aes_ctr_get_iv(struct AVAESCTR *a) const uint8_t* av_aes_ctr_get_iv(struct AVAESCTR *a)
{ {
return a->counter; return a->counter;

7
libavutil/aes_ctr.h
View File

@ -67,10 +67,15 @@ const uint8_t* av_aes_ctr_get_iv(struct AVAESCTR *a);
void av_aes_ctr_set_random_iv(struct AVAESCTR *a); void av_aes_ctr_set_random_iv(struct AVAESCTR *a);
/** /**
* Forcefully change the iv * Forcefully change the 8-byte iv
*/ */
void av_aes_ctr_set_iv(struct AVAESCTR *a, const uint8_t* iv); void av_aes_ctr_set_iv(struct AVAESCTR *a, const uint8_t* iv);
/**
* Forcefully change the "full" 16-byte iv, including the counter
*/
void av_aes_ctr_set_full_iv(struct AVAESCTR *a, const uint8_t* iv);
/** /**
* Increment the top 64 bit of the iv (performed after each frame) * Increment the top 64 bit of the iv (performed after each frame)
*/ */

2
libavutil/tests/aes_ctr.c
View File

@ -45,7 +45,7 @@ int main (void)
av_aes_ctr_set_random_iv(ae); av_aes_ctr_set_random_iv(ae);
iv = av_aes_ctr_get_iv(ae); iv = av_aes_ctr_get_iv(ae);
av_aes_ctr_set_iv(ad, iv); av_aes_ctr_set_full_iv(ad, iv);
av_aes_ctr_crypt(ae, tmp, plain, sizeof(tmp)); av_aes_ctr_crypt(ae, tmp, plain, sizeof(tmp));
av_aes_ctr_crypt(ad, tmp, tmp, sizeof(tmp)); av_aes_ctr_crypt(ad, tmp, tmp, sizeof(tmp));