From: Zhushuai Yin <yinzhushuai@huawei.com> fix variable spelling errors in the code that affect readability, as well as incorrect return values. Signed-off-by: Zhushuai Yin <yinzhushuai@huawei.com> --- src/uadk_ec.c | 2 +- src/uadk_prov_dh.c | 11 +++-------- src/uadk_prov_ec_kmgmt.c | 1 - src/uadk_prov_ecdh_exch.c | 8 ++++---- src/uadk_prov_ecdsa.c | 1 - 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/uadk_ec.c b/src/uadk_ec.c index bd82036..eac59b5 100644 --- a/src/uadk_ec.c +++ b/src/uadk_ec.c @@ -292,7 +292,7 @@ static int ecdsa_do_sign_check(EC_KEY *eckey, int ret; if (!dgst) { - fprintf(stderr, "eckey or dgst NULL\n"); + fprintf(stderr, "dgst NULL\n"); return -1; } diff --git a/src/uadk_prov_dh.c b/src/uadk_prov_dh.c index a7a6bf1..4cbfa71 100644 --- a/src/uadk_prov_dh.c +++ b/src/uadk_prov_dh.c @@ -64,16 +64,16 @@ static pthread_mutex_t dh_default_mutex = PTHREAD_MUTEX_INITIALIZER; static UADK_PKEY_KEYEXCH get_default_dh_keyexch(void) { static UADK_PKEY_KEYEXCH s_keyexch; - static int initilazed; + static int initialized; pthread_mutex_lock(&dh_default_mutex); - if (!initilazed) { + if (!initialized) { UADK_PKEY_KEYEXCH *keyexch = (UADK_PKEY_KEYEXCH *)EVP_KEYEXCH_fetch(NULL, "dh", "provider=default"); if (keyexch) { s_keyexch = *keyexch; EVP_KEYEXCH_free((EVP_KEYEXCH *)keyexch); - initilazed = 1; + initialized = 1; } else { fprintf(stderr, "failed to EVP_KEYEXCH_fetch default dh provider\n"); } @@ -1430,11 +1430,6 @@ static void uadk_keyexch_dh_freectx(void *dhctx) pdhctx->kdf_ukm = NULL; } - if (pdhctx->kdf_cekalg) { - OPENSSL_free(pdhctx->kdf_cekalg); - pdhctx->kdf_cekalg = NULL; - } - OPENSSL_free(pdhctx); } diff --git a/src/uadk_prov_ec_kmgmt.c b/src/uadk_prov_ec_kmgmt.c index 988be8b..2c6fcff 100644 --- a/src/uadk_prov_ec_kmgmt.c +++ b/src/uadk_prov_ec_kmgmt.c @@ -18,7 +18,6 @@ #include <openssl/err.h> #include <openssl/evp.h> -#include <openssl/err.h> #include <openssl/bn.h> #include <uadk/wd_ecc.h> #include "uadk_async.h" diff --git a/src/uadk_prov_ecdh_exch.c b/src/uadk_prov_ecdh_exch.c index 9bd7559..323e22f 100644 --- a/src/uadk_prov_ecdh_exch.c +++ b/src/uadk_prov_ecdh_exch.c @@ -76,16 +76,16 @@ static pthread_mutex_t ecdh_mutex = PTHREAD_MUTEX_INITIALIZER; static UADK_PKEY_KEYEXCH get_default_ecdh_keyexch(void) { static UADK_PKEY_KEYEXCH s_keyexch; - static int initilazed; + static int initialized; pthread_mutex_lock(&ecdh_mutex); - if (!initilazed) { + if (!initialized) { UADK_PKEY_KEYEXCH *keyexch = (UADK_PKEY_KEYEXCH *)EVP_KEYEXCH_fetch(NULL, "ecdh", "provider=default"); if (keyexch) { s_keyexch = *keyexch; EVP_KEYEXCH_free((EVP_KEYEXCH *)keyexch); - initilazed = 1; + initialized = 1; } else { fprintf(stderr, "failed to EVP_KEYEXCH_fetch default X448 provider\n"); } @@ -468,7 +468,7 @@ static int uadk_keyexch_ecdh_derive(void *vpecdhctx, unsigned char *secret, size_t *psecretlen, size_t outlen) { struct ecdh_ctx *pecdhctx = vpecdhctx; - int ret; + int ret = UADK_P_FAIL; if (!pecdhctx) { fprintf(stderr, "invalid: vpecdhctx is NULL to derive!\n"); diff --git a/src/uadk_prov_ecdsa.c b/src/uadk_prov_ecdsa.c index 300c940..912fe90 100644 --- a/src/uadk_prov_ecdsa.c +++ b/src/uadk_prov_ecdsa.c @@ -18,7 +18,6 @@ #include <openssl/err.h> #include <openssl/evp.h> -#include <openssl/err.h> #include <openssl/kdf.h> #include "uadk_async.h" #include "uadk_prov.h" -- 2.43.0