From 4c05b1f8d641f3e25532aad955ed586ad614c114 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 17 Jul 2014 22:27:50 +0100 Subject: Make *Final work for key wrap again. Reviewed-by: Tim Hudson (cherry picked from commit 58f4698f67c33b723a9e99bed1101161a59eea73) --- crypto/evp/e_aes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crypto/evp') diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index d20cecaaad..ae1fd0a2ed 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -2075,6 +2075,8 @@ static int aes_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, { EVP_AES_WRAP_CTX *wctx = ctx->cipher_data; size_t rv; + if (!in) + return 0; if (inlen % 8) return -1; if (ctx->encrypt && inlen < 8) @@ -2088,8 +2090,6 @@ static int aes_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, else return inlen - 8; } - if (!in) - return 0; if (ctx->encrypt) rv = CRYPTO_128_wrap(&wctx->ks.ks, wctx->iv, out, in, inlen, (block128_f)AES_encrypt); -- cgit v1.2.3