ph10 2006/07/06 15:28:04 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src ACKNOWLEDGMENTS
exim-src/src dk.c
Log:
Applied patch from Magnus Holmgren to include the "h" tag in Domain Keys
signatures.
Revision Changes Path
1.369 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.52 +1 -0 exim/exim-src/ACKNOWLEDGMENTS
1.10 +12 -6 exim/exim-src/src/dk.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- ChangeLog 6 Jul 2006 14:19:50 -0000 1.368
+++ ChangeLog 6 Jul 2006 14:28:03 -0000 1.369
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.368 2006/07/06 14:19:50 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.369 2006/07/06 14:28:03 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -74,6 +74,9 @@
PH/11 Applied patch from Arkadiusz Miskiewicz to apply a timeout to read
operations in malware.c.
+
+PH/12 Applied patch from Magnus Holmgren to include the "h" tag in Domain Keys
+ signatures.
Exim version 4.62
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ACKNOWLEDGMENTS 6 Jul 2006 14:19:50 -0000 1.51
+++ ACKNOWLEDGMENTS 6 Jul 2006 14:28:03 -0000 1.52
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.51 2006/07/06 14:19:50 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.52 2006/07/06 14:28:03 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -159,6 +159,7 @@
Bryan Henderson Patch to use RM_COMMAND everywhere during building
Jakob Hirsch Patch for % operator
Magnus Holmgren Patch for filter_prepend_home
+ Patch for "h" flag in Domain Keys
Kjetil Torgrim Homme Patch for require_files problem on NFS file systems
Tom Hughes Suggested patch for $n bug in pipe command from filter
Pierre Humblet Continued Cygwin support
Index: dk.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/dk.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dk.c 7 Feb 2006 11:19:00 -0000 1.9
+++ dk.c 6 Jul 2006 14:28:04 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/dk.c,v 1.9 2006/02/07 11:19:00 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/dk.c,v 1.10 2006/07/06 14:28:04 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -239,6 +239,8 @@
uschar *dk_selector,
uschar *dk_canon) {
uschar *rc = NULL;
+ uschar *headers = NULL;
+ int headers_len;
int dk_canon_int = DK_CANON_SIMPLE;
char c;
int seen_lf = 0;
@@ -398,7 +400,7 @@
}
/* Get the signature. */
- dk_internal_status = dk_getsig(dk_context, dk_private_key, sig, 8192);
+ dk_internal_status = dk_getsig(dk_context, dk_private_key, sig, 1024);
/* Check for unuseable key */
if (dk_internal_status != DK_STAT_OK) {
@@ -407,13 +409,17 @@
goto CLEANUP;
}
- rc = store_get(1024);
+ headers_len = dk_headers(dk_context, NULL);
+ rc = store_get(1024+256+headers_len);
+ headers = store_malloc(headers_len);
+ dk_headers(dk_context, CS headers);
/* Build DomainKey-Signature header to return. */
- (void)string_format(rc, 1024, "DomainKey-Signature: a=rsa-sha1; q=dns; c=%s;\r\n"
- "\ts=%s; d=%s;\r\n"
- "\tb=%s;\r\n", dk_canon, dk_selector, dk_domain, sig);
+ (void)string_format(rc, 1024+256+headers_len, "DomainKey-Signature: a=rsa-sha1; q=dns; c=%s; s=%s; d=%s;\r\n"
+ "\th=%s;\r\n"
+ "\tb=%s;\r\n", dk_canon, dk_selector, dk_domain, headers, sig);
- log_write(0, LOG_MAIN, "DK: message signed using a=rsa-sha1; q=dns; c=%s; s=%s; d=%s;", dk_canon, dk_selector, dk_domain);
+ log_write(0, LOG_MAIN, "DK: message signed using a=rsa-sha1; q=dns; c=%s; s=%s; d=%s; h=%s;", dk_canon, dk_selector, dk_domain, headers);
+ store_free(headers);
CLEANUP:
if (dk_context != NULL) {
