Add testing for updated cipher IV

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15041)

9 files changed, 220 insertions, 1 deletions

diff --git a/test/evp_test.c b/test/evp_test.c
index 7bfe97f4ae..79ca676c87 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -504,6 +504,7 @@ typedef struct cipher_data_st {
     size_t key_len;
     size_t key_bits; /* Used by RC2 */
     unsigned char *iv;
+    unsigned char *next_iv; /* Expected IV state after operation */
     unsigned int rounds;
     size_t iv_len;
     unsigned char *plaintext;
@@ -564,6 +565,7 @@ static void cipher_test_cleanup(EVP_TEST *t)
 
     OPENSSL_free(cdat->key);
     OPENSSL_free(cdat->iv);
+    OPENSSL_free(cdat->next_iv);
     OPENSSL_free(cdat->ciphertext);
     OPENSSL_free(cdat->plaintext);
     for (i = 0; i < AAD_NUM; i++)
@@ -589,6 +591,8 @@ static int cipher_test_parse(EVP_TEST *t, const char *keyword,
     }
     if (strcmp(keyword, "IV") == 0)
         return parse_bin(value, &cdat->iv, &cdat->iv_len);
+    if (strcmp(keyword, "NextIV") == 0)
+        return parse_bin(value, &cdat->next_iv, &cdat->iv_len);
     if (strcmp(keyword, "Plaintext") == 0)
         return parse_bin(value, &cdat->plaintext, &cdat->plaintext_len);
     if (strcmp(keyword, "Ciphertext") == 0)
@@ -885,6 +889,19 @@ static int cipher_test_enc(EVP_TEST *t, int enc,
                                 rtag, expected->tag_len))
             goto err;
     }
+    /* Check the updated IV */
+    if (expected->next_iv != NULL) {
+        /* Some (e.g., GCM) tests use IVs longer than EVP_MAX_IV_LENGTH. */
+        unsigned char iv[128];
+        if (!TEST_true(EVP_CIPHER_CTX_get_updated_iv(ctx, iv, sizeof(iv)))
+                || ((EVP_CIPHER_flags(expected->cipher) & EVP_CIPH_CUSTOM_IV) == 0
+                    && !TEST_mem_eq(expected->next_iv, expected->iv_len, iv,
+                                    expected->iv_len))) {
+            t->err = "INVALID_NEXT_IV";
+            goto err;
+        }
+    }
+
     t->err = NULL;
     ok = 1;
  err:
diff --git a/test/recipes/30-test_evp_data/evpciph_aes_common.txt b/test/recipes/30-test_evp_data/evpciph_aes_common.txt
index e2d88b1335..c0ed605646 100644
--- a/test/recipes/30-test_evp_data/evpciph_aes_common.txt
+++ b/test/recipes/30-test_evp_data/evpciph_aes_common.txt
@@ -148,24 +148,28 @@ Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 000102030405060708090A0B0C0D0E0F
 Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = 7649ABAC8119B246CEE98E9B12E9197D
+NextIV = 7649abac8119b246cee98e9b12e9197d
 
 Cipher = AES-128-CBC
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 7649ABAC8119B246CEE98E9B12E9197D
 Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = 5086CB9B507219EE95DB113A917678B2
+NextIV = 5086cb9b507219ee95db113a917678b2
 
 Cipher = AES-128-CBC
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 5086CB9B507219EE95DB113A917678B2
 Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 73BED6B8E3C1743B7116E69E22229516
+NextIV = 73bed6b8e3c1743b7116e69e22229516
 
 Cipher = AES-128-CBC
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 73BED6B8E3C1743B7116E69E22229516
 Plaintext = F69F2445DF4F9B17AD2B417BE66C3710
 Ciphertext = 3FF1CAA1681FAC09120ECA307586E1A7
+NextIV = 3ff1caa1681fac09120eca307586e1a7
 
 # CBC-AES192.Encrypt and CBC-AES192.Decrypt
 Cipher = AES-192-CBC
@@ -173,24 +177,28 @@ Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = 000102030405060708090A0B0C0D0E0F
 Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = 4F021DB243BC633D7178183A9FA071E8
+NextIV = 4f021db243bc633d7178183a9fa071e8
 
 Cipher = AES-192-CBC
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = 4F021DB243BC633D7178183A9FA071E8
 Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = B4D9ADA9AD7DEDF4E5E738763F69145A
+NextIV = b4d9ada9ad7dedf4e5e738763f69145a
 
 Cipher = AES-192-CBC
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = B4D9ADA9AD7DEDF4E5E738763F69145A
 Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 571B242012FB7AE07FA9BAAC3DF102E0
+NextIV = 571b242012fb7ae07fa9baac3df102e0
 
 Cipher = AES-192-CBC
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = 571B242012FB7AE07FA9BAAC3DF102E0
 Plaintext = F69F2445DF4F9B17AD2B417BE66C3710
 Ciphertext = 08B0E27988598881D920A9E64F5615CD
+NextIV = 08b0e27988598881d920a9e64f5615cd
 
 # CBC-AES256.Encrypt and CBC-AES256.Decrypt
 Cipher = AES-256-CBC
@@ -198,24 +206,28 @@ Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = 000102030405060708090A0B0C0D0E0F
 Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = F58C4C04D6E5F1BA779EABFB5F7BFBD6
+NextIV = f58c4c04d6e5f1ba779eabfb5f7bfbd6
 
 Cipher = AES-256-CBC
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = F58C4C04D6E5F1BA779EABFB5F7BFBD6
 Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = 9CFC4E967EDB808D679F777BC6702C7D
+NextIV = 9cfc4e967edb808d679f777bc6702c7d
 
 Cipher = AES-256-CBC
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = 9CFC4E967EDB808D679F777BC6702C7D
 Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 39F23369A9D9BACFA530E26304231461
+NextIV = 39f23369a9d9bacfa530e26304231461
 
 Cipher = AES-256-CBC
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = 39F23369A9D9BACFA530E26304231461
 Plaintext = F69F2445DF4F9B17AD2B417BE66C3710
 Ciphertext = B2EB05E2C39BE9FCDA6C19078C6A9D1B
+NextIV = b2eb05e2c39be9fcda6c19078c6a9d1b
 
 # We don't support CFB{1,8}-AESxxx.{En,De}crypt
 # For all CFB128 encrypts and decrypts, the transformed sequence is
@@ -227,6 +239,7 @@ IV = 000102030405060708090A0B0C0D0E0F
 Operation = ENCRYPT
 Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A
+NextIV = 3b3fd92eb72dad20333449f8e83cfb4a
 
 Cipher = AES-128-CFB
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
@@ -234,6 +247,7 @@ IV = 3B3FD92EB72DAD20333449F8E83CFB4A
 Operation = ENCRYPT
 Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = C8A64537A0B3A93FCDE3CDAD9F1CE58B
+NextIV = c8a64537a0b3a93fcde3cdad9f1ce58b
 
 Cipher = AES-128-CFB
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
@@ -241,6 +255,7 @@ IV = C8A64537A0B3A93FCDE3CDAD9F1CE58B
 Operation = ENCRYPT
 Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 26751F67A3CBB140B1808CF187A4F4DF
+NextIV = 26751f67a3cbb140b1808cf187a4f4df
 
 Cipher = AES-128-CFB
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
@@ -248,6 +263,7 @@ IV = 26751F67A3CBB140B1808CF187A4F4DF
 Operation = ENCRYPT
 Plaintext = F69F2445DF4F9B17AD2B417BE66C3710
 Ciphertext = C04B05357C5D1C0EEAC4C66F9FF7F2E6
+NextIV = c04b05357c5d1c0eeac4c66f9ff7f2e6
 
 # CFB128-AES128.Decrypt
 Cipher = AES-128-CFB
@@ -256,6 +272,7 @@ IV = 000102030405060708090A0B0C0D0E0F
 Operation = DECRYPT
 Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A
+NextIV = 3b3fd92eb72dad20333449f8e83cfb4a
 
 Cipher = AES-128-CFB
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
@@ -263,6 +280,7 @@ IV = 3B3FD92EB72DAD20333449F8E83CFB4A
 Operation = DECRYPT
 Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = C8A64537A0B3A93FCDE3CDAD9F1CE58B
+NextIV = c8a64537a0b3a93fcde3cdad9f1ce58b
 
 Cipher = AES-128-CFB
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
@@ -270,6 +288,7 @@ IV = C8A64537A0B3A93FCDE3CDAD9F1CE58B
 Operation = DECRYPT
 Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 26751F67A3CBB140B1808CF187A4F4DF
+NextIV = 26751f67a3cbb140b1808cf187a4f4df
 
 Cipher = AES-128-CFB
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
@@ -277,6 +296,7 @@ IV = 26751F67A3CBB140B1808CF187A4F4DF
 Operation = DECRYPT
 Plaintext = F69F2445DF4F9B17AD2B417BE66C3710
 Ciphertext = C04B05357C5D1C0EEAC4C66F9FF7F2E6
+NextIV = c04b05357c5d1c0eeac4c66f9ff7f2e6
 
 # CFB128-AES192.Encrypt
 Cipher = AES-192-CFB
@@ -285,6 +305,7 @@ IV = 000102030405060708090A0B0C0D0E0F
 Operation = ENCRYPT
 Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174
+NextIV = cdc80d6fddf18cab34c25909c99a4174
 
 Cipher = AES-192-CFB
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
@@ -292,6 +313,7 @@ IV = CDC80D6FDDF18CAB34C25909C99A4174
 Operation = ENCRYPT
 Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = 67CE7F7F81173621961A2B70171D3D7A
+NextIV = 67ce7f7f81173621961a2b70171d3d7a
 
 Cipher = AES-192-CFB
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
@@ -299,6 +321,7 @@ IV = 67CE7F7F81173621961A2B70171D3D7A
 Operation = ENCRYPT
 Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9
+NextIV = 2e1e8a1dd59b88b1c8e60fed1efac4c9
 
 Cipher = AES-192-CFB
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
@@ -306,6 +329,7 @@ IV = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9
 Operation = ENCRYPT
 Plaintext = F69F2445DF4F9B17AD2B417BE66C3710
 Ciphertext = C05F9F9CA9834FA042AE8FBA584B09FF
+NextIV = c05f9f9ca9834fa042ae8fba584b09ff
 
 # CFB128-AES192.Decrypt
 Cipher = AES-192-CFB
@@ -314,6 +338,7 @@ IV = 000102030405060708090A0B0C0D0E0F
 Operation = DECRYPT
 Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174
+NextIV = cdc80d6fddf18cab34c25909c99a4174
 
 Cipher = AES-192-CFB
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
@@ -321,6 +346,7 @@ IV = CDC80D6FDDF18CAB34C25909C99A4174
 Operation = DECRYPT
 Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = 67CE7F7F81173621961A2B70171D3D7A
+NextIV = 67ce7f7f81173621961a2b70171d3d7a
 
 Cipher = AES-192-CFB
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
@@ -328,6 +354,7 @@ IV = 67CE7F7F81173621961A2B70171D3D7A
 Operation = DECRYPT
 Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9
+NextIV = 2e1e8a1dd59b88b1c8e60fed1efac4c9
 
 Cipher = AES-192-CFB
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
@@ -335,6 +362,7 @@ IV = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9
 Operation = DECRYPT
 Plaintext = F69F2445DF4F9B17AD2B417BE66C3710
 Ciphertext = C05F9F9CA9834FA042AE8FBA584B09FF
+NextIV = c05f9f9ca9834fa042ae8fba584b09ff
 
 # CFB128-AES256.Encrypt
 Cipher = AES-256-CFB
@@ -343,6 +371,7 @@ IV = 000102030405060708090A0B0C0D0E0F
 Operation = ENCRYPT
 Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = DC7E84BFDA79164B7ECD8486985D3860
+NextIV = dc7e84bfda79164b7ecd8486985d3860
 
 Cipher = AES-256-CFB
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
@@ -350,6 +379,7 @@ IV = DC7E84BFDA79164B7ECD8486985D3860
 Operation = ENCRYPT
 Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = 39FFED143B28B1C832113C6331E5407B
+NextIV = 39ffed143b28b1c832113c6331e5407b
 
 Cipher = AES-256-CFB
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
@@ -357,6 +387,7 @@ IV = 39FFED143B28B1C832113C6331E5407B
 Operation = ENCRYPT
 Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = DF10132415E54B92A13ED0A8267AE2F9
+NextIV = df10132415e54b92a13ed0a8267ae2f9
 
 Cipher = AES-256-CFB
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
@@ -364,6 +395,7 @@ IV = DF10132415E54B92A13ED0A8267AE2F9
 Operation = ENCRYPT
 Plaintext = F69F2445DF4F9B17AD2B417BE66C3710
 Ciphertext = 75A385741AB9CEF82031623D55B1E471
+NextIV = 75a385741ab9cef82031623d55b1e471
 
 # CFB128-AES256.Decrypt
 Cipher = AES-256-CFB
@@ -372,6 +404,7 @@ IV = 000102030405060708090A0B0C0D0E0F
 Operation = DECRYPT
 Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = DC7E84BFDA79164B7ECD8486985D3860
+NextIV = dc7e84bfda79164b7ecd8486985d3860
 
 Cipher = AES-256-CFB
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
@@ -379,6 +412,7 @@ IV = DC7E84BFDA79164B7ECD8486985D3860
 Operation = DECRYPT
 Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = 39FFED143B28B1C832113C6331E5407B
+NextIV = 39ffed143b28b1c832113c6331e5407b
 
 Cipher = AES-256-CFB
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
@@ -386,6 +420,7 @@ IV = 39FFED143B28B1C832113C6331E5407B
 Operation = DECRYPT
 Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = DF10132415E54B92A13ED0A8267AE2F9
+NextIV = df10132415e54b92a13ed0a8267ae2f9
 
 Cipher = AES-256-CFB
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
@@ -393,6 +428,7 @@ IV = DF10132415E54B92A13ED0A8267AE2F9
 Operation = DECRYPT
 Plaintext = F69F2445DF4F9B17AD2B417BE66C3710
 Ciphertext = 75A385741AB9CEF82031623D55B1E471
+NextIV = 75a385741ab9cef82031623d55b1e471
 
 # For all OFB encrypts and decrypts, the transformed sequence is
 #   AES-bits-CFB:key:IV/output':plaintext:ciphertext:encdec
@@ -402,24 +438,28 @@ Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 000102030405060708090A0B0C0D0E0F
 Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A
+NextIV = 50fe67cc996d32b6da0937e99bafec60
 
 Cipher = AES-128-OFB
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 50FE67CC996D32B6DA0937E99BAFEC60
 Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = 7789508D16918F03F53C52DAC54ED825
+NextIV = d9a4dada0892239f6b8b3d7680e15674
 
 Cipher = AES-128-OFB
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = D9A4DADA0892239F6B8B3D7680E15674
 Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 9740051E9C5FECF64344F7A82260EDCC
+NextIV = a78819583f0308e7a6bf36b1386abf23
 
 Cipher = AES-128-OFB
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = A78819583F0308E7A6BF36B1386ABF23
 Plaintext = F69F2445DF4F9B17AD2B417BE66C3710
 Ciphertext = 304C6528F659C77866A510D9C1D6AE5E
+NextIV = c6d3416d29165c6fcb8e51a227ba994e
 
 # OFB-AES192
 Cipher = AES-192-OFB
@@ -427,24 +467,28 @@ Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = 000102030405060708090A0B0C0D0E0F
 Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174
+NextIV = a609b38df3b1133dddff2718ba09565e
 
 Cipher = AES-192-OFB
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = A609B38DF3B1133DDDFF2718BA09565E
 Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = FCC28B8D4C63837C09E81700C1100401
+NextIV = 52ef01da52602fe0975f78ac84bf8a50
 
 Cipher = AES-192-OFB
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = 52EF01DA52602FE0975F78AC84BF8A50
 Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 8D9A9AEAC0F6596F559C6D4DAF59A5F2
+NextIV = bd5286ac63aabd7eb067ac54b553f71d
 
 Cipher = AES-192-OFB
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = BD5286AC63AABD7EB067AC54B553F71D
 Plaintext = F69F2445DF4F9B17AD2B417BE66C3710
 Ciphertext = 6D9F200857CA6C3E9CAC524BD9ACC92A
+NextIV = 9b00044d8885f729318713303fc0fe3a
 
 # OFB-AES256
 Cipher = AES-256-OFB
@@ -452,24 +496,28 @@ Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = 000102030405060708090A0B0C0D0E0F
 Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = DC7E84BFDA79164B7ECD8486985D3860
+NextIV = b7bf3a5df43989dd97f0fa97ebce2f4a
 
 Cipher = AES-256-OFB
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = B7BF3A5DF43989DD97F0FA97EBCE2F4A
 Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = 4FEBDC6740D20B3AC88F6AD82A4FB08D
+NextIV = e1c656305ed1a7a6563805746fe03edc
 
 Cipher = AES-256-OFB
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = E1C656305ED1A7A6563805746FE03EDC
 Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 71AB47A086E86EEDF39D1C5BBA97C408
+NextIV = 41635be625b48afc1666dd42a09d96e7
 
 Cipher = AES-256-OFB
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = 41635BE625B48AFC1666DD42A09D96E7
 Plaintext = F69F2445DF4F9B17AD2B417BE66C3710
 Ciphertext = 0126141D67F37BE8538F5A8BE740E484
+NextIV = f7b93058b8bce0fffea41bf0012cd394
 
 Title = AES Counter test vectors from RFC3686
 
@@ -479,6 +527,7 @@ IV = 00000030000000000000000000000001
 Operation = ENCRYPT
 Plaintext = 53696E676C6520626C6F636B206D7367
 Ciphertext = E4095D4FB7A7B3792D6175A3261311B8
+NextIV = 00000030000000000000000000000002
 
 Cipher = aes-128-ctr
 Key = 7E24067817FAE0D743D6CE1F32539163
@@ -486,6 +535,7 @@ IV = 006CB6DBC0543B59DA48D90B00000001
 Operation = ENCRYPT
 Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F
 Ciphertext = 5104A106168A72D9790D41EE8EDAD388EB2E1EFC46DA57C8FCE630DF9141BE28
+NextIV = 006cb6dbc0543b59da48d90b00000003
 
 Cipher = aes-128-ctr
 Key = 7691BE035E5020A8AC6E618529F9A0DC
@@ -493,6 +543,7 @@ IV = 00E0017B27777F3F4A1786F000000001
 Operation = ENCRYPT
 Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223
 Ciphertext = C1CF48A89F2FFDD9CF4652E9EFDB72D74540A42BDE6D7836D59A5CEAAEF3105325B2072F
+NextIV = 00e0017b27777f3f4a1786f000000004
 
 Cipher = aes-192-ctr
 Key = 16AF5B145FC9F579C175F93E3BFB0EED863D06CCFDB78515
@@ -500,6 +551,7 @@ IV = 0000004836733C147D6D93CB00000001
 Operation = ENCRYPT
 Plaintext = 53696E676C6520626C6F636B206D7367
 Ciphertext = 4B55384FE259C9C84E7935A003CBE928
+NextIV = 0000004836733c147d6d93cb00000002
 
 Cipher = aes-192-ctr
 Key = 7C5CB2401B3DC33C19E7340819E0F69C678C3DB8E6F6A91A
@@ -507,6 +559,7 @@ IV = 0096B03B020C6EADC2CB500D00000001
 Operation = ENCRYPT
 Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F
 Ciphertext = 453243FC609B23327EDFAAFA7131CD9F8490701C5AD4A79CFC1FE0FF42F4FB00
+NextIV = 0096b03b020c6eadc2cb500d00000003
 
 Cipher = aes-192-ctr
 Key = 02BF391EE8ECB159B959617B0965279BF59B60A786D3E0FE
@@ -514,6 +567,7 @@ IV = 0007BDFD5CBD60278DCC091200000001
 Operation = ENCRYPT
 Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223
 Ciphertext = 96893FC55E5C722F540B7DD1DDF7E758D288BC95C69165884536C811662F2188ABEE0935
+NextIV = 0007bdfd5cbd60278dcc091200000004
 
 Cipher = aes-256-ctr
 Key = 776BEFF2851DB06F4C8A0542C8696F6C6A81AF1EEC96B4D37FC1D689E6C1C104
@@ -521,6 +575,7 @@ IV = 00000060DB5672C97AA8F0B200000001
 Operation = ENCRYPT
 Plaintext = 53696E676C6520626C6F636B206D7367
 Ciphertext = 145AD01DBF824EC7560863DC71E3E0C0
+NextIV = 00000060db5672c97aa8f0b200000002
 
 Cipher = aes-256-ctr
 Key = F6D66D6BD52D59BB0796365879EFF886C66DD51A5B6A99744B50590C87A23884
@@ -528,6 +583,7 @@ IV = 00FAAC24C1585EF15A43D87500000001
 Operation = ENCRYPT
 Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F
 Ciphertext = F05E231B3894612C49EE000B804EB2A9B8306B508F839D6A5530831D9344AF1C
+NextIV = 00faac24c1585ef15a43d87500000003
 
 Cipher = aes-256-ctr
 Key = FF7A617CE69148E4F1726E2F43581DE2AA62D9F805532EDFF1EED687FB54153D
@@ -535,6 +591,7 @@ IV = 001CC5B751A51D70A1C1114800000001
 Operation = ENCRYPT
 Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223
 Ciphertext = EB6C52821D0BBBF7CE7594462ACA4FAAB407DF866569FD07F48CC0B583D6071F1EC0E6B8
+NextIV = 001cc5b751a51d70a1c1114800000004
 
 # Self-generated vector to trigger false carry on big-endian platforms
 Cipher = aes-128-ctr
@@ -543,6 +600,7 @@ IV = 00000000000000007FFFFFFFFFFFFFFF
 Operation = ENCRYPT
 Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F
 Ciphertext = A2D459477E6432BD74184B1B5370D2243CDC202BC43583B2A55D288CDBBD1E03
+NextIV = 00000000000000008000000000000001
 
 # AES CCM 256 bit key
 Cipher = aes-256-ccm
@@ -590,6 +648,7 @@ AAD =
 Tag = ab6e47d42cec13bdf53a67b21257bddf
 Plaintext = 00000000000000000000000000000000
 Ciphertext = 0388dace60b6a392f328c2b971b2fe78
+NextIV = 000000000000000000000000
 
 Cipher = aes-128-gcm
 Key = feffe9928665731c6d6a8f9467308308
@@ -598,6 +657,7 @@ AAD =
 Tag = 4d5c2af327cd64a62cf35abd2ba6fab4
 Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255
 Ciphertext = 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f5985
+NextIV = cafebabefacedbaddecaf888
 
 Cipher = aes-128-gcm
 Key = feffe9928665731c6d6a8f9467308308
@@ -606,6 +666,7 @@ AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2
 Tag = 5bc94fbc3221a5db94fae95ae7121a47
 Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
 Ciphertext = 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091
+NextIV = cafebabefacedbaddecaf888
 
 Cipher = aes-128-gcm
 Key = feffe9928665731c6d6a8f9467308308
@@ -648,6 +709,7 @@ AAD =
 Tag = 2ff58d80033927ab8ef4d4587514f0fb
 Plaintext = 00000000000000000000000000000000
 Ciphertext = 98e7247c07f0fe411c267e4384b0f600
+NextIV = 000000000000000000000000
 
 Cipher = aes-192-gcm
 Key = feffe9928665731c6d6a8f9467308308feffe9928665731c
@@ -656,6 +718,7 @@ AAD =
 Tag = 9924a7c8587336bfb118024db8674a14
 Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255
 Ciphertext = 3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710acade256
+NextIV = cafebabefacedbaddecaf888
 
 Cipher = aes-192-gcm
 Key = feffe9928665731c6d6a8f9467308308feffe9928665731c
@@ -664,6 +727,7 @@ AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2
 Tag = 2519498e80f1478f37ba55bd6d27618c
 Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
 Ciphertext = 3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710
+NextIV = cafebabefacedbaddecaf888
 
 Cipher = aes-192-gcm
 Key = feffe9928665731c6d6a8f9467308308feffe9928665731c
@@ -706,6 +770,7 @@ AAD =
 Tag = d0d1c8a799996bf0265b98b5d48ab919
 Plaintext = 00000000000000000000000000000000
 Ciphertext = cea7403d4d606b6e074ec5d3baf39d18
+NextIV = 000000000000000000000000
 
 Cipher = aes-256-gcm
 Key = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308
@@ -714,6 +779,7 @@ AAD =
 Tag = b094dac5d93471bdec1a502270e3cc6c
 Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255
 Ciphertext = 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad
+NextIV = cafebabefacedbaddecaf888
 
 Cipher = aes-256-gcm
 Key = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308
@@ -722,6 +788,7 @@ AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2
 Tag = 76fc6ece0f4e1768cddf8853bb2d551b
 Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
 Ciphertext = 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662
+NextIV = cafebabefacedbaddecaf888
 
 Cipher = aes-256-gcm
 Key = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308
@@ -767,6 +834,7 @@ AAD =
 Tag = 9dd0a376b08e40eb00c35f29f9ea61a4
 Plaintext = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 Ciphertext = 0388dace60b6a392f328c2b971b2fe78f795aaab494b5923f7fd89ff948bc1e0200211214e7394da2089b6acd093abe0
+NextIV = 000000000000000000000000
 
 # 80 bytes plaintext
 Cipher = aes-128-gcm
@@ -776,6 +844,7 @@ AAD =
 Tag = 98885a3a22bd4742fe7b72172193b163
 Plaintext = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 Ciphertext = 0388dace60b6a392f328c2b971b2fe78f795aaab494b5923f7fd89ff948bc1e0200211214e7394da2089b6acd093abe0c94da219118e297d7b7ebcbcc9c388f28ade7d85a8ee35616f7124a9d5270291
+NextIV = 000000000000000000000000
 
 # 128 bytes plaintext
 Cipher = aes-128-gcm
@@ -785,6 +854,7 @@ AAD =
 Tag = cac45f60e31efd3b5a43b98a22ce1aa1
 Plaintext = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 Ciphertext = 0388dace60b6a392f328c2b971b2fe78f795aaab494b5923f7fd89ff948bc1e0200211214e7394da2089b6acd093abe0c94da219118e297d7b7ebcbcc9c388f28ade7d85a8ee35616f7124a9d527029195b84d1b96c690ff2f2de30bf2ec89e00253786e126504f0dab90c48a30321de3345e6b0461e7c9e6c6b7afedde83f40
+NextIV = 000000000000000000000000
 
 # 192 bytes plaintext, iv is chosen so that initial counter LSB is 0xFF
 Cipher = aes-128-gcm
@@ -821,6 +891,7 @@ AAD = 00000000000000000000000000000000101112131415161718191a1b1c1d1e1f
 Tag = 3b629ccfbc1119b7319e1dce2cd6fd6d
 Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f
 Ciphertext = 6268c6fa2a80b2d137467f092f657ac04d89be2beaa623d61b5a868c8f03ff95d3dcee23ad2f1ab3a6c80eaf4b140eb05de3457f0fbc111a6b43d0763aa422a3013cf1dc37fe417d1fbfc449b75d4cc5
+NextIV = dbcca32ebf9b804617c3aa9e
 
 Title = AES XTS test vectors from IEEE Std 1619-2007
 
@@ -1097,6 +1168,7 @@ Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 73BED6B8E3C1743B7116E69E22229516
 Plaintext = F69F2445DF4F9B17AD2B417BE66C3710
 Ciphertext = 3FF1CAA1681FAC09120ECA307586E1A7
+NextIV = 3ff1caa1681fac09120eca307586e1a7
 
 Cipher = aES-128-CTR
 Key = AE6852F8121067CC4BF7A5765577F39E
@@ -1104,6 +1176,7 @@ IV = 00000030000000000000000000000001
 Operation = ENCRYPT
 Plaintext = 53696E676C6520626C6F636B206D7367
 Ciphertext = E4095D4FB7A7B3792D6175A3261311B8
+NextIV = 00000030000000000000000000000002
 
 Cipher = AES-128-GcM
 Key = 00000000000000000000000000000000
@@ -1112,4 +1185,5 @@ AAD =
 Tag = ab6e47d42cec13bdf53a67b21257bddf
 Plaintext = 00000000000000000000000000000000
 Ciphertext = 0388dace60b6a392f328c2b971b2fe78
+NextIV = 000000000000000000000000
 
diff --git a/test/recipes/30-test_evp_data/evpciph_aria.txt b/test/recipes/30-test_evp_data/evpciph_aria.txt
index be1698d822..503351e12e 100644
--- a/test/recipes/30-test_evp_data/evpciph_aria.txt
+++ b/test/recipes/30-test_evp_data/evpciph_aria.txt
@@ -39,12 +39,14 @@ Key = 00112233445566778899aabbccddeeff
 IV = 0f1e2d3c4b5a69788796a5b4c3d2e1f0
 Plaintext = 11111111aaaaaaaa11111111bbbbbbbb11111111cccccccc11111111dddddddd22222222aaaaaaaa22222222bbbbbbbb22222222cccccccc22222222dddddddd33333333aaaaaaaa33333333bbbbbbbb33333333cccccccc33333333dddddddd44444444aaaaaaaa44444444bbbbbbbb44444444cccccccc44444444dddddddd55555555aaaaaaaa55555555bbbbbbbb55555555cccccccc55555555dddddddd
 Ciphertext = 49d61860b14909109cef0d22a9268134fadf9fb23151e9645fba75018bdb1538b53334634bbf7d4cd4b5377033060c155fe3948ca75de1031e1d85619e0ad61eb419a866b3c2dbfd10a4ed18b22149f75897f0b8668b0c1c542c687778835fb7cd46e45f85eaa7072437dd9fa6793d6f8d4ccefc4eb1ac641ac1bd30b18c6d64c49bca137eb21c2e04da62712ca2b4f540c57112c38791852cfac7a5d19ed83a
+NextIV = 40c57112c38791852cfac7a5d19ed83a
 
 Cipher = ARIA-128-CFB
 Key = 00112233445566778899aabbccddeeff
 IV = 0f1e2d3c4b5a69788796a5b4c3d2e1f0
 Plaintext = 11111111aaaaaaaa11111111bbbbbbbb11111111cccccccc11111111dddddddd22222222aaaaaaaa22222222bbbbbbbb22222222cccccccc22222222dddddddd33333333aaaaaaaa33333333bbbbbbbb33333333cccccccc33333333dddddddd44444444aaaaaaaa44444444bbbbbbbb44444444cccccccc44444444dddddddd55555555aaaaaaaa55555555bbbbbbbb55555555cccccccc55555555dddddddd
 Ciphertext = 3720e53ba7d615383406b09f0a05a200c07c21e6370f413a5d132500a68285017c61b434c7b7ca9685a51071861e4d4bb873b599b479e2d573dddeafba89f812ac6a9e44d554078eb3be94839db4b33da3f59c063123a7ef6f20e10579fa4fd239100ca73b52d4fcafeadee73f139f78f9b7614c2b3b9dbe010f87db06a89a9435f79ce8121431371f4e87b984e0230c22a6dacb32fc42dcc6accef33285bf11
+NextIV = 22a6dacb32fc42dcc6accef33285bf11
 
 Cipher = ARIA-128-CFB8
 Key = 00112233445566778899aabbccddeeff
@@ -57,12 +59,14 @@ Key = 00112233445566778899aabbccddeeff
 IV = 0f1e2d3c4b5a69788796a5b4c3d2e1f0
 Plaintext = 11111111aaaaaaaa11111111bbbbbbbb11111111cccccccc11111111dddddddd22222222aaaaaaaa22222222bbbbbbbb22222222cccccccc22222222dddddddd33333333aaaaaaaa33333333bbbbbbbb33333333cccccccc33333333dddddddd44444444aaaaaaaa44444444bbbbbbbb44444444cccccccc44444444dddddddd55555555aaaaaaaa55555555bbbbbbbb55555555cccccccc55555555dddddddd
 Ciphertext = 3720e53ba7d615383406b09f0a05a2000063063f0560083483faeb041c8adecef30cf80cefb002a0d280759168ec01db3d49f61aced260bd43eec0a2731730eec6fa4f2304319cf8ccac2d7be7833e4f8ae6ce967012c1c6badc5d28e7e4144f6bf5cebe01253ee202afce4bc61f28dec069a6f16f6c8a7dd2afae44148f6ff4d0029d5c607b5fa6b8c8a6301cde5c7033565cd0b8f0974ab490b236197ba04a
+NextIV = 66030985743c5b86e1c5e763c4a67d97
 
 Cipher = ARIA-128-CTR
 Key = 00112233445566778899aabbccddeeff
 IV = 00000000000000000000000000000000
 Plaintext = 11111111aaaaaaaa11111111bbbbbbbb11111111cccccccc11111111dddddddd22222222aaaaaaaa22222222bbbbbbbb22222222cccccccc22222222dddddddd33333333aaaaaaaa33333333bbbbbbbb33333333cccccccc33333333dddddddd44444444aaaaaaaa44444444bbbbbbbb44444444cccccccc44444444dddddddd55555555aaaaaaaa55555555bbbbbbbb55555555cccccccc55555555dddddddd
 Ciphertext = ac5d7de805a0bf1c57c854501af60fa11497e2a34519dea1569e91e5b5ccae2ff3bfa1bf975f4571f48be191613546c3911163c085f871f0e7ae5f2a085b81851c2a3ddf20ecb8fa51901aec8ee4ba32a35dab67bb72cd9140ad188a967ac0fbbdfa94ea6cce47dcf8525ab5a814cfeb2bb60ee2b126e2d9d847c1a9e96f9019e3e6a7fe40d3829afb73db1cc245646addb62d9b907baaafbe46a73dbc131d3d
+NextIV = 0000000000000000000000000000000a
 
 Cipher = ARIA-192-ECB
 Key = 00112233445566778899aabbccddeeff0011223344556677
@@ -74,12 +78,14 @@ Key = 00112233445566778899aabbccddeeff0011223344556677
 IV = 0f1e2d3c4b5a69788796a5b4c3d2e1f0
 Plaintext = 11111111aaaaaaaa11111111bbbbbbbb11111111cccccccc11111111dddddddd22222222aaaaaaaa22222222bbbbbbbb22222222cccccccc22222222dddddddd33333333aaaaaaaa33333333bbbbbbbb33333333cccccccc33333333dddddddd44444444aaaaaaaa44444444bbbbbbbb44444444cccccccc44444444dddddddd55555555aaaaaaaa55555555bbbbbbbb55555555cccccccc55555555dddddddd
 Ciphertext = afe6cf23974b533c672a826264ea785f4e4f7f780dc7f3f1e0962b80902386d514e9c3e77259de92dd1102ffab086c1ea52a71260db5920a83295c25320e421147ca45d532f327b856ea947cd2196ae2e040826548b4c891b0ed0ca6e714dbc4631998d548110d666b3d54c2a091955c6f05beb4f62309368696c9791fc4c551564a2637f194346ec45fbca6c72a5b4612e208d531d6c34cc5c64eac6bd0cf8c
+NextIV = 12e208d531d6c34cc5c64eac6bd0cf8c
 
 Cipher = ARIA-192-CFB
 Key = 00112233445566778899aabbccddeeff0011223344556677
 IV = 0f1e2d3c4b5a69788796a5b4c3d2e1f0
 Plaintext = 11111111aaaaaaaa11111111bbbbbbbb11111111cccccccc11111111dddddddd22222222aaaaaaaa22222222bbbbbbbb22222222cccccccc22222222dddddddd33333333aaaaaaaa33333333bbbbbbbb33333333cccccccc33333333dddddddd44444444aaaaaaaa44444444bbbbbbbb44444444cccccccc44444444dddddddd55555555aaaaaaaa55555555bbbbbbbb55555555cccccccc55555555dddddddd
 Ciphertext = 4171f7192bf4495494d2736129640f5c4d87a9a213664c9448477c6ecc2013598d9766952dd8c3868f17e36ef66fd84bfa45d1593d2d6ee3ea2115047d710d4fb66187caa3a315b3c8ea2d313962edcfe5a3e2028d5ba9a09fd5c65c19d3440e477f0cab0628ec6902c73ee02f1afee9f80115be7b9df82d1e28228e28581a20560e195cbb9e2b327bf56fd2d0ae5502e42c13e9b4015d4da42dc859252e7da4
+NextIV = e42c13e9b4015d4da42dc859252e7da4
 
 Cipher = ARIA-192-CFB8
 Key = 00112233445566778899aabbccddeeff0011223344556677
@@ -92,12 +98,14 @@ Key = 00112233445566778899aabbccddeeff0011223344556677
 IV = 0f1e2d3c4b5a69788796a5b4c3d2e1f0
 Plaintext = 11111111aaaaaaaa11111111bbbbbbbb11111111cccccccc11111111dddddddd22222222aaaaaaaa22222222bbbbbbbb22222222cccccccc22222222dddddddd33333333aaaaaaaa33333333bbbbbbbb33333333cccccccc33333333dddddddd44444444aaaaaaaa44444444bbbbbbbb44444444cccccccc44444444dddddddd55555555aaaaaaaa55555555bbbbbbbb55555555cccccccc55555555dddddddd
 Ciphertext = 4171f7192bf4495494d2736129640f5cc224d26d364b5a06ddde13d0f1e74faa846de354c63cda77469d1a2d425c47ff41734c71b3fa1fcdc11e0b2de22bfeed54898e233df652c75ae136e61de6524e62b3f806fb2e8e616eb410a1b9500537e327ffb04f19f7f82fde2b122100261f81b82723bf936be7beaaf3067d1c036001f1ade71422268d274d7dc6c6ae1970b27a5f2c2f39c1d241fe8cac5ccd74e9
+NextIV = e72f0a79e3f50d1e14abd9f98110a934
 
 Cipher = ARIA-192-CTR
 Key = 00112233445566778899aabbccddeeff0011223344556677
 IV = 00000000000000000000000000000000
 Plaintext = 11111111aaaaaaaa11111111bbbbbbbb11111111cccccccc11111111dddddddd22222222aaaaaaaa22222222bbbbbbbb22222222cccccccc22222222dddddddd33333333aaaaaaaa33333333bbbbbbbb33333333cccccccc33333333dddddddd44444444aaaaaaaa44444444bbbbbbbb44444444cccccccc44444444dddddddd55555555aaaaaaaa55555555bbbbbbbb55555555cccccccc55555555dddddddd
 Ciphertext = 08625ca8fe569c19ba7af3760a6ed1cef4d199263e999dde14082dbba7560b79a4c6b456b8707dce751f9854f18893dfdb3f4e5afa539733e6f1e70b98ba37891f8f81e95df8efc26c7ce043504cb18958b865e4e316cd2aa1c97f31bf23dc046ef326b95a692a191ba0f2a41c5fe9ae070f236ff7078e703b42666caafbdd20bad74ac4c20c0f46c7ca24c151716575c947da16c90cfe1bf217a41cfebe7531
+NextIV = 0000000000000000000000000000000a
 
 Cipher = ARIA-256-ECB
 Key = 00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff
@@ -109,12 +117,14 @@ Key = 00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff
 IV = 0f1e2d3c4b5a69788796a5b4c3d2e1f0
 Plaintext = 11111111aaaaaaaa11111111bbbbbbbb11111111cccccccc11111111dddddddd22222222aaaaaaaa22222222bbbbbbbb22222222cccccccc22222222dddddddd33333333aaaaaaaa33333333bbbbbbbb33333333cccccccc33333333dddddddd44444444aaaaaaaa44444444bbbbbbbb44444444cccccccc44444444dddddddd55555555aaaaaaaa55555555bbbbbbbb55555555cccccccc55555555dddddddd
 Ciphertext = 523a8a806ae621f155fdd28dbc34e1ab7b9b42432ad8b2efb96e23b13f0a6e52f36185d50ad002c5f601bee5493f118b243ee2e313642bffc3902e7b2efd9a12fa682edd2d23c8b9c5f043c18b17c1ec4b5867918270fbec1027c19ed6af833da5d620994668ca22f599791d292dd6273b2959082aafb7a996167cce1eec5f0cfd15f610d87e2dda9ba68ce1260ca54b222491418374294e7909b1e8551cd8de
+NextIV = 222491418374294e7909b1e8551cd8de
 
 Cipher = ARIA-256-CFB
 Key = 00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff
 IV = 0f1e2d3c4b5a69788796a5b4c3d2e1f0
 Plaintext = 11111111aaaaaaaa11111111bbbbbbbb11111111cccccccc11111111dddddddd22222222aaaaaaaa22222222bbbbbbbb22222222cccccccc22222222dddddddd33333333aaaaaaaa33333333bbbbbbbb33333333cccccccc33333333dddddddd44444444aaaaaaaa44444444bbbbbbbb44444444cccccccc44444444dddddddd55555555aaaaaaaa55555555bbbbbbbb55555555cccccccc55555555dddddddd
 Ciphertext = 26834705b0f2c0e2588d4a7f09009635f28bb93d8c31f870ec1e0bdb082b66fa402dd9c202be300c4517d196b14d4ce11dce97f7aaba54341b0d872cc9b63753a3e8556a14be6f7b3e27e3cfc39caf80f2a355aa50dc83c09c7b11828694f8e4aa726c528976b53f2c877f4991a3a8d28adb63bd751846ffb2350265e179d4990753ae8485ff9b4133ddad5875b84a90cbcfa62a045d726df71b6bda0eeca0be
+NextIV = cbcfa62a045d726df71b6bda0eeca0be
 
 Cipher = ARIA-256-CFB8
 Key = 00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff
@@ -127,12 +137,14 @@ Key = 00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff
 IV = 0f1e2d3c4b5a69788796a5b4c3d2e1f0
 Plaintext = 11111111aaaaaaaa11111111bbbbbbbb11111111cccccccc11111111dddddddd22222222aaaaaaaa22222222bbbbbbbb22222222cccccccc22222222dddddddd33333333aaaaaaaa33333333bbbbbbbb33333333cccccccc33333333dddddddd44444444aaaaaaaa44444444bbbbbbbb44444444cccccccc44444444dddddddd55555555aaaaaaaa55555555bbbbbbbb55555555cccccccc55555555dddddddd
 Ciphertext = 26834705b0f2c0e2588d4a7f0900963584c256815c4292b59f8d3f966a75b52345b4f5f98c785d3f368a8d5ff89b7f950ceab3cd63773c2621d652b8ef98b4196afb2c2b30496bc5b7d9e7f9084f9d855f63a511751c8909e7a6deadbe0a67a4fb89383ca5d209c6f66f793fc471195c476fb9c1eab2ac91e680e454b4f3ed9a67fb52f09c29b965b23cfa6f3f6bbb2a86c6cdbaa2857bf2486f543231892a52
+NextIV = d39398ef6e49b73e1d3a0167ec54f78f
 
 Cipher = ARIA-256-CTR
 Key = 00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff
 IV = 00000000000000000000000000000000
 Plaintext = 11111111aaaaaaaa11111111bbbbbbbb11111111cccccccc11111111dddddddd22222222aaaaaaaa22222222bbbbbbbb22222222cccccccc22222222dddddddd33333333aaaaaaaa33333333bbbbbbbb33333333cccccccc33333333dddddddd44444444aaaaaaaa44444444bbbbbbbb44444444cccccccc44444444dddddddd55555555aaaaaaaa55555555bbbbbbbb55555555cccccccc55555555dddddddd
 Ciphertext = 30026c329666141721178b99c0a1f1b2f06940253f7b3089e2a30ea86aa3c88f5940f05ad7ee41d71347bb7261e348f18360473fdf7d4e7723bffb4411cc13f6cdd89f3bc7b9c768145022c7a74f14d7c305cd012a10f16050c23f1ae5c23f45998d13fbaa041e51619577e0772764896a5d4516d8ffceb3bf7e05f613edd9a60cdcedaff9cfcaf4e00d445a54334f73ab2cad944e51d266548e61c6eb0aa1cd
+NextIV = 0000000000000000000000000000000a
 
 Title = ARIA GCM test vectors from RFC8269
 
diff --git a/test/recipes/30-test_evp_data/evpciph_camellia.txt b/test/recipes/30-test_evp_data/evpciph_camellia.txt
index 3a48fd778e..361d07e638 100644
--- a/test/recipes/30-test_evp_data/evpciph_camellia.txt
+++ b/test/recipes/30-test_evp_data/evpciph_camellia.txt
@@ -124,24 +124,28 @@ Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 000102030405060708090A0B0C0D0E0F
 Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = 1607CF494B36BBF00DAEB0B503C831AB
+NextIV = 1607cf494b36bbf00daeb0b503c831ab
 
 Cipher = CAMELLIA-128-CBC
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 1607CF494B36BBF00DAEB0B503C831AB