Merge branch 'port-2021-07-04'

cmd/tlsdiag/client.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"gitlab.dms3.io/p2p/go-p2p-core/peer"
-	libp2ptls "gitlab.dms3.io/p2p/go-p2p-tls"
+	p2ptls "gitlab.dms3.io/p2p/go-p2p-tls"
 )
 
 func StartClient() error {
@@ -33,7 +33,7 @@ func StartClient() error {
 		return err
 	}
 	fmt.Printf(" Peer ID: %s\n", id.Pretty())
-	tp, err := libp2ptls.New(priv)
+	tp, err := p2ptls.New(priv)
 	if err != nil {
 		return err
 	}

cmd/tlsdiag/server.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"gitlab.dms3.io/p2p/go-p2p-core/peer"
-	libp2ptls "gitlab.dms3.io/p2p/go-p2p-tls"
+	p2ptls "gitlab.dms3.io/p2p/go-p2p-tls"
 )
 
 func StartServer() error {
@@ -26,7 +26,7 @@ func StartServer() error {
 		return err
 	}
 	fmt.Printf(" Peer ID: %s\n", id.Pretty())
-	tp, err := libp2ptls.New(priv)
+	tp, err := p2ptls.New(priv)
 	if err != nil {
 		return err
 	}
@@ -53,7 +53,7 @@ func StartServer() error {
 	}
 }
 
-func handleConn(tp *libp2ptls.Transport, conn net.Conn) error {
+func handleConn(tp *p2ptls.Transport, conn net.Conn) error {
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 	sconn, err := tp.SecureInbound(ctx, conn)

conn.go

-package libp2ptls
+package p2ptls
 
 import (
 	"crypto/tls"

crypto.go

-package libp2ptls
+package p2ptls
 
 import (
 	"crypto/ecdsa"
@@ -20,8 +20,8 @@ import (
 )
 
 const certValidityPeriod = 100 * 365 * 24 * time.Hour // ~100 years
-const certificatePrefix = "libp2p-tls-handshake:"
-const alpn string = "libp2p"
+const certificatePrefix = "p2p-tls-handshake:"
+const alpn string = "p2p"
 
 var extensionID = getPrefixedExtensionID([]int{1, 1})
 
@@ -121,7 +121,7 @@ func PubKeyFromCertChain(chain []*x509.Certificate) (ic.PubKey, error) {
 
 	var found bool
 	var keyExt pkix.Extension
-	// find the libp2p key extension, skipping all unknown extensions
+	// find the p2p key extension, skipping all unknown extensions
 	for _, ext := range cert.Extensions {
 		if extensionIDEqual(ext.Id, extensionID) {
 			keyExt = ext

extension.go

-package libp2ptls
+package p2ptls
 
 var extensionPrefix = []int{1, 3, 6, 1, 4, 1, 53594}
 

extension_test.go

-package libp2ptls
+package p2ptls
 
 import (
 	. "github.com/onsi/ginkgo"

libp2p_tls_suite_test.go → p2p_tls_suite_test.go

-package libp2ptls
+package p2ptls
 
 import (
 	mrand "math/rand"
@@ -8,9 +8,9 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func TestLibp2pTLS(t *testing.T) {
+func TestP2pTLS(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "libp2p TLS Suite")
+	RunSpecs(t, "p2p TLS Suite")
 }
 
 var _ = BeforeSuite(func() {

transport.go

-package libp2ptls
+package p2ptls
 
 import (
 	"context"
@@ -118,7 +118,7 @@ func (t *Transport) handshake(
 	default:
 	}
 	if remotePubKey == nil {
-		return nil, errors.New("go-libp2p-tls BUG: expected remote pub key to be set")
+		return nil, errors.New("go-p2p-tls BUG: expected remote pub key to be set")
 	}
 
 	conn, err := t.setupConn(tlsConn, remotePubKey)

transport_test.go

-package libp2ptls
+package p2ptls
 
 import (
 	"context"