[exim-dev] [Bug 2207] DKIM verification fails when there is …

Góra strony
Delete this message
Reply to this message
Autor: admin
Data:  
Dla: exim-dev
Temat: [exim-dev] [Bug 2207] DKIM verification fails when there is a non-DKIM TXT record
https://bugs.exim.org/show_bug.cgi?id=2207

--- Comment #5 from Git Commit <git@???> ---
Git commit:
https://git.exim.org/exim.git/commitdiff/fc6fb551537b5af8988576071ff6e1240cff269f

commit fc6fb551537b5af8988576071ff6e1240cff269f
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Jan 14 18:40:50 2018 +0000
Commit:     Jeremy Harris <jgh146exb@???>
CommitDate: Sun Jan 14 18:40:50 2018 +0000


    DKIM: DNS records having no v= tag are acceptable.  Bug 2207


    Broken-by c73a4d073e
---
 src/src/dkim.c        | 3 ++-
 src/src/pdkim/pdkim.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/src/src/dkim.c b/src/src/dkim.c
index 8c03d48..852ae17 100644
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -75,7 +75,8 @@ for (rr = dns_next_rr(&dnsa, &dnss, RESET_ANSWERS);
       }


     /* check if this looks like a DKIM record */
-    if (strncasecmp(answer, "v=dkim", 6) != 0) continue;
+    if (strncmp(answer, "v=", 2) == 0 && strncasecmp(answer, "v=dkim", 6) !=
0)
+      continue;
     return PDKIM_OK;
     }


diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index b884671..186258a 100644
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -654,7 +654,8 @@ while ((ele = string_nextinlist(&raw_record, &sep, NULL,
0)))
}

 /* Set fallback defaults */
-if (!pub->version    ) pub->version     =
string_copy(PDKIM_PUB_RECORD_VERSION);
+if (!pub->version)
+  pub->version = string_copy(PDKIM_PUB_RECORD_VERSION);
 else if (Ustrcmp(pub->version, PDKIM_PUB_RECORD_VERSION) != 0)
   {
   DEBUG(D_acl) debug_printf(" Bad v= field\n");


--
You are receiving this mail because:
You are on the CC list for the bug.