Merge pull request trusteddomainproject#156 from RUBNOC/fixDNAME

Skip DNAME RRs in DNS answers
futatuki · Apr 24, 2024 · 4dda8eb · 4dda8eb
2 parents bf9595a + dc9f097
commit 4dda8eb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/libopendkim/dkim-atps.c b/libopendkim/dkim-atps.c
@@ -370,7 +370,7 @@ dkim_atps_check(DKIM *dkim, DKIM_SIGINFO *sig, struct timeval *timeout,
 			cp += n;
 			continue;
 		}
-		else if (type == T_RRSIG)
+		else if ((type == T_RRSIG) || (type == T_DNAME))
 		{
 			/* get payload length */
 			if (cp + INT16SZ > eom)

diff --git a/libopendkim/dkim-keys.c b/libopendkim/dkim-keys.c
@@ -324,7 +324,7 @@ dkim_get_key_dns(DKIM *dkim, DKIM_SIGINFO *sig, u_char *buf, size_t buflen)
 			cp += n;
 			continue;
 		}
-		else if (type == T_RRSIG)
+		else if ((type == T_RRSIG) || (type == T_DNAME))
 		{
 			cp += n;
 			continue;

diff --git a/libopendkim/dkim-report.c b/libopendkim/dkim-report.c
@@ -224,7 +224,7 @@ dkim_repinfo(DKIM *dkim, DKIM_SIGINFO *sig, struct timeval *timeout,
 			cp += n;
 			continue;
 		}
-		else if (type == T_RRSIG)
+		else if ((type == T_RRSIG) || (type == T_DNAME))
 		{
 			/* get payload length */
 			if (cp + INT16SZ > eom)

diff --git a/librbl/rbl.c b/librbl/rbl.c
@@ -1135,7 +1135,7 @@ rbl_query_check(RBL *rbl, void *qh, struct timeval *timeout, uint32_t *res)
 			cp += n;
 			continue;
 		}
-		else if (type == T_RRSIG)
+		else if ((type == T_RRSIG) || (type == T_DNAME))
 		{
 			/* get payload length */
 			if (cp + INT16SZ > eom)