File libica-sles15sp2-FIPS-HMAC-based-library-integr... of Package libica.16467

Overview Repositories Revisions Requests Users Attributes Meta

File libica-sles15sp2-FIPS-HMAC-based-library-integrity-check-rename-variables.patch of Package libica.16467

From 2078b62947d2e0f2641b48975786e839d6396be8 Mon Sep 17 00:00:00 2001
From: Joerg Schmidbauer <jschmidb@de.ibm.com>
Date: Wed, 6 May 2020 09:52:36 +0200
Subject: [PATCH] FIPS: HMAC based library integrity check, rename variables

Rename variables to more speaking names, no logic change.

Signed-off-by: Joerg Schmidbauer <jschmidb@de.ibm.com>
---
 src/fips.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/fips.c b/src/fips.c
index a1c6f5f..07310c3 100644
--- a/src/fips.c
+++ b/src/fips.c
@@ -245,12 +245,12 @@ static int FIPSCHECK_verify(const char *path)
 {
 	int rc = 0;
 	FILE *fp;
-	unsigned char *hmac_buf = NULL;
+	unsigned char *known_hmac = NULL;
 	long hmaclen;
 	char *hmacpath, *p;
-	char *hmac_str = NULL;
-	size_t n, buflen;
-	void *buf = NULL;
+	char *known_hmac_str = NULL;
+	size_t n, computed_hmac_len;
+	void *computed_hmac = NULL;
 
 	hmacpath = make_hmac_path(path);
 	if (hmacpath == NULL)
@@ -262,29 +262,29 @@ static int FIPSCHECK_verify(const char *path)
 		goto end;
 	}
 
-	if (getline(&hmac_str, &n, fp) <= 0)
+	if (getline(&known_hmac_str, &n, fp) <= 0)
 		goto end;
 
-	if ((p = strchr(hmac_str, '\n')) != NULL)
+	if ((p = strchr(known_hmac_str, '\n')) != NULL)
 		*p = '\0';
 
-	hmac_buf = OPENSSL_hexstr2buf(hmac_str, &hmaclen);
+	known_hmac = OPENSSL_hexstr2buf(known_hmac_str, &hmaclen);
 
-	if (compute_file_hmac(path, &buf, &buflen) != 0)
+	if (compute_file_hmac(path, &computed_hmac, &computed_hmac_len) != 0)
 		goto end;
 
-	if (memcmp(buf, hmac_buf, buflen) != 0)
+	if (memcmp(computed_hmac, known_hmac, computed_hmac_len) != 0)
 		goto end;
 
 	rc = 1;
 
 end:
 
-	free(buf);
-	free(hmac_str);
+	free(computed_hmac);
+	free(known_hmac_str);
 	free(hmacpath);
 
-	OPENSSL_free(hmac_buf);
+	OPENSSL_free(known_hmac);
 
 	if (fp)
 		fclose(fp);
-- 
2.26.2

Places

File libica-sles15sp2-FIPS-HMAC-based-library-integrity-check-rename-variables.patch of Package libica.16467

Places