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 0f7d0f6..628df5b 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
  */
 
  *
  *  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
 
 
 #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>
 #ifdef RSA_OPENSSL
 # include <openssl/rsa.h>
 # include <openssl/ssl.h>


@@ -27,13 +28,8 @@
 #  include <gnutls/abstract.h>
 # endif
 #endif
 #  include <gnutls/abstract.h>
 # endif
 #endif

-
-#ifdef SHA_GNUTLS
-# include <gnutls/crypto.h>

 #endif
 
 #endif
 

-#include "hash.h"
-

 
 /******************************************************************************/
 #ifdef SHA_OPENSSL
 
 /******************************************************************************/
 #ifdef SHA_OPENSSL


@@ -177,5 +173,4 @@ return h->sha1 ? 20 : 32;
 }
 
 
 }
 
 

-#endif /*DISABLE_DKIM*/

 /* End of File */
 /* End of File */