libp2p · Nov 29, 2019 · Nov 29, 2019 · Nov 29, 2019 · Dec 7, 2019 · Mar 12, 2020
Showing with 75 additions and 78 deletions.

+5 −0 README.md

+1 −1 cmd/tlsdiag.go

+1 −1 cmd/tlsdiag/client.go

+1 −1 cmd/tlsdiag/server.go

+25 −3 crypto.go

+10 −3 go.mod

+32 −69 go.sum
diff --git a/README.md b/README.md
@@ -1,3 +1,8 @@
+
+Forked to reuse the certificate https://github.com/libp2p/go-libp2p-tls/issues/35
+
+Below is the original readme
+
 # go-libp2p-tls
 
 [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](https://protocol.ai)

diff --git a/cmd/tlsdiag.go b/cmd/tlsdiag.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/libp2p/go-libp2p-tls/cmd/tlsdiag"
+	"github.com/RTradeLtd/go-libp2p-tls/cmd/tlsdiag"
 )
 
 func main() {

diff --git a/cmd/tlsdiag/client.go b/cmd/tlsdiag/client.go
@@ -8,8 +8,8 @@ import (
 	"net"
 	"time"
 
+	libp2ptls "github.com/RTradeLtd/go-libp2p-tls"
 	"github.com/libp2p/go-libp2p-core/peer"
-	libp2ptls "github.com/libp2p/go-libp2p-tls"
 )
 
 func StartClient() error {

diff --git a/cmd/tlsdiag/server.go b/cmd/tlsdiag/server.go
@@ -7,8 +7,8 @@ import (
 	"net"
 	"time"
 
+	libp2ptls "github.com/RTradeLtd/go-libp2p-tls"
 	"github.com/libp2p/go-libp2p-core/peer"
-	libp2ptls "github.com/libp2p/go-libp2p-tls"
 )
 
 func StartServer() error {

diff --git a/crypto.go b/crypto.go
@@ -62,6 +62,11 @@ func (i *Identity) ConfigForAny() (*tls.Config, <-chan ic.PubKey) {
 	return i.ConfigForPeer("")
 }
 
+// ReusableConfigForAny is a short-hand for ReusableConfigForPeer("").
+func (i *Identity) ReusableConfigForAny() *tls.Config {
+	return i.ReusableConfigForPeer("")
+}
+
 // ConfigForPeer creates a new single-use tls.Config that verifies the peer's
 // certificate chain and returns the peer's public key via the channel. If the
 // peer ID is empty, the returned config will accept any peer.
@@ -70,14 +75,29 @@ func (i *Identity) ConfigForAny() (*tls.Config, <-chan ic.PubKey) {
 // incoming or outgoing connection.
 func (i *Identity) ConfigForPeer(remote peer.ID) (*tls.Config, <-chan ic.PubKey) {
 	keyCh := make(chan ic.PubKey, 1)
+	return i.configForPeer(remote, keyCh), keyCh
+}
+
+// ReusableConfigForPeer creates a new multi-use tls.Config that verifies the peer's
+// certificate chain. If the peer ID is empty, the returned config will accept any peer.
+//
+// It should be used to create a new tls.Config before securing either an
+// incoming or outgoing connection.
+func (i *Identity) ReusableConfigForPeer(remote peer.ID) *tls.Config {
+	return i.configForPeer(remote, nil)
+}
+
+func (i *Identity) configForPeer(remote peer.ID, keyCh chan ic.PubKey) *tls.Config {
 	// We need to check the peer ID in the VerifyPeerCertificate callback.
 	// The tls.Config it is also used for listening, and we might also have concurrent dials.
 	// Clone it so we can check for the specific peer ID we're dialing here.
 	conf := i.config.Clone()
 	// We're using InsecureSkipVerify, so the verifiedChains parameter will always be empty.
 	// We need to parse the certificates ourselves from the raw certs.
 	conf.VerifyPeerCertificate = func(rawCerts [][]byte, _ [][]*x509.Certificate) error {
-		defer close(keyCh)
+		if keyCh != nil {
+			defer close(keyCh)
+		}
 
 		chain := make([]*x509.Certificate, len(rawCerts))
 		for i := 0; i < len(rawCerts); i++ {
@@ -99,10 +119,12 @@ func (i *Identity) ConfigForPeer(remote peer.ID) (*tls.Config, <-chan ic.PubKey)
 			}
 			return fmt.Errorf("peer IDs don't match: expected %s, got %s", remote, peerID)
 		}
-		keyCh <- pubKey
+		if keyCh != nil {
+			keyCh <- pubKey
+		}
 		return nil
 	}
-	return conf, keyCh
+	return conf
 }
 
 // PubKeyFromCertChain verifies the certificate chain and extract the remote's public key.

diff --git a/go.mod b/go.mod
@@ -1,10 +1,17 @@
-module github.com/libp2p/go-libp2p-tls
+module github.com/RTradeLtd/go-libp2p-tls
 
 go 1.14
 
 require (
-	github.com/libp2p/go-libp2p-core v0.3.0
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/ipfs/go-cid v0.0.6 // indirect
+	github.com/kr/pretty v0.1.0 // indirect
+	github.com/libp2p/go-libp2p-core v0.6.0
+	github.com/libp2p/go-openssl v0.0.6 // indirect
+	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/onsi/ginkgo v1.12.0
 	github.com/onsi/gomega v1.9.0
-	golang.org/x/sys v0.0.0-20191206220618-eeba5f6aabab
+	golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 // indirect
+	golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )