Promote the pdkim variant-implementation sha routines to toplevel

[exim.git] / src / src / hash.c

diff --git a/src/src/pdkim/hash.c b/src/src/hash.c
similarity index 93%
rename from src/src/pdkim/hash.c
rename to src/src/hash.c
index 0f7d0f6d4f9016ea54e57409aa55b0a7485ca2fe..628df5b4b6d8bb7bef7bd195bc6e2d776f6d0d9a 100644 (file)
--- a/src/src/pdkim/hash.c
+++ b/src/src/hash.c
@@ -1,21 +1,22 @@
 /*
- *  PDKIM - a RFC4871 (DKIM) implementation
+ *  Exim - an Internet mail transport agent
  *
  *  Copyright (C) 2016  Exim maintainers
  *
  *  Hash interface functions
  */
 
-#include "../exim.h"
-
-#ifndef DISABLE_DKIM   /* entire file */
+#include "exim.h"
 
 #ifndef SUPPORT_TLS
 # error Need SUPPORT_TLS for DKIM
 #endif
 
-#include "crypt_ver.h"
+#include "sha_ver.h"
+#include "hash.h"
+
 
+#ifdef notdef
 #ifdef RSA_OPENSSL
 # include <openssl/rsa.h>
 # include <openssl/ssl.h>
@@ -27,13 +28,8 @@
 #  include <gnutls/abstract.h>
 # endif
 #endif
-
-#ifdef SHA_GNUTLS
-# include <gnutls/crypto.h>
 #endif
 
-#include "hash.h"
-
 
 /******************************************************************************/
 #ifdef SHA_OPENSSL
@@ -177,5 +173,4 @@ return h->sha1 ? 20 : 32;
 }
 
 
-#endif /*DISABLE_DKIM*/
 /* End of File */