DKIM Verification: Fix relaxed canon for empty headers w/o

whitespace trailer

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index e782b9ee376a865e90bd1ba686fad083e6c7e846..dc8e0437d1d1a02c222c0257515f8a893f087726 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -11,6 +11,8 @@ PP/01 Solaris build fix for Oracle's LDAP libraries.
 
 TF/01 HP/UX build fix: avoid arithmetic on a void pointer.
 
+TK/01 DKIM Verification: Fix relaxed canon for empty headers w/o
+      whitespace trailer
 
 Exim version 4.76
 -----------------

diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index 59ac39569d091e823adbd881cff18de1edaf6487..5960292d4c49e3b4afbaf1453f81b9e5918b8b78 100644 (file)
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -420,7 +420,7 @@ char *pdkim_relax_header (char *header, int crlf) {
     p++;
     q++;
   }
-  if (seen_wsp) q--;
+  if ((q>relaxed) && (*(q-1) == ' ')) q--; /* Squash eventual trailing SP */
   *q = '\0';
   if (crlf) strcat(relaxed,"\r\n");
   return relaxed;