From 6ebaa480cdecda22299cd7883ab582ea919e963e Mon Sep 17 00:00:00 2001
From: justin hartman <justin.hartman@gmail.com>
Date: Fri, 1 Mar 2019 16:34:20 -0500
Subject: [PATCH 1/2] Add *Timeout variants of Dial and DialSession

---
 net.go | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/net.go b/net.go
index 54beb8ee..999241fd 100644
--- a/net.go
+++ b/net.go
@@ -17,6 +17,7 @@ package openssl
 import (
 	"errors"
 	"net"
+	"time"
 )
 
 type listener struct {
@@ -80,6 +81,13 @@ func Dial(network, addr string, ctx *Ctx, flags DialFlags) (*Conn, error) {
 	return DialSession(network, addr, ctx, flags, nil)
 }
 
+// DialTimeout works just like Dial, but with a timeout on the underlying net
+// connection.
+func DialTimeout(network, addr string, ctx *Ctx, flags DialFlags,
+	timeout time.Duration) (*Conn, error) {
+	return DialSessionTimeout(network, addr, ctx, flags, nil, timeout)
+}
+
 // DialSession will connect to network/address and then wrap the corresponding
 // underlying connection with an OpenSSL client connection using context ctx.
 // If flags includes InsecureSkipHostVerification, the server certificate's
@@ -95,7 +103,37 @@ func Dial(network, addr string, ctx *Ctx, flags DialFlags) (*Conn, error) {
 // can be retrieved from the GetSession method on the Conn.
 func DialSession(network, addr string, ctx *Ctx, flags DialFlags,
 	session []byte) (*Conn, error) {
+	return dialSession(
+		network,
+		addr,
+		ctx,
+		flags,
+		session,
+		func(network, addr string) (net.Conn, error) {
+			return net.Dial(network, addr)
+		},
+	)
+}
+
+// DialSessionTimeout works just like DialSessionTimeout, but with a timeout
+// on the underlying net connection.
+func DialSessionTimeout(network, addr string, ctx *Ctx, flags DialFlags,
+	session []byte, timeout time.Duration) (*Conn, error) {
+	return dialSession(
+		network,
+		addr,
+		ctx,
+		flags,
+		session,
+		func(network, addr string) (net.Conn, error) {
+			return net.DialTimeout(network, addr, timeout)
+		},
+	)
+}
 
+func dialSession(network, addr string, ctx *Ctx, flags DialFlags,
+	session []byte,
+	makeNetConn func(network, addr string) (net.Conn, error)) (*Conn, error) {
 	host, _, err := net.SplitHostPort(addr)
 	if err != nil {
 		return nil, err
@@ -108,7 +146,7 @@ func DialSession(network, addr string, ctx *Ctx, flags DialFlags,
 		}
 		// TODO: use operating system default certificate chain?
 	}
-	c, err := net.Dial(network, addr)
+	c, err := makeNetConn(network, addr)
 	if err != nil {
 		return nil, err
 	}

From d8d71b288c113af4045ea3414b98da2297ef21c4 Mon Sep 17 00:00:00 2001
From: justin hartman <justin.hartman@gmail.com>
Date: Mon, 8 Apr 2019 09:53:28 -0400
Subject: [PATCH 2/2] No need to wrap net.Dial.

---
 net.go | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/net.go b/net.go
index 999241fd..ac001dda 100644
--- a/net.go
+++ b/net.go
@@ -103,16 +103,7 @@ func DialTimeout(network, addr string, ctx *Ctx, flags DialFlags,
 // can be retrieved from the GetSession method on the Conn.
 func DialSession(network, addr string, ctx *Ctx, flags DialFlags,
 	session []byte) (*Conn, error) {
-	return dialSession(
-		network,
-		addr,
-		ctx,
-		flags,
-		session,
-		func(network, addr string) (net.Conn, error) {
-			return net.Dial(network, addr)
-		},
-	)
+	return dialSession(network, addr, ctx, flags, session, net.Dial)
 }
 
 // DialSessionTimeout works just like DialSessionTimeout, but with a timeout