From: Richard Levitte <levitte@openssl.org>
Date: Mon, 8 Jul 2019 18:36:29 +0000 (+0200)
Subject: test/evp_test.c: [ciphers] Test that we get back the same IV we gave
X-Git-Tag: openssl-3.0.0-alpha1~1806
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=48ebde226d4bd66556f25d0c4b3679478890974d;p=oweals%2Fopenssl.git

test/evp_test.c: [ciphers] Test that we get back the same IV we gave

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9328)
---

diff --git a/test/evp_test.c b/test/evp_test.c
index 0489bbe093..f76929d539 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -661,6 +661,14 @@ static int cipher_test_enc(EVP_TEST *t, int enc,
         t->err = "KEY_SET_ERROR";
         goto err;
     }
+    /* Check that we get the same IV back */
+    if (expected->iv != NULL
+        && (EVP_CIPHER_flags(expected->cipher) & EVP_CIPH_CUSTOM_IV) == 0
+        && !TEST_mem_eq(expected->iv, expected->iv_len,
+                        EVP_CIPHER_CTX_iv(ctx), expected->iv_len)) {
+        t->err = "INVALID_IV";
+        goto err;
+    }
 
     if (expected->aead == EVP_CIPH_CCM_MODE) {
         if (!EVP_CipherUpdate(ctx, NULL, &tmplen, NULL, out_len)) {