Revert "SERVER-38141 Fix Incorrect usage of MONGO_CONFIG_HAS_SSL_SET_ECDH_AUTO"

This reverts commit ed1b9123d7d1eeaa76dff21bea96fa556a079836.

3 files changed, 5 insertions, 8 deletions

diff --git a/SConstruct b/SConstruct
index aa02a5c978c..188927e702a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -2822,7 +2822,7 @@ def doConfigure(myenv):
 
         conf.AddTest("CheckOpenSSL_EC_DH", CheckOpenSSL_EC_DH)
         if conf.CheckOpenSSL_EC_DH():
-            conf.env.SetConfigHeaderDefine('MONGO_CONFIG_HAVE_SSL_SET_ECDH_AUTO')
+            conf.env.SetConfigHeaderDefine('MONGO_CONFIG_HAS_SSL_SET_ECDH_AUTO')
 
     else:
         env.Append( MONGO_CRYPTO=["tom"] )
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 45237c795fa..435fbd2f602 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -246,8 +246,6 @@ config_header_substs = (
     ('@mongo_config_altivec_vec_vbpermq_output_index@', 'MONGO_CONFIG_ALTIVEC_VEC_VBPERMQ_OUTPUT_INDEX'),
     ('@mongo_config_byte_order@', 'MONGO_CONFIG_BYTE_ORDER'),
     ('@mongo_config_debug_build@', 'MONGO_CONFIG_DEBUG_BUILD'),
-    ('@mongo_config_have_ssl_set_ecdh_auto@', 'MONGO_CONFIG_HAVE_SSL_SET_ECDH_AUTO'),
-    ('@mongo_config_have_ssl_ec_key_new@', 'MONGO_CONFIG_HAVE_SSL_EC_KEY_NEW'),
     ('@mongo_config_have_execinfo_backtrace@', 'MONGO_CONFIG_HAVE_EXECINFO_BACKTRACE'),
     ('@mongo_config_have_fips_mode_set@', 'MONGO_CONFIG_HAVE_FIPS_MODE_SET'),
     ('@mongo_config_have_header_unistd_h@', 'MONGO_CONFIG_HAVE_HEADER_UNISTD_H'),
@@ -261,6 +259,7 @@ config_header_substs = (
     ('@mongo_config_optimized_build@', 'MONGO_CONFIG_OPTIMIZED_BUILD'),
     ('@mongo_config_ssl@', 'MONGO_CONFIG_SSL'),
     ('@mongo_config_ssl_has_asn1_any_definitions@', 'MONGO_CONFIG_HAVE_ASN1_ANY_DEFINITIONS'),
+    ('@mongo_config_has_ssl_set_ecdh_auto@', 'MONGO_CONFIG_HAS_SSL_SET_ECDH_AUTO'),
     ('@mongo_config_wiredtiger_enabled@', 'MONGO_CONFIG_WIREDTIGER_ENABLED'),
 )
 
diff --git a/src/mongo/config.h.in b/src/mongo/config.h.in
index b0ec89f3440..63d737c9e6d 100644
--- a/src/mongo/config.h.in
+++ b/src/mongo/config.h.in
@@ -57,11 +57,6 @@
 // Defined if pthread.h and pthread_setname_np are available
 @mongo_config_have_pthread_setname_np@
 
-// Defined if OpenSSL has `SSL_CTX_set_ecdh_auto` and `SSL_set_ecdh_auto`
-@mongo_config_have_ssl_set_ecdh_auto@
-
-// Defined if OpenSSL has `EC_KEY_new_by_curve_name` and the `NID_X9_62_prime256v1` curve defined
-@mongo_config_have_ssl_ec_key_new@
 // Defined if std::make_unique is available
 @mongo_config_have_std_make_unique@
 
@@ -80,5 +75,8 @@
 // Defined if OpenSSL has SEQUENCE_ANY
 @mongo_config_ssl_has_asn1_any_definitions@
 
+// Defined if OpenSSL has `SSL_CTX_set_ecdh_auto` and `SSL_set_ecdh_auto`
+@mongo_config_has_ssl_set_ecdh_auto@
+
 // Defined if WiredTiger storage engine is enabled
 @mongo_config_wiredtiger_enabled@