75 lines
2.3 KiB
Diff
75 lines
2.3 KiB
Diff
From 391351d4ed470bfb6c7aab3b8c06ad3dd7b65ecf Mon Sep 17 00:00:00 2001
|
|
From: Zhiqi Song <songzhiqi1@huawei.com>
|
|
Date: Sat, 25 Nov 2023 16:13:32 +0800
|
|
Subject: [PATCH 81/82] v1/pkey: fix uninitialized variable
|
|
|
|
Fix uninitialized variable 'ret'.
|
|
|
|
Signed-off-by: Zhiqi Song <songzhiqi1@huawei.com>
|
|
---
|
|
src/v1/alg/pkey/hpre_rsa.c | 13 +++++++------
|
|
1 file changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/v1/alg/pkey/hpre_rsa.c b/src/v1/alg/pkey/hpre_rsa.c
|
|
index 4e21dde..2086e0c 100644
|
|
--- a/src/v1/alg/pkey/hpre_rsa.c
|
|
+++ b/src/v1/alg/pkey/hpre_rsa.c
|
|
@@ -298,13 +298,13 @@ static int hpre_rsa_public_encrypt(int flen, const unsigned char *from,
|
|
BIGNUM *ret_bn = NULL;
|
|
hpre_engine_ctx_t *eng_ctx = NULL;
|
|
unsigned char *in_buf = NULL;
|
|
+ int ret = HPRE_CRYPTO_FAIL;
|
|
BN_CTX *bn_ctx = NULL;
|
|
int num_bytes = 0;
|
|
int key_bits;
|
|
- int ret;
|
|
|
|
if (hpre_rsa_check_para(flen, from, to, rsa) != HPRE_CRYPTO_SUCC)
|
|
- return HPRE_CRYPTO_FAIL;
|
|
+ return ret;
|
|
|
|
key_bits = RSA_bits(rsa);
|
|
if (!check_bit_useful(key_bits)) {
|
|
@@ -392,7 +392,7 @@ static int hpre_rsa_private_encrypt(int flen, const unsigned char *from,
|
|
int version;
|
|
|
|
if (hpre_rsa_check_para(flen, from, to, rsa) != HPRE_CRYPTO_SUCC)
|
|
- return HPRE_CRYPTO_FAIL;
|
|
+ return ret;
|
|
|
|
key_bits = RSA_bits(rsa);
|
|
if (!check_bit_useful(key_bits)) {
|
|
@@ -479,6 +479,7 @@ static int hpre_rsa_public_decrypt(int flen, const unsigned char *from,
|
|
unsigned char *to, RSA *rsa, int padding)
|
|
{
|
|
hpre_engine_ctx_t *eng_ctx = NULL;
|
|
+ int ret = HPRE_CRYPTO_FAIL;
|
|
BIGNUM *bn_ret = NULL;
|
|
BIGNUM *f = NULL;
|
|
BN_CTX *bn_ctx = NULL;
|
|
@@ -488,10 +489,10 @@ static int hpre_rsa_public_decrypt(int flen, const unsigned char *from,
|
|
int num_bytes = 0;
|
|
int rsa_soft_mark = 0;
|
|
unsigned char *buf = NULL;
|
|
- int ret, len;
|
|
+ int len;
|
|
|
|
if (hpre_rsa_check_para(flen, from, to, rsa) != HPRE_CRYPTO_SUCC)
|
|
- return HPRE_CRYPTO_FAIL;
|
|
+ return ret;
|
|
|
|
RSA_get0_key(rsa, &n, &e, &d);
|
|
ret = hpre_rsa_check(flen, n, e, &num_bytes, rsa);
|
|
@@ -578,7 +579,7 @@ static int hpre_rsa_private_decrypt(int flen, const unsigned char *from,
|
|
BN_CTX *bn_ctx = NULL;
|
|
|
|
if (hpre_rsa_check_para(flen, from, to, rsa) != HPRE_CRYPTO_SUCC)
|
|
- return HPRE_CRYPTO_FAIL;
|
|
+ return ret;
|
|
|
|
RSA_get0_key(rsa, &n, &e, &d);
|
|
num_bytes = BN_num_bytes(n);
|
|
--
|
|
2.25.1
|
|
|