From: Damjan Marion <damarion@cisco.com>
Date: Wed, 20 Mar 2019 15:28:51 +0000 (+0100)
Subject: crypto_openssl: call EVP_EncryptFinal_ex only if needed
X-Git-Tag: v19.04-rc1~174
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F18439%2F2;p=vpp.git

crypto_openssl: call EVP_EncryptFinal_ex only if needed

Change-Id: I4dc6749a67c0726bae20b8204a5171676308b909
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/src/plugins/crypto_openssl/main.c b/src/plugins/crypto_openssl/main.c
index b4679ee8915..09d726749e1 100644
--- a/src/plugins/crypto_openssl/main.c
+++ b/src/plugins/crypto_openssl/main.c
@@ -69,7 +69,8 @@ openssl_ops_enc_cbc (vlib_main_t * vm, vnet_crypto_op_t * ops[], u32 n_ops,
 
       EVP_EncryptInit_ex (ctx, cipher, NULL, op->key, op->iv);
       EVP_EncryptUpdate (ctx, op->dst, &out_len, op->src, op->len);
-      EVP_EncryptFinal_ex (ctx, op->dst + out_len, &out_len);
+      if (out_len < op->len)
+	EVP_EncryptFinal_ex (ctx, op->dst + out_len, &out_len);
       op->status = VNET_CRYPTO_OP_STATUS_COMPLETED;
     }
   return n_ops;
@@ -90,7 +91,8 @@ openssl_ops_dec_cbc (vlib_main_t * vm, vnet_crypto_op_t * ops[], u32 n_ops,
 
       EVP_DecryptInit_ex (ctx, cipher, NULL, op->key, op->iv);
       EVP_DecryptUpdate (ctx, op->dst, &out_len, op->src, op->len);
-      EVP_DecryptFinal_ex (ctx, op->dst + out_len, &out_len);
+      if (out_len < op->len)
+	EVP_DecryptFinal_ex (ctx, op->dst + out_len, &out_len);
       op->status = VNET_CRYPTO_OP_STATUS_COMPLETED;
     }
   return n_ops;