1 files changed, 11 insertions, 3 deletions

diff --git a/src/regress/lib/libcrypto/evp/evptest.c b/src/regress/lib/libcrypto/evp/evptest.c
index 1aa11d7b1e..ac15a55aaa 100644
--- a/src/regress/lib/libcrypto/evp/evptest.c
+++ b/src/regress/lib/libcrypto/evp/evptest.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: evptest.c,v 1.7 2018/07/17 17:06:49 tb Exp $  */
+/*      $OpenBSD: evptest.c,v 1.8 2019/03/17 18:33:01 tb Exp $  */
 /* Written by Ben Laurie, 2001 */
 /*
  * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
@@ -144,6 +144,7 @@ test1(const EVP_CIPHER *c, const unsigned char *key, int kn,
 {
         EVP_CIPHER_CTX ctx;
         unsigned char out[4096];
+        const unsigned char *eiv;
         int outl, outl2;
 
         printf("Testing cipher %s%s\n", EVP_CIPHER_name(c),
@@ -160,8 +161,12 @@ test1(const EVP_CIPHER *c, const unsigned char *key, int kn,
                 test1_exit(5);
         }
         EVP_CIPHER_CTX_init(&ctx);
+        EVP_CIPHER_CTX_set_flags(&ctx, EVP_CIPHER_CTX_FLAG_WRAP_ALLOW);
         if (encdec != 0) {
-                if (!EVP_EncryptInit_ex(&ctx, c,NULL, key, iv)) {
+                eiv = iv;
+                if (EVP_CIPHER_mode(c) == EVP_CIPH_WRAP_MODE && in == 0)
+                        eiv = NULL;
+                if (!EVP_EncryptInit_ex(&ctx, c, NULL, key, eiv)) {
                         fprintf(stderr, "EncryptInit failed\n");
                         ERR_print_errors_fp(stderr);
                         test1_exit(10);
@@ -194,7 +199,10 @@ test1(const EVP_CIPHER *c, const unsigned char *key, int kn,
         }
 
         if (encdec <= 0) {
-                if (!EVP_DecryptInit_ex(&ctx, c,NULL, key, iv)) {
+                eiv = iv;
+                if (EVP_CIPHER_mode(c) == EVP_CIPH_WRAP_MODE && in == 0)
+                        eiv = NULL;
+                if (!EVP_DecryptInit_ex(&ctx, c,NULL, key, eiv)) {
                         fprintf(stderr, "DecryptInit failed\n");
                         ERR_print_errors_fp(stderr);
                         test1_exit(11);