DKIM multiple signature generation fix.

Patch from Uwe Doering, sign-off by Michael Haardt.
fixes bug 1019

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 3764a88a1e8432ba616a3184d29a30d9a7e2fdda..1188810ba0f17486bf2a4ef2a1a32e59a5e85a6f 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -69,6 +69,9 @@ PP/12 Bugzilla 1056: Improved spamd server selection.
 PP/13 Bugzilla 1086: Deal with maildir quota file races.
       Based on patch from Heiko Schlittermann.
 
 PP/13 Bugzilla 1086: Deal with maildir quota file races.
       Based on patch from Heiko Schlittermann.
 

+PP/14 Bugzilla 1019: DKIM multiple signature generation fix.
+      Patch from Uwe Doering, sign-off by Michael Haardt.
+

 
 Exim version 4.74
 -----------------
 
 Exim version 4.74
 -----------------

diff --git a/src/src/dkim.c b/src/src/dkim.c
index 2a06dee9274dea2d34725ee92c7faf7ad128ad8e..e25ff8c85e9095d4d950030de3d42e4102ecdd11 100644 (file)
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -397,6 +397,9 @@ uschar *dkim_exim_sign(int dkim_fd,
   uschar *dkim_private_key_expanded;
   pdkim_ctx *ctx = NULL;
   uschar *rc = NULL;
   uschar *dkim_private_key_expanded;
   pdkim_ctx *ctx = NULL;
   uschar *rc = NULL;

+  uschar *sigbuf = NULL;
+  int sigsize = 0;
+  int sigptr = 0;

   pdkim_signature *signature;
   int pdkim_canon;
   int pdkim_rc;
   pdkim_signature *signature;
   int pdkim_canon;
   int pdkim_rc;


@@ -405,6 +408,8 @@ uschar *dkim_exim_sign(int dkim_fd,
   int save_errno = 0;
   int old_pool = store_pool;
 
   int save_errno = 0;
   int old_pool = store_pool;
 

+  store_pool = POOL_MAIN;
+

   dkim_domain = expand_string(dkim_domain);
   if (dkim_domain == NULL) {
     /* expansion error, do not send message. */
   dkim_domain = expand_string(dkim_domain);
   if (dkim_domain == NULL) {
     /* expansion error, do not send message. */


@@ -484,8 +489,7 @@ uschar *dkim_exim_sign(int dkim_fd,
          (Ustrcmp(dkim_private_key_expanded,"0") == 0) ||
          (Ustrcmp(dkim_private_key_expanded,"false") == 0) ) {
       /* don't sign, but no error */
          (Ustrcmp(dkim_private_key_expanded,"0") == 0) ||
          (Ustrcmp(dkim_private_key_expanded,"false") == 0) ) {
       /* don't sign, but no error */

-      rc = US"";
-      goto CLEANUP;
+      continue;

     }
 
     if (dkim_private_key_expanded[0] == '/') {
     }
 
     if (dkim_private_key_expanded[0] == '/') {


@@ -522,6 +526,7 @@ uschar *dkim_exim_sign(int dkim_fd,
                        0,
                        0);
 
                        0,
                        0);
 

+    lseek(dkim_fd, 0, SEEK_SET);

     while((sread = read(dkim_fd,&buf,4096)) > 0) {
       if (pdkim_feed(ctx,buf,sread) != PDKIM_OK) {
         rc = NULL;
     while((sread = read(dkim_fd,&buf,4096)) > 0) {
       if (pdkim_feed(ctx,buf,sread) != PDKIM_OK) {
         rc = NULL;


@@ -539,17 +544,24 @@ uschar *dkim_exim_sign(int dkim_fd,
     pdkim_rc = pdkim_feed_finish(ctx,&signature);
     if (pdkim_rc != PDKIM_OK) {
       log_write(0, LOG_MAIN|LOG_PANIC, "DKIM: signing failed (RC %d)", pdkim_rc);
     pdkim_rc = pdkim_feed_finish(ctx,&signature);
     if (pdkim_rc != PDKIM_OK) {
       log_write(0, LOG_MAIN|LOG_PANIC, "DKIM: signing failed (RC %d)", pdkim_rc);

+      rc = NULL;

       goto CLEANUP;
     }
 
       goto CLEANUP;
     }
 

-    rc = store_get(strlen(signature->signature_header)+3);
-    Ustrcpy(rc,US signature->signature_header);
-    Ustrcat(rc,US"\r\n");
+    sigbuf = string_append(sigbuf, &sigsize, &sigptr, 2,
+                           US signature->signature_header,
+                           US"\r\n");

 
     pdkim_free_ctx(ctx);
     ctx = NULL;
   }
 
 
     pdkim_free_ctx(ctx);
     ctx = NULL;
   }
 

+  if (sigbuf != NULL) {
+    sigbuf[sigptr] = '\0';
+    rc = sigbuf;
+  } else
+    rc = US"";
+

   CLEANUP:
   if (ctx != NULL)
     pdkim_free_ctx(ctx);
   CLEANUP:
   if (ctx != NULL)
     pdkim_free_ctx(ctx);