From 7bbaf23cda4a0d888bf3ebb6cb92db61c721a1bc Mon Sep 17 00:00:00 2001
From: Kris Kwiatkowski <kris@amongbytes.com>
Date: Fri, 5 Apr 2019 11:28:54 +0100
Subject: [PATCH] Changes needed to make tris a separated lib

---
 13.go                           | 6 +++---
 _dev/tris-localserver/server.go | 2 +-
 _dev/tris-testclient/client.go  | 2 +-
 cipher_suites.go                | 2 +-
 common.go                       | 2 +-
 key_agreement.go                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/13.go b/13.go
index 28f1416..6b96a6e 100644
--- a/13.go
+++ b/13.go
@@ -21,9 +21,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	sidh "github_com/cloudflare/sidh/sidh"
-	sike "github_com/cloudflare/sidh/sike"
-	"golang_org/x/crypto/curve25519"
+	sidh "github.com/cloudflare/sidh/sidh"
+	sike "github.com/cloudflare/sidh/sike"
+	"golang.org/x/crypto/curve25519"
 )
 
 // numSessionTickets is the number of different session tickets the
diff --git a/_dev/tris-localserver/server.go b/_dev/tris-localserver/server.go
index 4c7733f..2e5a3f4 100644
--- a/_dev/tris-localserver/server.go
+++ b/_dev/tris-localserver/server.go
@@ -1,12 +1,12 @@
 package main
 
 import (
-	"crypto/tls"
 	"crypto/x509"
 	"encoding/hex"
 	"errors"
 	"flag"
 	"fmt"
+	"github.com/henrydcase/trs"
 	"io/ioutil"
 	"log"
 	"net/http"
diff --git a/_dev/tris-testclient/client.go b/_dev/tris-testclient/client.go
index 71609b3..d642acc 100644
--- a/_dev/tris-testclient/client.go
+++ b/_dev/tris-testclient/client.go
@@ -1,11 +1,11 @@
 package main
 
 import (
-	"crypto/tls"
 	"crypto/x509"
 	"errors"
 	"flag"
 	"fmt"
+	"github.com/henrydcase/trs"
 	"io"
 	"log"
 	"os"
diff --git a/cipher_suites.go b/cipher_suites.go
index f7222e2..6c78d98 100644
--- a/cipher_suites.go
+++ b/cipher_suites.go
@@ -15,7 +15,7 @@ import (
 	"crypto/sha256"
 	"hash"
 
-	"golang_org/x/crypto/chacha20poly1305"
+	"golang.org/x/crypto/chacha20poly1305"
 )
 
 // a keyAgreement implements the client and server side of a TLS key agreement
diff --git a/common.go b/common.go
index 8756e7b..ce869c7 100644
--- a/common.go
+++ b/common.go
@@ -12,7 +12,7 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
-	"internal/cpu"
+	"golang.org/x/sys/cpu"
 	"io"
 	"math/big"
 	"net"
diff --git a/key_agreement.go b/key_agreement.go
index d0078ed..0e65ea3 100644
--- a/key_agreement.go
+++ b/key_agreement.go
@@ -14,7 +14,7 @@ import (
 	"io"
 	"math/big"
 
-	"golang_org/x/crypto/curve25519"
+	"golang.org/x/crypto/curve25519"
 )
 
 var errClientKeyExchange = errors.New("tls: invalid ClientKeyExchange message")