From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 21 Oct 2022 10:42:41 +0000 (+0000)
Subject: database: Correct error code on verification
X-Git-Tag: 0.9.16~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa4898d0bbc1ea198e3e2687a5651294662ddc9f;p=location%2Flibloc.git

database: Correct error code on verification

If the first signature check returned an error, the error code was
overwritten by the second signature check, returning an overall
incorrect result.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/database.c b/src/database.c
index be60aa4..de9b02a 100644
--- a/src/database.c
+++ b/src/database.c
@@ -641,6 +641,9 @@ LOC_EXPORT int loc_database_verify(struct loc_database* db, FILE* f) {
 		}
 	}
 
+	int sig1_valid = 0;
+	int sig2_valid = 0;
+
 	// Check first signature
 	if (db->signature1.data) {
 		hexdump(db->ctx, db->signature1.data, db->signature1.length);
@@ -650,14 +653,14 @@ LOC_EXPORT int loc_database_verify(struct loc_database* db, FILE* f) {
 
 		if (r == 0) {
 			DEBUG(db->ctx, "The first signature is invalid\n");
-			r = 1;
 		} else if (r == 1) {
 			DEBUG(db->ctx, "The first signature is valid\n");
-			r = 0;
+			sig1_valid = 1;
 		} else {
 			ERROR(db->ctx, "Error verifying the first signature: %s\n",
 				ERR_error_string(ERR_get_error(), NULL));
 			r = -1;
+			goto CLEANUP;
 		}
 	}
 
@@ -670,14 +673,14 @@ LOC_EXPORT int loc_database_verify(struct loc_database* db, FILE* f) {
 
 		if (r == 0) {
 			DEBUG(db->ctx, "The second signature is invalid\n");
-			r = 1;
 		} else if (r == 1) {
 			DEBUG(db->ctx, "The second signature is valid\n");
-			r = 0;
+			sig2_valid = 1;
 		} else {
 			ERROR(db->ctx, "Error verifying the second signature: %s\n",
 				ERR_error_string(ERR_get_error(), NULL));
 			r = -1;
+			goto CLEANUP;
 		}
 	}
 
@@ -685,6 +688,12 @@ LOC_EXPORT int loc_database_verify(struct loc_database* db, FILE* f) {
 	INFO(db->ctx, "Signature checked in %.4fms\n",
 		(double)(end - start) / CLOCKS_PER_SEC * 1000);
 
+	// Check if at least one signature as okay
+	if (sig1_valid || sig2_valid)
+		r = 0;
+	else
+		r = 1;
+
 CLEANUP:
 	// Cleanup
 	EVP_MD_CTX_free(mdctx);