[Acc] [PATCH 04/10] uadk_engine/provider: remove the variable redundant initialization

From: Hao Fang <fanghao11@huawei.com> Delete the variable redundant initialization. Signed-off-by: Hao Fang <fanghao11@huawei.com> Signed-off-by: JiangShui Yang <yangjiangshui@h-partners.com> --- src/uadk_aead.c | 2 +- src/uadk_cipher.c | 8 ++++---- src/uadk_dh.c | 7 ++++--- src/uadk_ecx.c | 4 ++-- src/uadk_pkey.c | 7 ++++--- src/uadk_prov_bio.c | 2 +- src/uadk_prov_der_writer.c | 4 ++-- src/uadk_prov_dh.c | 18 +++++++++--------- src/uadk_prov_digest.c | 2 +- src/uadk_prov_ecdsa.c | 2 +- src/uadk_prov_ecx.c | 16 ++++++++-------- src/uadk_prov_ffc.c | 2 +- src/uadk_prov_hmac.c | 4 ++-- src/uadk_prov_rsa.c | 22 +++++++++++----------- src/uadk_prov_sm2.c | 14 +++++++------- src/uadk_rsa.c | 25 +++++++++++++------------ 16 files changed, 71 insertions(+), 68 deletions(-) diff --git a/src/uadk_aead.c b/src/uadk_aead.c index 8598800..0cb44c0 100644 --- a/src/uadk_aead.c +++ b/src/uadk_aead.c @@ -763,7 +763,7 @@ do {\ EVP_CIPHER *uadk_create_gcm_cipher_meth(int nid) { - EVP_CIPHER *aead = NULL; + EVP_CIPHER *aead; switch (nid) { case NID_aes_128_gcm: diff --git a/src/uadk_cipher.c b/src/uadk_cipher.c index 441bef2..b55f6ae 100644 --- a/src/uadk_cipher.c +++ b/src/uadk_cipher.c @@ -170,8 +170,8 @@ static int uadk_e_cipher_sw_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc) { /* Real implementation: Openssl soft arithmetic key initialization function */ - struct cipher_priv_ctx *priv = NULL; - const EVP_CIPHER *sw_cipher = NULL; + struct cipher_priv_ctx *priv; + const EVP_CIPHER *sw_cipher; int ret, nid, sw_size; if (unlikely(key == NULL)) { @@ -224,8 +224,8 @@ static int uadk_e_cipher_sw_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, static int uadk_e_cipher_soft_work(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) { - struct cipher_priv_ctx *priv = NULL; - const EVP_CIPHER *sw_cipher = NULL; + struct cipher_priv_ctx *priv; + const EVP_CIPHER *sw_cipher; unsigned char *iv; int ret, nid; diff --git a/src/uadk_dh.c b/src/uadk_dh.c index dfeeb90..8fa6b4b 100644 --- a/src/uadk_dh.c +++ b/src/uadk_dh.c @@ -376,7 +376,7 @@ free_cfg: static int uadk_e_dh_init(void) { - struct uacce_dev *dev = NULL; + struct uacce_dev *dev; int ret; if (g_dh_res.status != UADK_UNINIT) @@ -407,10 +407,11 @@ static int uadk_e_dh_init(void) err_init: g_dh_res.status = UADK_INIT_FAIL; -unlock: - pthread_spin_unlock(&g_dh_res.lock); if (dev) free(dev); +unlock: + pthread_spin_unlock(&g_dh_res.lock); + return g_dh_res.status; } diff --git a/src/uadk_ecx.c b/src/uadk_ecx.c index 011f733..f40acb4 100644 --- a/src/uadk_ecx.c +++ b/src/uadk_ecx.c @@ -406,9 +406,9 @@ static int openssl_do_ecx_genkey(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey) static int ecx_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey) { - struct ecx_ctx *keygen_ctx = NULL; struct ecx_key *ecx_key = NULL; struct wd_ecc_req req = {0}; + struct ecx_ctx *keygen_ctx; int ret; ret = ecx_genkey_check(ctx, pkey); @@ -636,9 +636,9 @@ static int ecx_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen) { struct ecx_key *peer_ecx_key = NULL; struct wd_ecc_point *s_key = NULL; - struct ecx_ctx *derive_ctx = NULL; struct ecx_key *ecx_key = NULL; struct wd_ecc_req req = {0}; + struct ecx_ctx *derive_ctx; int ret; if (!ctx) { diff --git a/src/uadk_pkey.c b/src/uadk_pkey.c index c779a9c..b32b658 100644 --- a/src/uadk_pkey.c +++ b/src/uadk_pkey.c @@ -572,7 +572,7 @@ bool uadk_support_algorithm(const char *alg) int uadk_init_ecc(void) { - struct uacce_dev *dev = NULL; + struct uacce_dev *dev; int ret; if (ecc_res.status != UADK_UNINIT) @@ -604,10 +604,11 @@ int uadk_init_ecc(void) err_init: ecc_res.status = UADK_INIT_FAIL; -unlock: - pthread_spin_unlock(&ecc_res.lock); if (dev) free(dev); +unlock: + pthread_spin_unlock(&ecc_res.lock); + return ecc_res.status; } diff --git a/src/uadk_prov_bio.c b/src/uadk_prov_bio.c index b7386b2..3e8ba3d 100644 --- a/src/uadk_prov_bio.c +++ b/src/uadk_prov_bio.c @@ -227,7 +227,7 @@ static int bio_core_free(BIO *bio) BIO_METHOD *ossl_bio_prov_init_bio_method(void) { - BIO_METHOD *corebiometh = NULL; + BIO_METHOD *corebiometh; corebiometh = BIO_meth_new(BIO_TYPE_CORE_TO_PROV, "BIO to Core filter"); if (corebiometh == NULL || diff --git a/src/uadk_prov_der_writer.c b/src/uadk_prov_der_writer.c index 0142641..d20640a 100644 --- a/src/uadk_prov_der_writer.c +++ b/src/uadk_prov_der_writer.c @@ -274,8 +274,8 @@ int ossl_DER_w_end_sequence(WPACKET *pkt, int tag) int ossl_DER_w_algorithmIdentifier_SM2_with_MD(WPACKET *pkt, int cont, EC_KEY *ec, int mdnid) { - const unsigned char *precompiled = NULL; - size_t precompiled_sz = 0; + const unsigned char *precompiled; + size_t precompiled_sz; switch (mdnid) { case NID_sm3: diff --git a/src/uadk_prov_dh.c b/src/uadk_prov_dh.c index c81776c..a7a6bf1 100644 --- a/src/uadk_prov_dh.c +++ b/src/uadk_prov_dh.c @@ -1119,7 +1119,7 @@ static void ossl_dh_free_ex(DH *dh) static DH *uadk_prov_dh_gen_params_with_group(PROV_DH_KEYMGMT_CTX *gctx, FFC_PARAMS **ffc) { - const DH_NAMED_GROUP *group = NULL; + const DH_NAMED_GROUP *group; DH *dh = NULL; /* Select a named group if there is not one already */ @@ -1160,7 +1160,7 @@ static DH *uadk_prov_dh_gen_params_with_group(PROV_DH_KEYMGMT_CTX *gctx, FFC_PAR static DH *uadk_prov_dh_gen_params_ex(PROV_DH_KEYMGMT_CTX *gctx, FFC_PARAMS **ffc) { - DH *dh = NULL; + DH *dh; /* Use existing params */ dh = ossl_dh_new_ex(gctx->libctx); @@ -1255,7 +1255,7 @@ static int uadk_prov_dh_gen_params_cb(PROV_DH_KEYMGMT_CTX *gctx, DH *dh, static DH *uadk_prov_dh_gen_params(PROV_DH_KEYMGMT_CTX *gctx, FFC_PARAMS **ffc, OSSL_CALLBACK *cb, void *cb_params) { - DH *dh = NULL; + DH *dh; int ret; /* For parameter generation - If there is a group name just create it */ @@ -1722,9 +1722,9 @@ static int ossl_dh_kdf_X9_42_asn1(unsigned char *out, PROV_DH_KEYEXCH_CTX *pdhct size_t ukmlen = pdhctx->kdf_ukmlen; const EVP_MD *md = pdhctx->kdf_md; OSSL_PARAM *p = params; - EVP_KDF_CTX *kctx = NULL; - EVP_KDF *kdf = NULL; const char *mdname; + EVP_KDF_CTX *kctx; + EVP_KDF *kdf; int ret = 0; kdf = EVP_KDF_fetch(libctx, OSSL_KDF_NAME_X942KDF_ASN1, propq); @@ -1759,7 +1759,7 @@ end: static int uadk_prov_dh_X9_42_kdf_derive(PROV_DH_KEYEXCH_CTX *pdhctx, unsigned char *secret, size_t *secretlen, size_t outlen) { - unsigned char *stmp = NULL; + unsigned char *stmp; size_t stmplen; int ret = 0; @@ -1910,7 +1910,7 @@ static int uadk_prov_dh_locate_kdf_type(PROV_DH_KEYEXCH_CTX *pdhctx, const OSSL_ { char name[DH_MAX_PARAM_LEN + 1] = {'\0'}; const OSSL_PARAM *p; - char *str = NULL; + char *str; p = OSSL_PARAM_locate_const(params, OSSL_EXCHANGE_PARAM_KDF_TYPE); if (p != NULL) { @@ -1935,7 +1935,7 @@ static int uadk_prov_dh_locate_kdf_digest(PROV_DH_KEYEXCH_CTX *pdhctx, char mdprops[DH_MAX_PARAM_LEN + 1] = {'\0'}; char name[DH_MAX_PARAM_LEN + 1] = {'\0'}; const OSSL_PARAM *p; - char *str = NULL; + char *str; p = OSSL_PARAM_locate_const(params, OSSL_EXCHANGE_PARAM_KDF_DIGEST); if (p != NULL) { @@ -2100,7 +2100,7 @@ static const OSSL_PARAM *uadk_keyexch_dh_gettable_ctx_params(ossl_unused void *d static int uadk_keyexch_dh_get_ctx_params(void *dhctx, OSSL_PARAM params[]) { PROV_DH_KEYEXCH_CTX *pdhctx = (PROV_DH_KEYEXCH_CTX *)dhctx; - const char *kdf_type = NULL; + const char *kdf_type; OSSL_PARAM *p; if (pdhctx == NULL) { diff --git a/src/uadk_prov_digest.c b/src/uadk_prov_digest.c index a40dfe4..208f381 100644 --- a/src/uadk_prov_digest.c +++ b/src/uadk_prov_digest.c @@ -771,7 +771,7 @@ static const OSSL_PARAM *uadk_prov_gettable_params(void *provctx) static int uadk_digest_default_get_params(OSSL_PARAM params[], size_t blksz, size_t paramsz) { - OSSL_PARAM *p = NULL; + OSSL_PARAM *p; p = OSSL_PARAM_locate(params, OSSL_DIGEST_PARAM_BLOCK_SIZE); if (p != NULL && !OSSL_PARAM_set_size_t(p, blksz)) { diff --git a/src/uadk_prov_ecdsa.c b/src/uadk_prov_ecdsa.c index ab80357..251c20a 100644 --- a/src/uadk_prov_ecdsa.c +++ b/src/uadk_prov_ecdsa.c @@ -246,7 +246,7 @@ static int ecdsa_digest_get_approved_nid(struct ecdsa_ctx *ctx, const EVP_MD *md static int ecdsa_setup_md(struct ecdsa_ctx *ctx, const char *mdname, const char *mdprops) { size_t mdname_len; - EVP_MD *md = NULL; + EVP_MD *md; int md_nid; if (!mdname) diff --git a/src/uadk_prov_ecx.c b/src/uadk_prov_ecx.c index a15c66d..41b7a5e 100644 --- a/src/uadk_prov_ecx.c +++ b/src/uadk_prov_ecx.c @@ -428,7 +428,7 @@ static void *ossl_ecx_gen_init(void *provctx, int selection, const OSSL_PARAM pa ECX_KEY_TYPE type) { OSSL_LIB_CTX *libctx = prov_libctx_of(provctx); - PROV_ECX_KEYMGMT_CTX *gctx = NULL; + PROV_ECX_KEYMGMT_CTX *gctx; int ret; gctx = OPENSSL_zalloc(sizeof(PROV_ECX_KEYMGMT_CTX)); @@ -544,8 +544,8 @@ static void uadk_prov_ecx_key_free(ECX_KEY *ecx_key) static ECX_KEY *uadk_prov_ecx_create_prikey(PROV_ECX_KEYMGMT_CTX *gctx) { - unsigned char *prikey = NULL; - ECX_KEY *ecx_key = NULL; + unsigned char *prikey; + ECX_KEY *ecx_key; int ret; ecx_key = uadk_prov_ecx_key_new(gctx->libctx, gctx->type, 0, gctx->propq); @@ -621,7 +621,7 @@ static void uadk_prov_ecx_keygen_uninit_iot(handle_t sess, struct wd_ecc_req *re static int uadk_prov_reverse_bytes(unsigned char *to_buf, __u32 size) { - unsigned char *tmp_buf = NULL; + unsigned char *tmp_buf; unsigned char tmp; if (size == 0) { @@ -730,7 +730,7 @@ static int uadk_prov_ecx_set_pkey(PROV_ECX_KEYMGMT_CTX *gctx, struct wd_ecc_req static int uadk_prov_ecx_keygen_set_prikey(PROV_ECX_KEYMGMT_CTX *gctx, ECX_KEY *ecx_key) { - struct wd_ecc_key *ecc_key = NULL; + struct wd_ecc_key *ecc_key; struct wd_dtb prikey = {0}; handle_t sess = gctx->sess; int ret; @@ -890,7 +890,7 @@ exe_soft: static void *uadk_keyexch_x448_newctx(void *provctx) { - PROV_ECX_KEYEXCH_CTX *ecxctx = NULL; + PROV_ECX_KEYEXCH_CTX *ecxctx; ecxctx = OPENSSL_zalloc(sizeof(PROV_ECX_KEYEXCH_CTX)); if (ecxctx == NULL) { @@ -1149,9 +1149,9 @@ static void uadk_prov_ecx_pad_out_key(unsigned char *dst, unsigned char *src, static int uadk_prov_ecx_derive(PROV_ECX_KEYEXCH_CTX *ecxctx, unsigned char *key, size_t *keylen) { struct wd_ecc_point *s_key = NULL; - ECX_KEY *peer_ecx_key = NULL; struct wd_ecc_req req = {0}; - ECX_KEY *ecx_key = NULL; + ECX_KEY *peer_ecx_key; + ECX_KEY *ecx_key; int ret; if (ecxctx == NULL) { diff --git a/src/uadk_prov_ffc.c b/src/uadk_prov_ffc.c index 0b23186..cd30c87 100644 --- a/src/uadk_prov_ffc.c +++ b/src/uadk_prov_ffc.c @@ -1464,7 +1464,7 @@ static int generate_canonical_g(BN_CTX *ctx, BN_MONT_CTX *mont, int gindex, unsigned char *seed, size_t seedlen) { unsigned char md[EVP_MAX_MD_SIZE]; - EVP_MD_CTX *mctx = NULL; + EVP_MD_CTX *mctx; int counter = 1; int ret = 0; int mdsize; diff --git a/src/uadk_prov_hmac.c b/src/uadk_prov_hmac.c index b764582..dd5f5ad 100644 --- a/src/uadk_prov_hmac.c +++ b/src/uadk_prov_hmac.c @@ -455,9 +455,9 @@ static int uadk_prov_compute_key_hash(struct hmac_priv_ctx *priv, const unsigned char *key, size_t keylen) { int ret = UADK_HMAC_FAIL; - EVP_MD_CTX *ctx = NULL; - EVP_MD *key_md = NULL; __u32 outlen = 0; + EVP_MD_CTX *ctx; + EVP_MD *key_md; key_md = EVP_MD_fetch(priv->libctx, priv->alg_name, NULL); if (!key_md) diff --git a/src/uadk_prov_rsa.c b/src/uadk_prov_rsa.c index 4376c85..aff3904 100644 --- a/src/uadk_prov_rsa.c +++ b/src/uadk_prov_rsa.c @@ -788,8 +788,8 @@ error: static int rsa_primes_gen(int bits, BIGNUM *e_pub, BIGNUM *p, BIGNUM *q, BN_GENCB *cb) { - struct rsa_prime_param *param = NULL; int bitsr[RSA_MAX_PRIME_NUM] = {0}; + struct rsa_prime_param *param; int flag, quot, rmd, i; BN_CTX *bnctx; int bitse = 0; @@ -1556,8 +1556,8 @@ static int uadk_prov_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) { struct rsa_keygen_param *keygen_param = NULL; struct rsa_keygen_param_bn *bn_param = NULL; - struct uadk_rsa_sess *rsa_sess = NULL; struct rsa_keypair *key_pair = NULL; + struct uadk_rsa_sess *rsa_sess; int is_crt = 1; int ret; @@ -1613,7 +1613,7 @@ free_keygen: static int crypt_trans_bn(struct uadk_rsa_sess *rsa_sess, unsigned char *buf, int num_bytes) { - BIGNUM *bn = NULL; + BIGNUM *bn; int ret; bn = BN_bin2bn((const unsigned char *)rsa_sess->req.dst, @@ -1634,7 +1634,7 @@ static int uadk_prov_rsa_public_encrypt(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) { struct rsa_pubkey_param *pub_enc = NULL; - struct uadk_rsa_sess *rsa_sess = NULL; + struct uadk_rsa_sess *rsa_sess; unsigned char *from_buf = NULL; int num_bytes, is_crt, ret; @@ -1759,9 +1759,9 @@ static int sign_trans_bn(struct uadk_rsa_sess *rsa_sess, unsigned char *from_buf struct rsa_prikey_param *pri, int padding, unsigned char *to, int num_bytes) { - BIGNUM *sign_bn = NULL; - BIGNUM *to_bn = NULL; BIGNUM *res = NULL; + BIGNUM *sign_bn; + BIGNUM *to_bn; int ret; sign_bn = BN_bin2bn((const unsigned char *)rsa_sess->req.dst, @@ -1791,8 +1791,8 @@ free_sign_bn: static int uadk_prov_rsa_private_sign(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) { - struct uadk_rsa_sess *rsa_sess = NULL; struct rsa_prikey_param *prik = NULL; + struct uadk_rsa_sess *rsa_sess; unsigned char *from_buf = NULL; int ret, num_bytes; @@ -1851,7 +1851,7 @@ static int verify_trans_bn(struct uadk_rsa_sess *rsa_sess, unsigned char *from_b int num_bytes, struct rsa_pubkey_param *pub, int padding, int *len) { - BIGNUM *verify_bn = NULL; + BIGNUM *verify_bn; int ret; verify_bn = BN_bin2bn((const unsigned char *)rsa_sess->req.dst, @@ -1875,9 +1875,9 @@ verify_end: static int uadk_prov_rsa_public_verify(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) { - struct uadk_rsa_sess *rsa_sess = NULL; struct rsa_pubkey_param *pub = NULL; int num_bytes, is_crt, len, ret; + struct uadk_rsa_sess *rsa_sess; unsigned char *from_buf = NULL; ret = check_rsa_input_para(flen, from, to, rsa); @@ -2990,8 +2990,8 @@ static void *uadk_rsa_sw_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg) static void *uadk_keymgmt_rsa_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg) { struct rsa_gen_ctx *gctx = genctx; - RSA *rsa = NULL; - BN_GENCB *gencb = NULL; + BN_GENCB *gencb; + RSA *rsa; int ret; if (gctx == NULL) diff --git a/src/uadk_prov_sm2.c b/src/uadk_prov_sm2.c index b0fc42b..7091ea4 100644 --- a/src/uadk_prov_sm2.c +++ b/src/uadk_prov_sm2.c @@ -646,7 +646,7 @@ static void *uadk_keymgmt_sm2_gen_sw(void *genctx, OSSL_CALLBACK *osslcb, void * static void *uadk_keymgmt_sm2_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg) { struct ec_gen_ctx *gctx = genctx; - EC_KEY *ec = NULL; + EC_KEY *ec; int ret; if (gctx == NULL) { @@ -1232,9 +1232,9 @@ static int uadk_prov_sm2_sign_ber_to_bin(unsigned char *sig, size_t sig_len, { const unsigned char *p = sig; unsigned char *der = NULL; - ECDSA_SIG *e_sig = NULL; - int len1, len2; BIGNUM *bn_r, *bn_s; + ECDSA_SIG *e_sig; + int len1, len2; e_sig = ECDSA_SIG_new(); if (e_sig == NULL) { @@ -1757,11 +1757,11 @@ static int uadk_prov_sm2_compute_z_digest(uint8_t *out, const EVP_MD *digest, const EC_KEY *key) { const EC_GROUP *group = EC_KEY_get0_group(key); - struct sm2_param *params = NULL; + struct sm2_param *params; int ret = UADK_P_FAIL; - uint8_t *buf = NULL; - BN_CTX *ctx = NULL; EVP_MD_CTX *hash; + uint8_t *buf; + BN_CTX *ctx; int p_bytes; hash = EVP_MD_CTX_new(); @@ -1819,7 +1819,7 @@ free_hash: static int sm2_sig_compute_z_digest(PROV_SM2_SIGN_CTX *psm2ctx) { SM2_PROV_CTX *smctx = psm2ctx->sm2_pctx; - uint8_t *z = NULL; + uint8_t *z; int ret; if (psm2ctx->flag_compute_z_digest) { diff --git a/src/uadk_rsa.c b/src/uadk_rsa.c index 969fcd2..62118e6 100644 --- a/src/uadk_rsa.c +++ b/src/uadk_rsa.c @@ -425,8 +425,8 @@ end: static int rsa_primes_gen(int bits, BIGNUM *e_pub, BIGNUM *p, BIGNUM *q, BN_GENCB *cb) { - struct rsa_prime_param *param = NULL; int bitsr[RSA_MAX_PRIME_NUM] = {0}; + struct rsa_prime_param *param; int flag, quo, rmd, i; BN_CTX *ctx; int bitse = 0; @@ -827,7 +827,7 @@ free_cfg: static int uadk_e_rsa_init(void) { - struct uacce_dev *dev = NULL; + struct uacce_dev *dev; int ret; if (g_rsa_res.status != UADK_UNINIT) @@ -858,10 +858,11 @@ static int uadk_e_rsa_init(void) err_init: g_rsa_res.status = UADK_INIT_FAIL; -unlock: - pthread_spin_unlock(&g_rsa_res.lock); if (dev) free(dev); +unlock: + pthread_spin_unlock(&g_rsa_res.lock); + return g_rsa_res.status; } @@ -1452,8 +1453,8 @@ static int uadk_e_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) { struct rsa_keygen_param *keygen_param = NULL; struct rsa_keygen_param_bn *bn_param = NULL; - struct uadk_rsa_sess *rsa_sess = NULL; struct rsa_keypair *key_pair = NULL; + struct uadk_rsa_sess *rsa_sess; BN_CTX *bn_ctx = NULL; int is_crt = 1; int ret; @@ -1523,7 +1524,7 @@ static int uadk_e_rsa_public_encrypt(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) { struct rsa_pubkey_param *pub_enc = NULL; - struct uadk_rsa_sess *rsa_sess = NULL; + struct uadk_rsa_sess *rsa_sess; unsigned char *from_buf = NULL; int num_bytes, is_crt, ret; BIGNUM *enc_bn = NULL; @@ -1614,7 +1615,7 @@ static int uadk_e_rsa_private_decrypt(int flen, const unsigned char *from, unsigned char *from_buf = NULL; struct uadk_rsa_sess *rsa_sess; int num_bytes, len, ret; - BIGNUM *dec_bn = NULL; + BIGNUM *dec_bn; ret = check_rsa_input_para(flen, from, to, rsa); if (!ret) @@ -1695,11 +1696,11 @@ exe_soft: static int uadk_e_rsa_private_sign(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) { - struct uadk_rsa_sess *rsa_sess = NULL; struct rsa_prikey_param *pri = NULL; + struct uadk_rsa_sess *rsa_sess; unsigned char *from_buf = NULL; - BIGNUM *sign_bn = NULL; - BIGNUM *to_bn = NULL; + BIGNUM *sign_bn; + BIGNUM *to_bn; BIGNUM *res = NULL; int num_bytes, ret; @@ -1792,11 +1793,11 @@ exe_soft: static int uadk_e_rsa_public_verify(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) { - struct uadk_rsa_sess *rsa_sess = NULL; struct rsa_pubkey_param *pub = NULL; + struct uadk_rsa_sess *rsa_sess; int num_bytes, is_crt, len, ret; unsigned char *from_buf = NULL; - BIGNUM *verify_bn = NULL; + BIGNUM *verify_bn; ret = check_rsa_input_para(flen, from, to, rsa); if (!ret) -- 2.33.0