X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fpdkim%2Fcrypt_ver.h;h=bf620366f02116ee3448448d69bffa010a75a8dc;hb=d584cdcac04235b9323a34c049a1c5dc2cd2a309;hp=2a9dde952c94025e88e536c1ea52c0a2828f1d78;hpb=2592e6c0eda522da0f6a33f4d32e33598288eb6e;p=exim.git

diff --git a/src/src/pdkim/crypt_ver.h b/src/src/pdkim/crypt_ver.h
index 2a9dde952..bf620366f 100644
--- a/src/src/pdkim/crypt_ver.h
+++ b/src/src/pdkim/crypt_ver.h
@@ -2,31 +2,25 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) Jeremy Harris 2016 */
+/* Copyright (c) Jeremy Harris 2017 */
 /* See the file NOTICE for conditions of use and distribution. */
 
-/* RSA and SHA routine selection for PDKIM */
+/* Signing and hashing routine selection for PDKIM */
 
 #include "../exim.h"
+#include "../sha_ver.h"
 
 
 #ifdef USE_GNUTLS
 # include <gnutls/gnutls.h>
 
-# if GNUTLS_VERSION_NUMBER > 0x020c00
-#  define RSA_GNUTLS
+# if GNUTLS_VERSION_NUMBER >= 0x30000
+#  define SIGN_GNUTLS
 # else
-#  define RSA_GCRYPT
-# endif
-
-# if GNUTLS_VERSION_NUMBER >= 0x020a00
-#  define SHA_GNUTLS
-# else
-#  define SHA_GCRYPT
+#  define SIGN_GCRYPT
 # endif
 
 #else
-# define RSA_OPENSSL
-# define SHA_OPENSSL
+# define SIGN_OPENSSL
 #endif