From dc9f0974c4f2cf548ee5eb436f805d2d9c6a378c Mon Sep 17 00:00:00 2001 From: Andreas Jobs Date: Tue, 27 Sep 2022 10:35:03 +0200 Subject: [PATCH] Skip DNAME RRs in DNS answers --- libopendkim/dkim-atps.c | 2 +- libopendkim/dkim-keys.c | 2 +- libopendkim/dkim-report.c | 2 +- librbl/rbl.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libopendkim/dkim-atps.c b/libopendkim/dkim-atps.c index 889f1d47..e1b38ebe 100644 --- a/libopendkim/dkim-atps.c +++ b/libopendkim/dkim-atps.c @@ -376,7 +376,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 index a2bd7dc2..ee83a96e 100644 --- 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 index 0fb2a9e0..8678ff80 100644 --- 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 index 1f935a60..f0cf622f 100644 --- a/librbl/rbl.c +++ b/librbl/rbl.c @@ -1128,7 +1128,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)