wip

diff --git a/src/src/dkim.c b/src/src/dkim.c
index a898b75d74cca1ea581abe6441b9247a4b2552d5..fb846beb4e0fa8dc792f6c8c9d3e63db2f607d2b 100644 (file)
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/dkim.c,v 1.1.2.1 2009/02/24 15:57:55 tom Exp $ */
+/* $Cambridge: exim/src/src/dkim.c,v 1.1.2.2 2009/02/24 18:43:59 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -16,6 +16,17 @@
 
 #include "pdkim/pdkim.h"
 
+
+void dkim_exim_verify_init(void) {
+}
+
+void dkim_exim_verify_finish(void) {
+}
+
+int dkim_exim_verify_result(uschar *domain, uschar **result, uschar **error) {
+  return OK;
+}
+
 uschar *dkim_exim_sign(int dkim_fd,
                        uschar *dkim_private_key,
                        uschar *dkim_domain,
@@ -29,6 +40,7 @@ uschar *dkim_exim_sign(int dkim_fd,
   int sread;
   char buf[4096];
   int save_errno = 0;
+  int old_pool = store_pool;
 
   dkim_domain = expand_string(dkim_domain);
   if (dkim_domain == NULL) {
@@ -80,7 +92,6 @@ uschar *dkim_exim_sign(int dkim_fd,
       goto CLEANUP;
     }
   }
-  dkim_exim_sign_headers = dkim_sign_headers;
 
   /* Get private key to use. */
   dkim_private_key = expand_string(dkim_private_key);
@@ -117,7 +128,7 @@ uschar *dkim_exim_sign(int dkim_fd,
 
   pdkim_set_optional(ctx,
                      PDKIM_INPUT_SMTP,
-                     (char *)dkim_exim_sign_headers,
+                     (char *)dkim_sign_headers,
                      NULL,
                      pdkim_canon,
                      pdkim_canon,

diff --git a/src/src/dkim.h b/src/src/dkim.h
index d5dc5b551d4dfc9b7e2b9e66e148600fa60e07c3..8d6be1e353852584ecead8a6585806298a4a5e10 100644 (file)
--- a/src/src/dkim.h
+++ b/src/src/dkim.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/dkim.h,v 1.1.2.1 2009/02/24 15:57:55 tom Exp $ */
+/* $Cambridge: exim/src/src/dkim.h,v 1.1.2.2 2009/02/24 18:43:59 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -14,3 +14,8 @@ uschar *dkim_exim_sign(int ,
                        uschar *,
                        uschar *);
 
+void dkim_exim_verify_init(void);
+void dkim_exim_verify_finish(void);
+int dkim_exim_verify_result(uschar *domain,
+                            uschar **,
+                            uschar **);

diff --git a/src/src/functions.h b/src/src/functions.h
index 41b334a150a5a456e52b1c933536a2b0a699649b..402e738b24187d56e4ed5b3f15a1b285c7fb507f 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/functions.h,v 1.43.2.1 2009/02/24 15:57:55 tom Exp $ */
+/* $Cambridge: exim/src/src/functions.h,v 1.43.2.2 2009/02/24 18:43:59 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -86,9 +86,7 @@ extern BOOL    directory_make(uschar *, uschar *, int, BOOL);
 #ifndef DISABLE_DKIM
 extern BOOL    dkim_transport_write_message(address_item *, int, int,
                    int, uschar *, uschar *, uschar *, uschar *, rewrite_rule *,
-                   int, uschar *, uschar *, uschar *, uschar *, uschar *, uschar *,
-                   uschar *, uschar *, uschar *, uschar *, uschar *, uschar *
-                   );
+                   int, uschar *, uschar *, uschar *, uschar *, uschar *, uschar *);
 #endif
 extern dns_address *dns_address_from_rr(dns_answer *, dns_record *);
 extern void    dns_build_reverse(uschar *, uschar *);

diff --git a/src/src/pdkim/sha1.c b/src/src/pdkim/sha1.c
index ab1b56faf149d2fd672b487fa2b8b2bd05b2ba1d..5320979572f58abcb912eaf933ac22752945d8f2 100644 (file)
--- a/src/src/pdkim/sha1.c
+++ b/src/src/pdkim/sha1.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/pdkim/sha1.c,v 1.1.2.1 2009/02/24 13:13:47 tom Exp $ */
+/* $Cambridge: exim/src/src/pdkim/sha1.c,v 1.1.2.2 2009/02/24 18:43:59 tom Exp $ */
 /*
  *  FIPS-180-1 compliant SHA-1 implementation
  *
@@ -309,7 +309,7 @@ void sha1_finish( sha1_context *ctx, unsigned char output[20] )
 /*
  * output = SHA-1( input buffer )
  */
-void sha1( unsigned char *input, int ilen, unsigned char output[20] )
+void sha1_oneshot( unsigned char *input, int ilen, unsigned char output[20] )
 {
     sha1_context ctx;
 
@@ -362,7 +362,7 @@ void sha1_hmac_starts( sha1_context *ctx, unsigned char *key, int keylen )
 
     if( keylen > 64 )
     {
-        sha1( key, keylen, sum );
+        sha1_oneshot( key, keylen, sum );
         keylen = 20;
         key = sum;
     }

diff --git a/src/src/pdkim/sha1.h b/src/src/pdkim/sha1.h
index f5b85ff9bfc987737b26094f81acdc3bd2d22230..620fc3dc2c55ef35efee20bd92a58a8b484ebcd8 100644 (file)
--- a/src/src/pdkim/sha1.h
+++ b/src/src/pdkim/sha1.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/pdkim/sha1.h,v 1.1.2.1 2009/02/24 13:13:47 tom Exp $ */
+/* $Cambridge: exim/src/src/pdkim/sha1.h,v 1.1.2.2 2009/02/24 18:43:59 tom Exp $ */
 /**
  * \file sha1.h
  *
@@ -72,7 +72,7 @@ void sha1_finish( sha1_context *ctx, unsigned char output[20] );
  * \param ilen     length of the input data
  * \param output   SHA-1 checksum result
  */
-void sha1( unsigned char *input, int ilen, unsigned char output[20] );
+void sha1_oneshot( unsigned char *input, int ilen, unsigned char output[20] );
 
 /**
  * \brief          Output = SHA-1( file contents )

diff --git a/src/src/transport.c b/src/src/transport.c
index 6f201c3a2ff65beeb520761687fd9dfbd75c13df..bbdc7da967d36132082e68fd2e7cfe6106fb3a6d 100644 (file)
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/transport.c,v 1.23.2.1 2009/02/24 15:57:55 tom Exp $ */
+/* $Cambridge: exim/src/src/transport.c,v 1.23.2.2 2009/02/24 18:43:59 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -1059,7 +1059,6 @@ dkim_transport_write_message(address_item *addr, int fd, int options,
       }
     }
   }
-  #endif
 
   /* Fetch file positition (the size) */
   size = lseek(dkim_fd,0,SEEK_CUR);
@@ -1129,6 +1128,7 @@ dkim_transport_write_message(address_item *addr, int fd, int options,
   errno = save_errno;
   return rc;
 }
+
 #endif