X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fstd-crypto.c;h=e4df560064f551c64acce4e2cf222d7a0b19da13;hb=2130e492c2cda886d74abbb77df4493f151e0a44;hp=d41e2a195141ec02602ec2f64bfec842bea24340;hpb=f2ed27cf5f913cc437401c7e005c2886b7dc1a55;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/std-crypto.c b/src/src/std-crypto.c
index d41e2a195..e4df56006 100644
--- a/src/src/std-crypto.c
+++ b/src/src/std-crypto.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Phil Pennock 2012, 2016
+ * 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)
@@ -16,7 +17,7 @@
 
 #include "exim.h"
 
-#ifndef SUPPORT_TLS
+#ifdef DISABLE_TLS
 static void dummy(int x) { dummy(x-1); }
 #else
 
@@ -958,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 },
@@ -992,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;
 }
 
 
@@ -1017,5 +1020,5 @@ std_dh_prime_named(const uschar *name)
   return NULL;
 }
 
-#endif /* SUPPORT_TLS */
+#endif /*DISABLE_TLS*/
 /* EOF */