X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9242a7e8cfa94bbc9dd7eca6bd651b569b871c4e..e78f5da52ca38d07b0b4ccf565e1b47f477fb5a5:/src/src/std-crypto.c

diff --git a/src/src/std-crypto.c b/src/src/std-crypto.c
index e315e993a..e4df56006 100644
--- a/src/src/std-crypto.c
+++ b/src/src/std-crypto.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Phil Pennock 2012, 2016
- * Copyright (c) The Exim Maintainers 2017
+ * Copyright (c) The Exim Maintainers 2017 - 2018
  * But almost everything here is fixed published constants from RFCs, so also:
  * Copyright (C) The Internet Society (2003)
  * Copyright (C) The IETF Trust (2008)
@@ -17,7 +17,7 @@
 
 #include "exim.h"
 
-#ifndef SUPPORT_TLS
+#ifdef DISABLE_TLS
 static void dummy(int x) { dummy(x-1); }
 #else
 
@@ -959,11 +959,13 @@ struct dh_constant {
   const char *pem;
 };
 
+#define EXIM_DH_PRIME_DEFAULT dh_exim_20160529_3
+
 /* KEEP SORTED ALPHABETICALLY;
  * duplicate PEM are okay, if we want aliases, but names must be alphabetical */
 static struct dh_constant dh_constants[] = {
     /*  label			pem */
-    { "default",		dh_exim_20160529_3 },
+    { "default",		EXIM_DH_PRIME_DEFAULT },
     { "exim.dev.20160529.1",	dh_exim_20160529_1 },
     { "exim.dev.20160529.2",	dh_exim_20160529_2 },
     { "exim.dev.20160529.3",	dh_exim_20160529_3 },
@@ -993,7 +995,7 @@ static const int dh_constants_count =
 const char *
 std_dh_prime_default(void)
 {
-  return dh_ike_23_pem;
+  return EXIM_DH_PRIME_DEFAULT;
 }
 
 
@@ -1018,5 +1020,5 @@ std_dh_prime_named(const uschar *name)
   return NULL;
 }
 
-#endif /* SUPPORT_TLS */
+#endif /*DISABLE_TLS*/
 /* EOF */