d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto/qat: fix reallocate OpenSSL version check

Browse Source 
Move the ossl_legacy_provider_unload() into the right place for secure
protocol for QAT. Remove unnecessary unload from session destroy.

Fixes: 52d59b92b0 ("crypto/qat: enable OpenSSL legacy provider in session")
Cc: stable@dpdk.org

Signed-off-by: Brian Dooley <brian.dooley@intel.com>
Acked-by: Kai Ji <kai.ji@intel.com>
This commit is contained in:
Brian Dooley 2022-11-02 09:54:08 +00:00 committed by Akhil Goyal
parent 48024cf1f1
commit 3625d12ed6
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/crypto/qat/qat_sym_session.c
View File

@ -520,19 +520,7 @@ qat_sym_session_configure(struct rte_cryptodev *dev,
int ret;
#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
OSSL_PROVIDER * legacy;
OSSL_PROVIDER *deflt;
/* Load Multiple providers into the default (NULL) library context */
legacy = OSSL_PROVIDER_load(NULL, "legacy");
if (legacy == NULL)
return -EINVAL;
deflt = OSSL_PROVIDER_load(NULL, "default");
if (deflt == NULL) {
OSSL_PROVIDER_unload(legacy);
return -EINVAL;
}
ossl_legacy_provider_load();
#endif
ret = qat_sym_session_set_parameters(dev, xform,
CRYPTODEV_GET_SYM_SESS_PRIV(sess),
@ -545,8 +533,7 @@ qat_sym_session_configure(struct rte_cryptodev *dev,
}
# if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
OSSL_PROVIDER_unload(legacy);
OSSL_PROVIDER_unload(deflt);
ossl_legacy_provider_unload();
# endif
return 0;
}
@ -2639,7 +2626,8 @@ qat_sec_session_set_docsis_parameters(struct rte_cryptodev *dev,
return ret;
qat_sym_session_finalize(session);
return qat_sym_gen_dev_ops[qat_dev_gen].set_session((void *)cdev, session);
return qat_sym_gen_dev_ops[qat_dev_gen].set_session((void *)cdev,
(void *)session);
}
int
@ -2668,6 +2656,9 @@ qat_security_session_create(void *dev,
return ret;
}
#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
ossl_legacy_provider_unload();
#endif
return 0;
}
@ -2684,9 +2675,6 @@ qat_security_session_destroy(void *dev __rte_unused,
memset(s, 0, qat_sym_session_get_private_size(dev));
}
# if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
ossl_legacy_provider_unload();
# endif
return 0;
}