Remove cleanup from hkdf_derive

Change-Id: I6f199b6e3da12be35dc6480d687f8b66ef86f417 Signed-off-by: Steve Linsell <stevenx.linsell@intel.com>
intel · Feb 25, 2020 · 50d294a · 50d294a
1 parent ab4d113
commit 50d294a
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/qat_hkdf.c b/qat_hkdf.c
@@ -562,9 +562,8 @@ static int qat_hkdf_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *olen)
         goto err;
     }
 
-    generated_key =
-        (CpaFlatBuffer *) qaeCryptoMemAlloc(sizeof(CpaFlatBuffer), __FILE__,
-                                            __LINE__);
+    generated_key = (CpaFlatBuffer *) OPENSSL_zalloc(sizeof(CpaFlatBuffer));
+
     if (NULL == generated_key) {
         WARN("Failed to allocate memory for generated_key\n");
         QATerr(QAT_F_QAT_HKDF_DERIVE, ERR_R_MALLOC_FAILURE);
@@ -752,18 +751,12 @@ static int qat_hkdf_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *olen)
  err:
     /* Clean the memory  */
     if (NULL != qat_hkdf_ctx->hkdf_op_data) {
-        OPENSSL_cleanse(qat_hkdf_ctx->hkdf_op_data->seed,
-                        qat_hkdf_ctx->hkdf_op_data->seedLen);
-        OPENSSL_cleanse(qat_hkdf_ctx->hkdf_op_data->secret,
-                        qat_hkdf_ctx->hkdf_op_data->secretLen);
-        OPENSSL_cleanse(qat_hkdf_ctx->hkdf_op_data->info,
-                        qat_hkdf_ctx->hkdf_op_data->infoLen);
         if (NULL != generated_key) {
             if (NULL != generated_key->pData) {
                 OPENSSL_cleanse(generated_key->pData, key_length);
                 qaeCryptoMemFree(generated_key->pData);
             }
-            qaeCryptoMemFree(generated_key);
+            OPENSSL_free(generated_key);
         }
     }