From d39929d96d7ba7d199c95995be2b6d01ee029507 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 13 Sep 2022 17:01:26 +0900 Subject: [PATCH 1/2] openssl-util: drop meaningless assertion As the type of 'msz' is int. Fixes CID#1497842. --- src/shared/openssl-util.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/shared/openssl-util.c b/src/shared/openssl-util.c index 2bd2d5e43b..3901935434 100644 --- a/src/shared/openssl-util.c +++ b/src/shared/openssl-util.c @@ -149,7 +149,6 @@ int pubkey_fingerprint(EVP_PKEY *pk, const EVP_MD *md, void **ret, size_t *ret_s msz = EVP_MD_size(md); assert_se(msz > 0); - assert_se(msz <= INT_MAX); h = malloc(msz); if (!h) From 2e64df07b89e97368fc576ca2f2f6a87b04b8986 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 13 Sep 2022 17:03:01 +0900 Subject: [PATCH 2/2] openssl-util: use assert() if no side effect --- src/shared/openssl-util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/shared/openssl-util.c b/src/shared/openssl-util.c index 3901935434..e4ee09102c 100644 --- a/src/shared/openssl-util.c +++ b/src/shared/openssl-util.c @@ -86,8 +86,8 @@ int rsa_pkey_to_suitable_key_size( size_t suitable_key_size; int bits; - assert_se(pkey); - assert_se(ret_suitable_key_size); + assert(pkey); + assert(ret_suitable_key_size); /* Analyzes the specified public key and that it is RSA. If so, will return a suitable size for a * disk encryption key to encrypt with RSA for use in PKCS#11 security token schemes. */ @@ -148,7 +148,7 @@ int pubkey_fingerprint(EVP_PKEY *pk, const EVP_MD *md, void **ret, size_t *ret_s return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Failed to run %s context.", EVP_MD_name(md)); msz = EVP_MD_size(md); - assert_se(msz > 0); + assert(msz > 0); h = malloc(msz); if (!h) @@ -158,7 +158,7 @@ int pubkey_fingerprint(EVP_PKEY *pk, const EVP_MD *md, void **ret, size_t *ret_s if (EVP_DigestFinal_ex(m, h, &umsz) != 1) return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Failed to finalize hash context."); - assert_se(umsz == (unsigned) msz); + assert(umsz == (unsigned) msz); *ret = TAKE_PTR(h); *ret_size = msz;