commit 2e9f7a5ec6f998ff8267d1bdc6b2d406ea6e3346
from: Martijn van Duren <martijn@openbsd.org>
date: Sun Mar 27 08:39:20 2022 UTC

Fix syntax validator in t=-tag (used wrong function)

While here fix unfold some line wrappings no longer needed

commit - 475eae65239228c365ae7f3f6eeb47ccd38c6277
commit + 2e9f7a5ec6f998ff8267d1bdc6b2d406ea6e3346
blob - 73ae9d9c086a40f0d2ce4ea32bb8a4093e5c2b84
blob + ff0f4720b308bfc9514aef89a46c50b8bf73566c
--- main.c
+++ main.c
@@ -1266,8 +1266,7 @@ dkim_key_text_parse(struct signature *sig, const char 
 			if (s != 0)	/* Duplicate tag */
 				return 0;
 			/* Invalid tag value */
-			if (osmtpd_ltok_skip_key_s_tag_value(key, 0) !=
-			    end)
+			if (osmtpd_ltok_skip_key_s_tag_value(key, 0) != end)
 				return 0;
 			while (1) {
 				if ((tagvend =
@@ -1292,12 +1291,10 @@ dkim_key_text_parse(struct signature *sig, const char 
 			if (t != 0)	/* Duplicate tag */
 				return 0;
 			t = 1;
-			if (osmtpd_ltok_skip_key_s_tag_type(key, 0) !=
-			    end)
+			if (osmtpd_ltok_skip_key_t_tag_value(key, 0) != end)
 				return 0;
 			while (1) {
-				tagvend =
-				    osmtpd_ltok_skip_key_t_tag_flag(
+				tagvend = osmtpd_ltok_skip_key_t_tag_flag(
 				    key, 0);
 				if (strncmp(key, "y", tagvend - key) == 0)
 					sig->kt |= KT_Y;