From 7c7b5bf91e9ac0c19c40f30d903ea4b04501ba9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claudio=20Andr=C3=A9?= <dev@claudioandre.slmail.me>
Date: Mon, 2 Dec 2024 17:21:37 -0300
Subject: [PATCH] maint(gpg2john.c): add missing prototypes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The clang compiler was complaining with the error message: "Passing
arguments to a function without a prototype is deprecated in all
versions of C".

Fix: #5268.

Signed-off-by: Claudio André <dev@claudioandre.slmail.me>
---
 src/gpg2john.c | 93 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 84 insertions(+), 9 deletions(-)

diff --git a/src/gpg2john.c b/src/gpg2john.c
index 2fefa6e2c9b..46a3a51ebbf 100644
--- a/src/gpg2john.c
+++ b/src/gpg2john.c
@@ -1208,7 +1208,7 @@ Private_Packet(int len)
  */
 
 
-typedef void (*funcptr)();
+typedef void (*funcptr)(int);
 
 private int get_new_len(int);
 private int is_partial(int);
@@ -1294,8 +1294,8 @@ TAG[] = {
 };
 #define TAG_NUM (sizeof(TAG) * sizeof(string))
 
-private void
-(*tag_func[])() = {
+private funcptr
+tag_func[] = {
 	Reserved,
 	Public_Key_Encrypted_Session_Key_Packet,
 	Signature_Packet,
@@ -1305,7 +1305,7 @@ private void
 	Public_Key_Packet,
 	Secret_Subkey_Packet,
 	Compressed_Data_Packet,
-	Symmetrically_Encrypted_Data_Packet,
+	NULL,
 	Marker_Packet,
 	Literal_Data_Packet,
 	Trust_Packet,
@@ -1314,7 +1314,7 @@ private void
 	NULL,
 	NULL,
 	User_Attribute_Packet,
-	Symmetrically_Encrypted_and_MDC_Packet,
+	NULL,
 	Modification_Detection_Code_Packet,
 	NULL,
 	NULL,
@@ -1363,6 +1363,75 @@ private void
 	Private_Packet,
 };
 
+private void
+(*tag_func4[])(int, int, int, char *) = {
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	Symmetrically_Encrypted_Data_Packet,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	Symmetrically_Encrypted_and_MDC_Packet,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+};
+
 char *pkt_type(int tag) {
 	switch(tag) {
 	case 0: return "Reserved";
@@ -1626,10 +1695,13 @@ parse_packet(char *hash)
 		}
 		// else printf("(%d bytes)\n", len);
 
-		if (tag < TAG_NUM && tag_func[tag] != NULL) {
+		if (tag < TAG_NUM && (tag_func[tag] != NULL || tag_func4[tag] != NULL)) {
 			if (gpg_dbg)
 				fprintf(stderr, "Packet type %d, len %d at offset %d  (Processing) (pkt-type %s) (Partial %s)\n", tag, len, offset, pkt_type(tag), partial?"yes":"no");
-			(*tag_func[tag])(len, 1, partial, hash);	// first packet (possibly only one if partial is false).
+			if (tag_func[tag] != NULL)
+				(*tag_func[tag])(len);
+			else
+				(*tag_func4[tag])(len, 1, partial, hash);	// first packet (possibly only one if partial is false).
 		} else {
 			if (gpg_dbg)
 				fprintf(stderr, "Packet type %d, len %d at offset %d  (Skipping) (Partial %s)\n", tag, len, offset, partial?"yes":"no");
@@ -1648,10 +1720,13 @@ parse_packet(char *hash)
 				if (gpg_dbg)
 					fprintf(stderr, "\t(%d bytes) partial end\n", len);
 			}
-			if (tag < TAG_NUM && tag_func[tag] != NULL) {
+			if (tag < TAG_NUM && (tag_func[tag] != NULL || tag_func4[tag] != NULL)) {
 				if (gpg_dbg)
 					fprintf(stderr, "Packet type %d, len %d at offset %d  (Processing) (pkt-type %s) (Partial %s)\n", tag, len, offset, pkt_type(tag), partial?"yes":"no");
-				(*tag_func[tag])(len, 0, partial, hash);	// subsquent packets.
+				if (tag_func[tag] != NULL)
+					(*tag_func[tag])(len);
+				else
+					(*tag_func4[tag])(len, 0, partial, hash);	// subsquent packets.
 			} else
 				skip(len);
 		}