[lng-odp] [PATCH 10/23] linux-generic: crypto: remote extra memcpy in AES-GCM

[Dmitry Eremin-Solenikov]

There is no need to memcpy IV if it gets passed to EVP functions.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>
---
 platform/linux-generic/odp_crypto.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/platform/linux-generic/odp_crypto.c 
b/platform/linux-generic/odp_crypto.c
index 5f4f5250df14..efbc958de0c8 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -275,7 +275,6 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t 
*param,
        uint32_t plain_len   = param->cipher_range.length;
        const uint8_t *aad_head = param->aad.ptr;
        uint32_t aad_len = param->aad.length;
-       unsigned char iv_enc[AES_BLOCK_SIZE];
        void *iv_ptr;
        uint8_t *tag = data + param->hash_result_offset;
 
@@ -286,13 +285,6 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t 
*param,
        else
                return ODP_CRYPTO_ALG_ERR_IV_INVALID;
 
-       /*
-        * Create a copy of the IV.  The DES library modifies IV
-        * and if we are processing packets on parallel threads
-        * we could get corruption.
-        */
-       memcpy(iv_enc, iv_ptr, AES_BLOCK_SIZE);
-
        /* Adjust pointer for beginning of area to cipher/auth */
        uint8_t *plaindata = data + param->cipher_range.offset;
 
@@ -300,7 +292,7 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t 
*param,
        EVP_CIPHER_CTX *ctx = session->cipher.data.aes_gcm.ctx;
        int cipher_len = 0;
 
-       EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_enc);
+       EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
 
        /* Authenticate header data (if any) without encrypting them */
        if (aad_len > 0)
@@ -325,7 +317,6 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t 
*param,
        uint32_t cipher_len   = param->cipher_range.length;
        const uint8_t *aad_head = param->aad.ptr;
        uint32_t aad_len = param->aad.length;
-       unsigned char iv_enc[AES_BLOCK_SIZE];
        void *iv_ptr;
        uint8_t *tag   = data + param->hash_result_offset;
 
@@ -336,20 +327,13 @@ odp_crypto_alg_err_t 
aes_gcm_decrypt(odp_crypto_op_param_t *param,
        else
                return ODP_CRYPTO_ALG_ERR_IV_INVALID;
 
-       /*
-        * Create a copy of the IV.  The DES library modifies IV
-        * and if we are processing packets on parallel threads
-        * we could get corruption.
-        */
-       memcpy(iv_enc, iv_ptr, AES_BLOCK_SIZE);
-
        /* Adjust pointer for beginning of area to cipher/auth */
        uint8_t *cipherdata = data + param->cipher_range.offset;
        /* Encrypt it */
        EVP_CIPHER_CTX *ctx = session->cipher.data.aes_gcm.ctx;
        int plain_len = 0;
 
-       EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_enc);
+       EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
 
        EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG,
                            session->p.auth_digest_len, tag);
-- 
2.11.0