X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4fab92fbc2b63bac2d89c1dae69fa1845cb640b7..9fa4d5b45f70b36a46c0d04381a5e05cb39ae3e9:/src/src/std-crypto.c

diff --git a/src/src/std-crypto.c b/src/src/std-crypto.c
index 8ccef122b..a045f6cc6 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
 
@@ -961,26 +962,27 @@ struct dh_constant {
 /* KEEP SORTED ALPHABETICALLY;
  * duplicate PEM are okay, if we want aliases, but names must be alphabetical */
 static struct dh_constant dh_constants[] = {
-    { "default", dh_exim_20160529_3 },
-    { "exim.dev.20160529.1", dh_exim_20160529_1 },
-    { "exim.dev.20160529.2", dh_exim_20160529_2 },
-    { "exim.dev.20160529.3", dh_exim_20160529_3 },
-    { "ffdhe2048", dh_ffdhe2048_pem },
-    { "ffdhe3072", dh_ffdhe3072_pem },
-    { "ffdhe4096", dh_ffdhe4096_pem },
-    { "ffdhe6144", dh_ffdhe6144_pem },
-    { "ffdhe8192", dh_ffdhe8192_pem },
-    { "ike1", dh_ike_1_pem },
-    { "ike14", dh_ike_14_pem },
-    { "ike15", dh_ike_15_pem },
-    { "ike16", dh_ike_16_pem },
-    { "ike17", dh_ike_17_pem },
-    { "ike18", dh_ike_18_pem },
-    { "ike2", dh_ike_2_pem },
-    { "ike22", dh_ike_22_pem },
-    { "ike23", dh_ike_23_pem },
-    { "ike24", dh_ike_24_pem },
-    { "ike5", dh_ike_5_pem },
+    /*  label			pem */
+    { "default",		dh_exim_20160529_3 },
+    { "exim.dev.20160529.1",	dh_exim_20160529_1 },
+    { "exim.dev.20160529.2",	dh_exim_20160529_2 },
+    { "exim.dev.20160529.3",	dh_exim_20160529_3 },
+    { "ffdhe2048",		dh_ffdhe2048_pem },
+    { "ffdhe3072",		dh_ffdhe3072_pem },
+    { "ffdhe4096",		dh_ffdhe4096_pem },
+    { "ffdhe6144",		dh_ffdhe6144_pem },
+    { "ffdhe8192",		dh_ffdhe8192_pem },
+    { "ike1",			dh_ike_1_pem },
+    { "ike14",			dh_ike_14_pem },
+    { "ike15",			dh_ike_15_pem },
+    { "ike16",			dh_ike_16_pem },
+    { "ike17",			dh_ike_17_pem },
+    { "ike18",			dh_ike_18_pem },
+    { "ike2",			dh_ike_2_pem },
+    { "ike22",			dh_ike_22_pem },
+    { "ike23",			dh_ike_23_pem },
+    { "ike24",			dh_ike_24_pem },
+    { "ike5",			dh_ike_5_pem },
 };
 static const int dh_constants_count =
   sizeof(dh_constants) / sizeof(struct dh_constant);
@@ -1016,5 +1018,5 @@ std_dh_prime_named(const uschar *name)
   return NULL;
 }
 
-#endif /* SUPPORT_TLS */
+#endif /*DISABLE_TLS*/
 /* EOF */