diff options
| author | Leorize <leorize+oss@disroot.org> | 2020-06-04 09:57:19 -0500 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2020-06-06 21:11:53 +0200 |
| commit | e80a23f4d2bf4f628cb6bf7c235cb63cc58fdcb0 (patch) | |
| tree | 6efd2d7014614989938b280e6770d301470185e8 /lib | |
| parent | d406f588d89fcf4a19c3e556ca57def9644a8a57 (diff) | |
| download | Nim-e80a23f4d2bf4f628cb6bf7c235cb63cc58fdcb0.tar.gz | |
net: revert compatibility changes for Windows
This reverts commit d53a6355f3ad4401731142d8fc66b95ecfdfb321 and 688b1f250ed058ecc49737dc75fd089206fa25b9.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pure/net.nim | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/pure/net.nim b/lib/pure/net.nim index 8da14f6e3..f628ee056 100644 --- a/lib/pure/net.nim +++ b/lib/pure/net.nim @@ -534,10 +534,7 @@ when defineSsl: raiseSSLError("Verification of private key file failed.") proc newContext*(protVersion = protSSLv23, verifyMode = CVerifyPeer, - certFile = "", keyFile = "", - # XXX: update the OpenSSL that we ship with Windows for the - # next release. - cipherList = when not defined(windows): CiphersIntermediate else: CiphersOld, + certFile = "", keyFile = "", cipherList = CiphersIntermediate, caDir = "", caFile = ""): SSLContext = ## Creates an SSL context. ## @@ -588,7 +585,7 @@ when defineSsl: # # From OpenSSL >= 1.1.0, this setting is set by default and can't be # overriden. - if getOpenSSLVersion() >= 0x10002000 and newCTX.SSL_CTX_set_ecdh_auto(1) != 1: + if newCTX.SSL_CTX_set_ecdh_auto(1) != 1: raiseSSLError() when defined(nimDisableCertificateValidation) or defined(windows): |