diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2018-02-07 11:23:32 -0500 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2018-02-07 11:23:32 -0500 |
| commit | 5f86a8e4ca87f169dc708b15b13a26c2bb514762 (patch) | |
| tree | f312d8f95b314906b539ea44c963bf74e0b5b7c4 /SConstruct | |
| parent | ad223ea38846ceac92d7b5356add62e23e985537 (diff) | |
| download | mongo-5f86a8e4ca87f169dc708b15b13a26c2bb514762.tar.gz | |
Revert "SERVER-22411 Add stub implementation of ASIO SChannel integration"
This reverts commit ad223ea38846ceac92d7b5356add62e23e985537.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct index c3f40d4e8a5..e77d17f4dfe 100644 --- a/SConstruct +++ b/SConstruct @@ -1629,8 +1629,6 @@ elif env.TargetOSIs('windows'): 'version.lib', 'winmm.lib', 'ws2_32.lib', - 'secur32.lib', - 'crypt32.lib', ], ) @@ -2864,12 +2862,8 @@ def doConfigure(myenv): if ssl_provider == 'native': if conf.env.TargetOSIs('windows'): - ssl_provider = 'windows' - env.SetConfigHeaderDefine("MONGO_CONFIG_SSL_PROVIDER", "SSL_PROVIDER_WINDOWS") - - # TODO: Implement native crypto for windows, for now use tom - conf.env.Append( MONGO_CRYPTO=["tom"] ) - + # TODO: Implement native crypto for windows + ssl_provider = 'openssl' elif conf.env.TargetOSIs('darwin', 'macOS'): conf.env.Append( MONGO_CRYPTO=["apple"] ) if has_option("ssl"): @@ -2881,8 +2875,6 @@ def doConfigure(myenv): if has_option("ssl"): checkOpenSSL(conf) # Working OpenSSL available, use it. - env.SetConfigHeaderDefine("MONGO_CONFIG_SSL_PROVIDER", "SSL_PROVIDER_OPENSSL") - conf.env.Append( MONGO_CRYPTO=["openssl"] ) else: # If we don't need an SSL build, we can get by with TomCrypt. |