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

Jacob Trimble committed 8 years ago

Commit 9f07cf71 parent 9b1ec244 files · +16 −2Browse files

Unified · Split

4 files

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

     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)
 {
     return a->counter;

 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);
+/**
+ * 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)
  */

@@ -45,7 +45,7 @@ int main (void) · 44 unmodified lines
45		45
46	av_aes_ctr_set_random_iv(ae);	46	av_aes_ctr_set_random_iv(ae);
47	iv = av_aes_ctr_get_iv(ae);	47	iv = av_aes_ctr_get_iv(ae);
48	av_aes_ctr_set_iv(ad, iv);	48	av_aes_ctr_set_full_iv(ad, iv);
49		49
50	av_aes_ctr_crypt(ae, tmp, plain, sizeof(tmp));	50	av_aes_ctr_crypt(ae, tmp, plain, sizeof(tmp));
51	av_aes_ctr_crypt(ad, tmp, tmp, sizeof(tmp));	51	av_aes_ctr_crypt(ad, tmp, tmp, sizeof(tmp));

Keyboard shortcuts