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

Broken-by c73a4d073e

diff --git a/src/src/dkim.c b/src/src/dkim.c
index 18427fe9b4579cae38c3cac87e34db99451c724a..b4aecbc3b538842f3476d8c04c43748bb562b0c6 100644 (file)
--- 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 */
       }
 
     /* 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;
     }
 
     return PDKIM_OK;
     }
 

diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index b884671da9867888e04ffb6362e24a1543abad68..186258a621334bc537b73be718d2f87eb3cedf18 100644 (file)
--- 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 */
   }
 
 /* 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");
 else if (Ustrcmp(pub->version, PDKIM_PUB_RECORD_VERSION) != 0)
   {
   DEBUG(D_acl) debug_printf(" Bad v= field\n");