merge dreadl0ck-gopacket branch, update imports back to google/gopacket

dreadl0ck · Sep 17, 2020 · 3ed9c8f · 3ed9c8f
1 parent a855823
commit 3ed9c8f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/clientHello_test.go b/clientHello_test.go
@@ -4,8 +4,8 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/dreadl0ck/gopacket"
-	"github.com/dreadl0ck/gopacket/layers"
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
 )
 
 func TestClientHello(t *testing.T) {

diff --git a/example/main.go b/example/main.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"sync"
 
-	"github.com/dreadl0ck/gopacket"
-	"github.com/dreadl0ck/gopacket/layers"
-	"github.com/dreadl0ck/gopacket/pcap"
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
+	"github.com/google/gopacket/pcap"
 	"github.com/dreadl0ck/tlsx"
 )
 

diff --git a/go.mod b/go.mod
@@ -3,6 +3,6 @@ module github.com/dreadl0ck/tlsx
 go 1.14
 
 require (
-	github.com/dreadl0ck/gopacket v1.1.16-0.20200114112008-4960f4b77557
+	github.com/google/gopacket v1.1.17
 	golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d
 )
diff --git a/go.sum b/go.sum
@@ -1,5 +1,4 @@
-github.com/dreadl0ck/gopacket v1.1.16-0.20200114112008-4960f4b77557 h1:m/rxJiRUgei39RuIVBMPipyRGokYe534vBfuARBcLnU=
-github.com/dreadl0ck/gopacket v1.1.16-0.20200114112008-4960f4b77557/go.mod h1:d7HEeaw/pAxzNTUprrDDpb7RxPsWA9i3NFp1ZfBNl50=
+github.com/google/gopacket v1.1.17 h1:rMrlX2ZY2UbvT+sdz3+6J+pp2z+msCq9MxTU6ymxbBY=
 github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw=

diff --git a/serverHello_test.go b/serverHello_test.go
@@ -4,8 +4,8 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/dreadl0ck/gopacket"
-	"github.com/dreadl0ck/gopacket/layers"
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
 )
 
 func TestServerHello(t *testing.T) {

diff --git a/utils.go b/utils.go
@@ -1,8 +1,8 @@
 package tlsx
 
 import (
-	"github.com/dreadl0ck/gopacket"
-	"github.com/dreadl0ck/gopacket/layers"
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
 )
 
 // GetServerHello returns a server hello message if the gopacket contains one