From 5821f2041d741fdc3832d15927eac9a860906ad4 Mon Sep 17 00:00:00 2001
From: Zhi Guan <guanzhi1980@gmail.com>
Date: Tue, 18 Jun 2024 09:25:52 +0800
Subject: [PATCH] Remove warnings from `clang --analyze`

---
 src/asn1.c    | 2 +-
 src/cms.c     | 6 +++---
 src/sm4_cfb.c | 2 --
 src/sm4_ecb.c | 1 -
 src/sm4_ofb.c | 1 -
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/asn1.c b/src/asn1.c
index dd010ce5..affaee4e 100644
--- a/src/asn1.c
+++ b/src/asn1.c
@@ -1535,7 +1535,7 @@ int asn1_time_from_str(int utc_time, time_t *timestamp, const char *str)
 	day	= val(p[0]) * 10 + val(p[1]); p += 2;
 	hour	= val(p[0]) * 10 + val(p[1]); p += 2;
 	minute	= val(p[0]) * 10 + val(p[1]); p += 2;
-	second	= val(p[0]) * 10 + val(p[1]); p += 2;
+	second	= val(p[0]) * 10 + val(p[1]);
 
 	if (year < 1970
 		|| month < 1 || month > 12
diff --git a/src/cms.c b/src/cms.c
index 7d738f07..d3699706 100644
--- a/src/cms.c
+++ b/src/cms.c
@@ -1011,7 +1011,7 @@ int cms_signed_data_print(FILE *fp, int fmt, int ind, const char *label, const u
 	cms_content_info_print(fp, fmt, ind, "contentInfo", p, len);
 	if ((ret = asn1_implicit_set_from_der(0, &p, &len, &d, &dlen)) < 0) goto err;
 	if (ret) x509_certs_print(fp, fmt, ind, "certificates", p, len);
-	if ((ret = asn1_implicit_set_from_der(1, &p, &len, &d, &dlen)) < 0) goto err;
+	if (asn1_implicit_set_from_der(1, &p, &len, &d, &dlen) < 0) goto err;
 	if (asn1_set_from_der(&p, &len, &d, &dlen) != 1) goto err;
 	cms_signer_infos_print(fp, fmt, ind, "signerInfos", p, len);
 	if (asn1_length_is_zero(dlen) != 1) goto err;
@@ -1857,11 +1857,11 @@ int cms_signed_and_enveloped_data_decipher_from_der(
 	const uint8_t *extra_crls, size_t extra_crls_len,
 	const uint8_t **in, size_t *inlen)
 {
-	int ret;
+	int ret = 0;
 	int version;
 	const uint8_t *rcpt_infos;
 	size_t rcpt_infos_len;
-	int digest_algors[4];
+	int digest_algors[4] = {0};
 	size_t digest_algors_cnt;
 	const uint8_t *enced_content_info;
 	size_t enced_content_info_len;
diff --git a/src/sm4_cfb.c b/src/sm4_cfb.c
index a169eaea..6340b640 100644
--- a/src/sm4_cfb.c
+++ b/src/sm4_cfb.c
@@ -124,7 +124,6 @@ int sm4_cfb_encrypt_update(SM4_CFB_CTX *ctx,
 		sm4_cfb_encrypt(&ctx->sm4_key, ctx->sbytes, ctx->iv, in, len, out);
 		in += len;
 		inlen -= len;
-		out += len;
 		*outlen += len;
 	}
 	if (inlen) {
@@ -214,7 +213,6 @@ int sm4_cfb_decrypt_update(SM4_CFB_CTX *ctx,
 		sm4_cfb_decrypt(&ctx->sm4_key, ctx->sbytes, ctx->iv, in, len, out);
 		in += len;
 		inlen -= len;
-		out += len;
 		*outlen += len;
 	}
 	if (inlen) {
diff --git a/src/sm4_ecb.c b/src/sm4_ecb.c
index fb8592d9..8762a4bc 100644
--- a/src/sm4_ecb.c
+++ b/src/sm4_ecb.c
@@ -65,7 +65,6 @@ int sm4_ecb_encrypt_update(SM4_ECB_CTX *ctx,
 		sm4_encrypt_blocks(&ctx->sm4_key, in, nblocks, out);
 		in += len;
 		inlen -= len;
-		out += len;
 		*outlen += len;
 	}
 	if (inlen) {
diff --git a/src/sm4_ofb.c b/src/sm4_ofb.c
index 2dc03f37..c483fd0e 100644
--- a/src/sm4_ofb.c
+++ b/src/sm4_ofb.c
@@ -82,7 +82,6 @@ int sm4_ofb_encrypt_update(SM4_OFB_CTX *ctx,
 		sm4_ofb_encrypt(&ctx->sm4_key, ctx->iv, in, len, out);
 		in += len;
 		inlen -= len;
-		out += len;
 		*outlen += len;
 	}
 	if (inlen) {