Import Debian changes 4.89-2+deb9u4

[hcoop/debian/exim4.git] / debian / patches / 93_CVE-2016-9963-Fix-DKIM-information-leakage.patch

diff --git a/debian/patches/93_CVE-2016-9963-Fix-DKIM-information-leakage.patch b/debian/patches/93_CVE-2016-9963-Fix-DKIM-information-leakage.patch
deleted file mode 100644 (file)
index 1b8528f..0000000
--- a/debian/patches/93_CVE-2016-9963-Fix-DKIM-information-leakage.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From be2b8e517f4946d2ad0cb0100e7b078cb4d9b65f Mon Sep 17 00:00:00 2001
-From: Jeremy Harris <jgh@wizmail.org>
-Date: Fri, 16 Dec 2016 20:36:39 +0000
-Subject: [PATCH 1/2] Fix DKIM information leakage
-
----
-
---- a/src/dkim.c
-+++ b/src/dkim.c
-@@ -521,6 +521,8 @@ uschar *dkim_exim_sign(int dkim_fd,
-                           (char *)dkim_private_key_expanded
-                          );
- 
-+    dkim_private_key_expanded[0] = '\0';
-+
-     pdkim_set_debug_stream(ctx,debug_file);
- 
-     pdkim_set_optional(ctx,
---- a/src/transports/smtp.c
-+++ b/src/transports/smtp.c
-@@ -282,6 +282,7 @@ static uschar *rf_names[] = { "NEVER", "
- static uschar *smtp_command;   /* Points to last cmd for error messages */
- static uschar *mail_command;   /* Points to MAIL cmd for error messages */
- static BOOL    update_waiting; /* TRUE to update the "wait" database */
-+static uschar *data_command = US"";   /* Points to DATA cmd for error messages */
- 
- 
- /*************************************************
-@@ -1951,6 +1952,7 @@ if (ok || (smtp_use_pipelining && !mua_w
-     case -1: goto END_OFF;               /* Timeout on RCPT */
-     default: goto RESPONSE_FAILED;       /* I/O error, or any MAIL/DATA error */
-     }
-+  data_command = string_copy(big_buffer);  /* Save for later error message */
-   }
- 
- /* Save the first address of the next batch. */
-@@ -2136,7 +2138,7 @@ if (!ok) ok = TRUE; else
- #else
-           "LMTP error after %s: %s",
- #endif
--            big_buffer, string_printing(buffer));
-+            data_command, string_printing(buffer));
-           setflag(addr, af_pass_message);   /* Allow message to go to user */
-           if (buffer[0] == '5')
-             addr->transport_return = FAIL;