From 72de98917bf1c6cd14071c7198bd59c96994c6e6 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Tue, 31 Oct 2023 19:37:18 +0000
Subject: cksum -c: support checking base64 digests in reverse mode too.

In reverse mode, the entry does not include the digest algorithm
so the specified algorithm (or the default) is used when checking.
OK deraadt@
---
 bin/md5/md5.c | 49 ++++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

(limited to 'bin/md5')

diff --git a/bin/md5/md5.c b/bin/md5/md5.c
index c2245eb91e4..225878f0c15 100644
--- a/bin/md5/md5.c
+++ b/bin/md5/md5.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: md5.c,v 1.97 2020/10/19 18:15:18 millert Exp $	*/
+/*	$OpenBSD: md5.c,v 1.98 2023/10/31 19:37:17 millert Exp $	*/
 
 /*
  * Copyright (c) 2001,2003,2005-2007,2010,2013,2014
@@ -352,7 +352,7 @@ main(int argc, char **argv)
 		hash_insert(&hl, hf, (hf->base64 == -1 ? 0 : bflag));
 	}
 
-	if (rflag || qflag) {
+	if ((rflag || qflag) && !cflag) {
 		const int new_style = rflag ? STYLE_CKSUM : STYLE_TERSE;
 		TAILQ_FOREACH(hf, &hl, tailq) {
 			hf->style = new_style;
@@ -628,27 +628,6 @@ digest_filelist(const char *file, struct hash_function *defhash, int selcount,
 			}
 			if (hf->name == NULL || *checksum == '\0')
 				continue;
-			/*
-			 * Check the length to see if this could be
-			 * a valid checksum.  If hex, it will be 2x the
-			 * size of the binary data.  For base64, we have
-			 * to check both with and without the '=' padding.
-			 */
-			len = strlen(checksum);
-			if (len != hf->digestlen * 2) {
-				size_t len2;
-
-				if (checksum[len - 1] == '=') {
-					/* use padding */
-					len2 = 4 * ((hf->digestlen + 2) / 3);
-				} else {
-					/* no padding */
-					len2 = (4 * hf->digestlen + 2) / 3;
-				}
-				if (len != len2)
-					continue;
-				base64 = 1;
-			}
 		} else {
 			/* could be GNU form */
 			if ((hf = defhash) == NULL)
@@ -671,6 +650,30 @@ digest_filelist(const char *file, struct hash_function *defhash, int selcount,
 			if (p != NULL)
 				*p = '\0';
 		}
+
+		if (hf->style == STYLE_MD5) {
+			/*
+			 * Check the length to see if this could be
+			 * a valid digest.  If hex, it will be 2x the
+			 * size of the binary data.  For base64, we have
+			 * to check both with and without the '=' padding.
+			 */
+			len = strlen(checksum);
+			if (len != hf->digestlen * 2) {
+				size_t len2;
+
+				if (checksum[len - 1] == '=') {
+					/* use padding */
+					len2 = 4 * ((hf->digestlen + 2) / 3);
+				} else {
+					/* no padding */
+					len2 = (4 * hf->digestlen + 2) / 3;
+				}
+				if (len != len2)
+					continue;
+				base64 = 1;
+			}
+		}
 		found = 1;
 
 		/*
-- 
cgit v1.2.3