diff options
| author | rockcavera <rockcavera@gmail.com> | 2021-02-22 13:40:57 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 17:40:57 +0100 |
| commit | d76d79336faef323744e9d22b99ec7a327b72cea (patch) | |
| tree | 08047d4fc61a5a2877e7f4f0232cf65ba311b397 /lib | |
| parent | 2aba116bbc8c1a595e49c8a703f2b8aecd7e8eda (diff) | |
| download | Nim-d76d79336faef323744e9d22b99ec7a327b72cea.tar.gz | |
fix #15215 (#17142)
* fix 15215 * fix test * end line * Update tests/stdlib/tnetconnect.nim Co-authored-by: flywind <xzsflywind@gmail.com> * Update lib/pure/net.nim Co-authored-by: flywind <xzsflywind@gmail.com> Co-authored-by: Andreas Rumpf <rumpf_a@web.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pure/net.nim | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/pure/net.nim b/lib/pure/net.nim index decf97777..594512439 100644 --- a/lib/pure/net.nim +++ b/lib/pure/net.nim @@ -1986,10 +1986,6 @@ proc connect*(socket: Socket, address: string, port = Port(0), ## ## The ``timeout`` parameter specifies the time in milliseconds to allow for ## the connection to the server to be made. - ## - ## **Warning:** This procedure appears to be broken for SSL connections as of - ## Nim v1.0.2. Consider using the other `connect` procedure. See - ## https://github.com/nim-lang/Nim/issues/15215 for more info. socket.fd.setBlocking(false) socket.connectAsync(address, port, socket.domain) @@ -2003,7 +1999,18 @@ proc connect*(socket: Socket, address: string, port = Port(0), when defineSsl and not defined(nimdoc): if socket.isSsl: socket.fd.setBlocking(true) - doAssert socket.gotHandshake() + # RFC3546 for SNI specifies that IP addresses are not allowed. + if not isIpAddress(address): + # Discard result in case OpenSSL version doesn't support SNI, or we're + # not using TLSv1+ + discard SSL_set_tlsext_host_name(socket.sslHandle, address) + + ErrClearError() + let ret = SSL_connect(socket.sslHandle) + socketError(socket, ret) + when not defined(nimDisableCertificateValidation): + if not isIpAddress(address): + socket.checkCertName(address) socket.fd.setBlocking(true) proc getPrimaryIPAddr*(dest = parseIpAddress("8.8.8.8")): IpAddress = |