From db42c1fb73bd142f3ad33c815e977a0b17592530 Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Fri, 20 Dec 2024 14:29:06 +0100 Subject: [PATCH] Update to gopacket/gopacket --- go.mod | 39 +++++++++--------- go.sum | 40 ++++++++++++++++++- modules/dhcp6_spoof/dhcp6_spoof.go | 8 ++-- modules/dns_spoof/dns_spoof.go | 6 +-- .../http_proxy/http_proxy_base_sslstriper.go | 6 +-- modules/net_sniff/net_sniff.go | 4 +- modules/net_sniff/net_sniff_context.go | 4 +- modules/net_sniff/net_sniff_dns.go | 4 +- modules/net_sniff/net_sniff_dot11.go | 4 +- modules/net_sniff/net_sniff_ftp.go | 4 +- modules/net_sniff/net_sniff_fuzz.go | 2 +- modules/net_sniff/net_sniff_http.go | 4 +- modules/net_sniff/net_sniff_krb5.go | 4 +- modules/net_sniff/net_sniff_mdns.go | 4 +- modules/net_sniff/net_sniff_ntlm.go | 4 +- modules/net_sniff/net_sniff_parsers.go | 4 +- modules/net_sniff/net_sniff_sni.go | 4 +- modules/net_sniff/net_sniff_tcp.go | 4 +- modules/net_sniff/net_sniff_teamviewer.go | 4 +- modules/net_sniff/net_sniff_udp.go | 4 +- modules/net_sniff/net_sniff_upnp.go | 4 +- modules/net_sniff/net_sniff_views.go | 2 +- modules/syn_scan/syn_scan.go | 4 +- modules/syn_scan/syn_scan_reader.go | 4 +- modules/wifi/wifi.go | 8 ++-- modules/wifi/wifi_csa.go | 2 +- modules/wifi/wifi_recon.go | 4 +- modules/wifi/wifi_recon_handshakes.go | 8 ++-- modules/wol/wol.go | 2 +- modules/zerogod/zerogod.go | 4 +- modules/zerogod/zerogod_discovery.go | 4 +- network/net_windows.go | 4 +- network/pcap.go | 2 +- network/wifi.go | 6 +-- network/wifi_handshake.go | 4 +- packets/arp.go | 2 +- packets/dhcp6.go | 2 +- packets/dhcp6_layer.go | 4 +- packets/dhcp6_layer_test.go | 2 +- packets/dot11.go | 4 +- packets/dot11_test.go | 4 +- packets/dot11_wps.go | 4 +- packets/icmp6.go | 2 +- packets/mdns.go | 4 +- packets/nbns.go | 4 +- packets/queue.go | 6 +-- packets/serialize.go | 2 +- packets/tcp.go | 8 ++-- packets/udp.go | 2 +- packets/upnp.go | 4 +- 50 files changed, 154 insertions(+), 119 deletions(-) diff --git a/go.mod b/go.mod index b1b2dfc3..7e1e05b0 100644 --- a/go.mod +++ b/go.mod @@ -1,51 +1,50 @@ module github.com/bettercap/bettercap/v2 -go 1.21 +go 1.22.0 -toolchain go1.22.6 +toolchain go1.23.4 require ( github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d - github.com/adrianmo/go-nmea v1.9.0 - github.com/antchfx/jsonquery v1.3.5 + github.com/adrianmo/go-nmea v1.10.0 + github.com/antchfx/jsonquery v1.3.6 github.com/bettercap/gatt v0.0.0-20240808115956-ec4935e8c4a0 github.com/bettercap/nrf24 v0.0.0-20190219153547-aa37e6d0e0eb github.com/bettercap/readline v0.0.0-20210228151553-655e48bcb7bf github.com/bettercap/recording v0.0.0-20190408083647-3ce1dcf032e3 github.com/cenkalti/backoff v2.2.1+incompatible github.com/dustin/go-humanize v1.0.1 - github.com/elazarl/goproxy v0.0.0-20240726154733-8b0c20506380 + github.com/elazarl/goproxy v0.0.0-20241220120645-8fd2e765366e github.com/evilsocket/islazy v1.11.0 github.com/florianl/go-nfqueue/v2 v2.0.0 github.com/gobwas/glob v0.0.0-20181002190808-e7a84e9525fe github.com/google/go-github v17.0.0+incompatible - github.com/google/gopacket v1.1.19 github.com/google/gousb v1.1.3 + github.com/gopacket/gopacket v1.3.1 github.com/gorilla/mux v1.8.1 github.com/gorilla/websocket v1.5.3 - github.com/grandcat/zeroconf v1.0.0 github.com/hashicorp/go-bexpr v0.1.14 github.com/inconshreveable/go-vhost v1.0.0 github.com/jpillora/go-tld v1.2.1 github.com/malfunkt/iprange v0.9.0 github.com/mdlayher/dhcp6 v0.0.0-20190311162359-2a67805d7d0b - github.com/miekg/dns v1.1.61 + github.com/miekg/dns v1.1.62 github.com/mitchellh/go-homedir v1.1.0 github.com/phin1x/go-ipp v1.6.1 - github.com/robertkrimen/otto v0.4.0 + github.com/robertkrimen/otto v0.5.1 github.com/stratoberry/go-gpsd v1.3.0 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 github.com/thoj/go-ircevent v0.0.0-20210723090443-73e444401d64 - go.einride.tech/can v0.12.0 - golang.org/x/net v0.28.0 + go.einride.tech/can v0.12.1 + golang.org/x/net v0.33.0 gopkg.in/yaml.v3 v3.0.1 ) require ( - github.com/antchfx/xpath v1.3.1 // indirect + github.com/antchfx/xpath v1.3.3 // indirect github.com/chzyer/logex v1.2.1 // indirect github.com/elazarl/goproxy/ext v0.0.0-20210110162100-a92cc753f88e // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/golang/mock v1.6.0 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/go-querystring v1.1.0 // indirect @@ -54,16 +53,16 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mdlayher/netlink v1.7.2 // indirect - github.com/mdlayher/socket v0.4.1 // indirect + github.com/mdlayher/socket v0.5.1 // indirect github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect github.com/mgutz/logxi v0.0.0-20161027140823-aebf8a7d67ab // indirect - github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/pointerstructure v1.2.1 // indirect github.com/pkg/errors v0.9.1 // indirect - golang.org/x/mod v0.20.0 // indirect - golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect - golang.org/x/tools v0.24.0 // indirect + golang.org/x/mod v0.22.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect + golang.org/x/tools v0.28.0 // indirect gopkg.in/sourcemap.v1 v1.0.5 // indirect ) diff --git a/go.sum b/go.sum index a2930b76..dc086659 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,17 @@ github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpH github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo= github.com/adrianmo/go-nmea v1.9.0 h1:kCuerWLDIppltHNZ2HGdCGkqbmupYJYfE6indcGkcp8= github.com/adrianmo/go-nmea v1.9.0/go.mod h1:u8bPnpKt/D/5rll/5l9f6iDfeq5WZW0+/SXdkwix6Tg= +github.com/adrianmo/go-nmea v1.10.0 h1:L1aYaebZ4cXFCoXNSeDeQa0tApvSKvIbqMsK+iaRiCo= +github.com/adrianmo/go-nmea v1.10.0/go.mod h1:u8bPnpKt/D/5rll/5l9f6iDfeq5WZW0+/SXdkwix6Tg= github.com/antchfx/jsonquery v1.3.5 h1:243OSaQh02EfmASa3w3weKC9UaiD8RRzJhgfvq3q408= github.com/antchfx/jsonquery v1.3.5/go.mod h1:qH23yX2Jsj1/k378Yu/EOgPCNgJ35P9tiGOeQdt/GWc= +github.com/antchfx/jsonquery v1.3.6 h1:TaSfeAh7n6T11I74bsZ1FswreIfrbJ0X+OyLflx6mx4= +github.com/antchfx/jsonquery v1.3.6/go.mod h1:fGzSGJn9Y826Qd3pC8Wx45avuUwpkePsACQJYy+58BU= github.com/antchfx/xpath v1.3.1 h1:PNbFuUqHwWl0xRjvUPjJ95Agbmdj2uzzIwmQKgu4oCk= github.com/antchfx/xpath v1.3.1/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= +github.com/antchfx/xpath v1.3.2/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= +github.com/antchfx/xpath v1.3.3 h1:tmuPQa1Uye0Ym1Zn65vxPgfltWb/Lxu2jeqIGteJSRs= +github.com/antchfx/xpath v1.3.3/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= github.com/bettercap/gatt v0.0.0-20240808115956-ec4935e8c4a0 h1:HiFUGV/7eGWG/YJAf9HcKOUmxIj+7LVzC8zD57VX1qo= github.com/bettercap/gatt v0.0.0-20240808115956-ec4935e8c4a0/go.mod h1:oafnPgaBI4gqJiYkueCyR4dqygiWGXTGOE0gmmAVeeQ= github.com/bettercap/nrf24 v0.0.0-20190219153547-aa37e6d0e0eb h1:JWAAJk4ny+bT3VrtcX+e7mcmWtWUeUM0xVcocSAUuWc= @@ -28,6 +35,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/elazarl/goproxy v0.0.0-20240726154733-8b0c20506380 h1:1NyRx2f4W4WBRyg0Kys0ZbaNmDDzZ2R/C7DTi+bbsJ0= github.com/elazarl/goproxy v0.0.0-20240726154733-8b0c20506380/go.mod h1:thX175TtLTzLj3p7N/Q9IiKZ7NF+p72cvL91emV0hzo= +github.com/elazarl/goproxy v0.0.0-20241220120645-8fd2e765366e h1:OaxkCqGhibekQkMG5PfQ/MbcMXzc9PIDWmWBHqEba/Y= +github.com/elazarl/goproxy v0.0.0-20241220120645-8fd2e765366e/go.mod h1:YfEbZtqP4AetfO6d40vWchF3znWX7C7Vd6ZMfdL8z64= github.com/elazarl/goproxy/ext v0.0.0-20210110162100-a92cc753f88e h1:CQn2/8fi3kmpT9BTiHEELgdxAOQNVZc9GoPA4qnQzrs= github.com/elazarl/goproxy/ext v0.0.0-20210110162100-a92cc753f88e/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= github.com/evilsocket/islazy v1.11.0 h1:B5w6uuS6ki6iDG+aH/RFeoMb8ijQh/pGabewqp2UeJ0= @@ -38,6 +47,8 @@ github.com/gobwas/glob v0.0.0-20181002190808-e7a84e9525fe h1:8P+/htb3mwwpeGdJg69 github.com/gobwas/glob v0.0.0-20181002190808-e7a84e9525fe/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= +github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -47,10 +58,12 @@ github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4r github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= -github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= -github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= github.com/google/gousb v1.1.3 h1:xt6M5TDsGSZ+rlomz5Si5Hmd/Fvbmo2YCJHN+yGaK4o= github.com/google/gousb v1.1.3/go.mod h1:GGWUkK0gAXDzxhwrzetW592aOmkkqSGcj5KLEgmCVUg= +github.com/gopacket/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= +github.com/gopacket/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= +github.com/gopacket/gopacket v1.3.1 h1:ZppWyLrOJNZPe5XkdjLbtuTkfQoxQ0xyMJzQCqtqaPU= +github.com/gopacket/gopacket v1.3.1/go.mod h1:3I13qcqSpB2R9fFQg866OOgzylYkZxLTmkvcXhvf6qg= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= @@ -88,6 +101,8 @@ github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/ github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw= github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U= github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA= +github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos= +github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mgutz/logxi v0.0.0-20161027140823-aebf8a7d67ab h1:n8cgpHzJ5+EDyDri2s/GC7a9+qK3/YEGnBsd0uS/8PY= @@ -95,10 +110,14 @@ github.com/mgutz/logxi v0.0.0-20161027140823-aebf8a7d67ab/go.mod h1:y1pL58r5z2Vv github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs= github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ= +github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ= +github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.1 h1:ZhBBeX8tSlRpu/FFhXH4RC4OJzFlqsQhoHZAz4x7TIw= github.com/mitchellh/pointerstructure v1.2.1/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= github.com/phin1x/go-ipp v1.6.1 h1:oxJXi92BO2FZhNcG3twjnxKFH1liTQ46vbbZx+IN/80= @@ -109,6 +128,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/robertkrimen/otto v0.4.0 h1:/c0GRrK1XDPcgIasAsnlpBT5DelIeB9U/Z/JCQsgr7E= github.com/robertkrimen/otto v0.4.0/go.mod h1:uW9yN1CYflmUQYvAMS0m+ZiNo3dMzRUDQJX0jWbzgxw= +github.com/robertkrimen/otto v0.5.1 h1:avDI4ToRk8k1hppLdYFTuuzND41n37vPGJU7547dGf0= +github.com/robertkrimen/otto v0.5.1/go.mod h1:bS433I4Q9p+E5pZLu7r17vP6FkE6/wLxBdmKjoqJXF8= github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/stratoberry/go-gpsd v1.3.0 h1:JxJOEC4SgD0QY65AE7B1CtJtweP73nqJghZeLNU9J+c= github.com/stratoberry/go-gpsd v1.3.0/go.mod h1:nVf/vTgfYxOMxiQdy9BtJjojbFRtG8H3wNula++VgkU= @@ -128,6 +149,8 @@ github.com/thoj/go-ircevent v0.0.0-20210723090443-73e444401d64/go.mod h1:Q1NAJOu github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.einride.tech/can v0.12.0 h1:6MW9TKycSovWqJxcYHpZEiuFCGuAfpqApCzTS15KrPk= go.einride.tech/can v0.12.0/go.mod h1:5n3+AonCfUso6PfjD9l2d0W2LxTFjjHOnHAm+UMS9Ws= +go.einride.tech/can v0.12.1 h1:XBpAw6/pbjFJX9cybSXVNyZ4hhpLHjrj9iI58yFI53w= +go.einride.tech/can v0.12.1/go.mod h1:5n3+AonCfUso6PfjD9l2d0W2LxTFjjHOnHAm+UMS9Ws= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -137,6 +160,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20190310074541-c10a0554eabf/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -147,10 +172,14 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -167,6 +196,9 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -175,6 +207,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -182,6 +216,8 @@ golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= +golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/modules/dhcp6_spoof/dhcp6_spoof.go b/modules/dhcp6_spoof/dhcp6_spoof.go index 55c6ac6a..e06f9eb2 100644 --- a/modules/dhcp6_spoof/dhcp6_spoof.go +++ b/modules/dhcp6_spoof/dhcp6_spoof.go @@ -13,12 +13,12 @@ import ( "github.com/bettercap/bettercap/v2/packets" "github.com/bettercap/bettercap/v2/session" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" - "github.com/google/gopacket/pcap" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" + "github.com/gopacket/gopacket/pcap" // TODO: refactor to use gopacket when gopacket folks - // will fix this > https://github.com/google/gopacket/issues/334 + // will fix this > https://github.com/gopacket/gopacket/issues/334 "github.com/mdlayher/dhcp6" "github.com/mdlayher/dhcp6/dhcp6opts" diff --git a/modules/dns_spoof/dns_spoof.go b/modules/dns_spoof/dns_spoof.go index 68a8f893..97fc94e2 100644 --- a/modules/dns_spoof/dns_spoof.go +++ b/modules/dns_spoof/dns_spoof.go @@ -12,9 +12,9 @@ import ( "github.com/bettercap/bettercap/v2/packets" "github.com/bettercap/bettercap/v2/session" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" - "github.com/google/gopacket/pcap" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" + "github.com/gopacket/gopacket/pcap" "github.com/evilsocket/islazy/tui" ) diff --git a/modules/http_proxy/http_proxy_base_sslstriper.go b/modules/http_proxy/http_proxy_base_sslstriper.go index d2fd0f4f..7716745f 100644 --- a/modules/http_proxy/http_proxy_base_sslstriper.go +++ b/modules/http_proxy/http_proxy_base_sslstriper.go @@ -14,9 +14,9 @@ import ( "github.com/bettercap/bettercap/v2/session" "github.com/elazarl/goproxy" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" - "github.com/google/gopacket/pcap" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" + "github.com/gopacket/gopacket/pcap" "github.com/evilsocket/islazy/tui" diff --git a/modules/net_sniff/net_sniff.go b/modules/net_sniff/net_sniff.go index 4daa9859..84062ac1 100644 --- a/modules/net_sniff/net_sniff.go +++ b/modules/net_sniff/net_sniff.go @@ -6,8 +6,8 @@ import ( "github.com/bettercap/bettercap/v2/session" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" ) type Sniffer struct { diff --git a/modules/net_sniff/net_sniff_context.go b/modules/net_sniff/net_sniff_context.go index e275ebf8..f071cee3 100644 --- a/modules/net_sniff/net_sniff_context.go +++ b/modules/net_sniff/net_sniff_context.go @@ -9,8 +9,8 @@ import ( "github.com/bettercap/bettercap/v2/network" "github.com/bettercap/bettercap/v2/session" - "github.com/google/gopacket/pcap" - "github.com/google/gopacket/pcapgo" + "github.com/gopacket/gopacket/pcap" + "github.com/gopacket/gopacket/pcapgo" "github.com/evilsocket/islazy/tui" ) diff --git a/modules/net_sniff/net_sniff_dns.go b/modules/net_sniff/net_sniff_dns.go index 8724b0e2..4388fec3 100644 --- a/modules/net_sniff/net_sniff_dns.go +++ b/modules/net_sniff/net_sniff_dns.go @@ -1,8 +1,8 @@ package net_sniff import ( - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "net" "strings" diff --git a/modules/net_sniff/net_sniff_dot11.go b/modules/net_sniff/net_sniff_dot11.go index 5ace85d2..77aa777a 100644 --- a/modules/net_sniff/net_sniff_dot11.go +++ b/modules/net_sniff/net_sniff_dot11.go @@ -1,8 +1,8 @@ package net_sniff import ( - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" ) func onDOT11(radiotap *layers.RadioTap, dot11 *layers.Dot11, pkt gopacket.Packet, verbose bool) { diff --git a/modules/net_sniff/net_sniff_ftp.go b/modules/net_sniff/net_sniff_ftp.go index 74f477b0..8eadce8c 100644 --- a/modules/net_sniff/net_sniff_ftp.go +++ b/modules/net_sniff/net_sniff_ftp.go @@ -4,8 +4,8 @@ import ( "net" "regexp" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "github.com/evilsocket/islazy/str" "github.com/evilsocket/islazy/tui" diff --git a/modules/net_sniff/net_sniff_fuzz.go b/modules/net_sniff/net_sniff_fuzz.go index 050c1957..76d2ae45 100644 --- a/modules/net_sniff/net_sniff_fuzz.go +++ b/modules/net_sniff/net_sniff_fuzz.go @@ -4,7 +4,7 @@ import ( "math/rand" "strings" - "github.com/google/gopacket" + "github.com/gopacket/gopacket" "github.com/evilsocket/islazy/str" ) diff --git a/modules/net_sniff/net_sniff_http.go b/modules/net_sniff/net_sniff_http.go index a111c08b..3a969d1f 100644 --- a/modules/net_sniff/net_sniff_http.go +++ b/modules/net_sniff/net_sniff_http.go @@ -9,8 +9,8 @@ import ( "net/http" "strings" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "github.com/dustin/go-humanize" diff --git a/modules/net_sniff/net_sniff_krb5.go b/modules/net_sniff/net_sniff_krb5.go index 7cbe4e5a..d6a3bda2 100644 --- a/modules/net_sniff/net_sniff_krb5.go +++ b/modules/net_sniff/net_sniff_krb5.go @@ -6,8 +6,8 @@ import ( "github.com/bettercap/bettercap/v2/packets" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "github.com/evilsocket/islazy/tui" ) diff --git a/modules/net_sniff/net_sniff_mdns.go b/modules/net_sniff/net_sniff_mdns.go index 67737f68..daec320c 100644 --- a/modules/net_sniff/net_sniff_mdns.go +++ b/modules/net_sniff/net_sniff_mdns.go @@ -7,8 +7,8 @@ import ( "github.com/bettercap/bettercap/v2/packets" "github.com/bettercap/bettercap/v2/session" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "github.com/evilsocket/islazy/tui" ) diff --git a/modules/net_sniff/net_sniff_ntlm.go b/modules/net_sniff/net_sniff_ntlm.go index 5a3bfa5a..69b1c8ac 100644 --- a/modules/net_sniff/net_sniff_ntlm.go +++ b/modules/net_sniff/net_sniff_ntlm.go @@ -7,8 +7,8 @@ import ( "github.com/bettercap/bettercap/v2/packets" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "github.com/evilsocket/islazy/tui" ) diff --git a/modules/net_sniff/net_sniff_parsers.go b/modules/net_sniff/net_sniff_parsers.go index e89c7d1c..68abe56a 100644 --- a/modules/net_sniff/net_sniff_parsers.go +++ b/modules/net_sniff/net_sniff_parsers.go @@ -7,8 +7,8 @@ import ( "github.com/bettercap/bettercap/v2/log" "github.com/bettercap/bettercap/v2/packets" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "github.com/evilsocket/islazy/tui" ) diff --git a/modules/net_sniff/net_sniff_sni.go b/modules/net_sniff/net_sniff_sni.go index 3ec3a8b4..4eeb3184 100644 --- a/modules/net_sniff/net_sniff_sni.go +++ b/modules/net_sniff/net_sniff_sni.go @@ -6,8 +6,8 @@ import ( "regexp" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "github.com/evilsocket/islazy/tui" ) diff --git a/modules/net_sniff/net_sniff_tcp.go b/modules/net_sniff/net_sniff_tcp.go index 4996e798..89880c7d 100644 --- a/modules/net_sniff/net_sniff_tcp.go +++ b/modules/net_sniff/net_sniff_tcp.go @@ -4,8 +4,8 @@ import ( "fmt" "net" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "github.com/evilsocket/islazy/tui" ) diff --git a/modules/net_sniff/net_sniff_teamviewer.go b/modules/net_sniff/net_sniff_teamviewer.go index 97ee3dd3..abdd2f62 100644 --- a/modules/net_sniff/net_sniff_teamviewer.go +++ b/modules/net_sniff/net_sniff_teamviewer.go @@ -5,8 +5,8 @@ import ( "github.com/bettercap/bettercap/v2/packets" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "github.com/evilsocket/islazy/tui" ) diff --git a/modules/net_sniff/net_sniff_udp.go b/modules/net_sniff/net_sniff_udp.go index 7b528205..5f0dfb91 100644 --- a/modules/net_sniff/net_sniff_udp.go +++ b/modules/net_sniff/net_sniff_udp.go @@ -4,8 +4,8 @@ import ( "fmt" "net" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "github.com/evilsocket/islazy/tui" ) diff --git a/modules/net_sniff/net_sniff_upnp.go b/modules/net_sniff/net_sniff_upnp.go index 056f136c..706c7359 100644 --- a/modules/net_sniff/net_sniff_upnp.go +++ b/modules/net_sniff/net_sniff_upnp.go @@ -6,8 +6,8 @@ import ( "github.com/bettercap/bettercap/v2/packets" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "github.com/evilsocket/islazy/str" "github.com/evilsocket/islazy/tui" diff --git a/modules/net_sniff/net_sniff_views.go b/modules/net_sniff/net_sniff_views.go index f930cf52..5457c531 100644 --- a/modules/net_sniff/net_sniff_views.go +++ b/modules/net_sniff/net_sniff_views.go @@ -7,7 +7,7 @@ import ( "github.com/bettercap/bettercap/v2/session" "github.com/evilsocket/islazy/tui" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket/layers" ) func vIP(ip net.IP) string { diff --git a/modules/syn_scan/syn_scan.go b/modules/syn_scan/syn_scan.go index ab5be259..1670ff37 100644 --- a/modules/syn_scan/syn_scan.go +++ b/modules/syn_scan/syn_scan.go @@ -13,8 +13,8 @@ import ( "github.com/evilsocket/islazy/async" - "github.com/google/gopacket" - "github.com/google/gopacket/pcap" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/pcap" ) const synSourcePort = 666 diff --git a/modules/syn_scan/syn_scan_reader.go b/modules/syn_scan/syn_scan_reader.go index 51843a21..85e91a15 100644 --- a/modules/syn_scan/syn_scan_reader.go +++ b/modules/syn_scan/syn_scan_reader.go @@ -5,8 +5,8 @@ import ( "github.com/bettercap/bettercap/v2/network" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "github.com/evilsocket/islazy/async" ) diff --git a/modules/wifi/wifi.go b/modules/wifi/wifi.go index dea727b1..b0702c6c 100644 --- a/modules/wifi/wifi.go +++ b/modules/wifi/wifi.go @@ -17,9 +17,9 @@ import ( "github.com/bettercap/bettercap/v2/packets" "github.com/bettercap/bettercap/v2/session" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" - "github.com/google/gopacket/pcap" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" + "github.com/gopacket/gopacket/pcap" "github.com/evilsocket/islazy/fs" "github.com/evilsocket/islazy/ops" @@ -519,7 +519,7 @@ func (mod WiFiModule) Author() string { const ( // Ugly, but gopacket folks are not exporting pcap errors, so ... - // ref. https://github.com/google/gopacket/blob/96986c90e3e5c7e01deed713ff8058e357c0c047/pcap/pcap.go#L281 + // ref. https://github.com/gopacket/gopacket/blob/96986c90e3e5c7e01deed713ff8058e357c0c047/pcap/pcap.go#L281 ErrIfaceNotUp = "Interface Not Up" ) diff --git a/modules/wifi/wifi_csa.go b/modules/wifi/wifi_csa.go index e8784efc..21256ebd 100644 --- a/modules/wifi/wifi_csa.go +++ b/modules/wifi/wifi_csa.go @@ -7,7 +7,7 @@ import ( "github.com/bettercap/bettercap/v2/network" "github.com/bettercap/bettercap/v2/packets" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket/layers" ) func (mod *WiFiModule) isCSASilent() bool { diff --git a/modules/wifi/wifi_recon.go b/modules/wifi/wifi_recon.go index 4d837d5f..c1547bbc 100644 --- a/modules/wifi/wifi_recon.go +++ b/modules/wifi/wifi_recon.go @@ -8,8 +8,8 @@ import ( "github.com/bettercap/bettercap/v2/network" "github.com/bettercap/bettercap/v2/packets" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" ) func (mod *WiFiModule) stationPruner() { diff --git a/modules/wifi/wifi_recon_handshakes.go b/modules/wifi/wifi_recon_handshakes.go index 5b949231..644bc40c 100644 --- a/modules/wifi/wifi_recon_handshakes.go +++ b/modules/wifi/wifi_recon_handshakes.go @@ -11,8 +11,8 @@ import ( "github.com/bettercap/bettercap/v2/packets" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" ) func allZeros(s []byte) bool { @@ -29,8 +29,8 @@ func (mod *WiFiModule) getHandshakeFileFor(ap *network.AccessPoint) string { if !mod.shakesAggregate { parentDir := path.Dir(shakesFileName) // check for existing directory at "shakesFileName" for backwards compatibility - fileInfo, err := os.Stat(shakesFileName) - if (err == nil) && (fileInfo.IsDir()) { + fileInfo, err := os.Stat(shakesFileName) + if (err == nil) && (fileInfo.IsDir()) { parentDir = shakesFileName } shakesFileName = path.Join(parentDir, fmt.Sprintf("%s.pcap", ap.PathFriendlyName())) diff --git a/modules/wol/wol.go b/modules/wol/wol.go index 12418066..026843be 100644 --- a/modules/wol/wol.go +++ b/modules/wol/wol.go @@ -8,7 +8,7 @@ import ( "github.com/bettercap/bettercap/v2/packets" "github.com/bettercap/bettercap/v2/session" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket/layers" "github.com/evilsocket/islazy/str" "github.com/evilsocket/islazy/tui" diff --git a/modules/zerogod/zerogod.go b/modules/zerogod/zerogod.go index c2504fec..e994a6fc 100644 --- a/modules/zerogod/zerogod.go +++ b/modules/zerogod/zerogod.go @@ -9,8 +9,8 @@ import ( "github.com/bettercap/bettercap/v2/session" "github.com/bettercap/bettercap/v2/tls" "github.com/evilsocket/islazy/str" - "github.com/google/gopacket" - "github.com/google/gopacket/pcap" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/pcap" ) type ZeroGod struct { diff --git a/modules/zerogod/zerogod_discovery.go b/modules/zerogod/zerogod_discovery.go index 97d0f486..f17d5706 100644 --- a/modules/zerogod/zerogod_discovery.go +++ b/modules/zerogod/zerogod_discovery.go @@ -11,8 +11,8 @@ import ( "github.com/bettercap/bettercap/v2/session" "github.com/evilsocket/islazy/ops" "github.com/evilsocket/islazy/tui" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" ) // a service has been discovered diff --git a/network/net_windows.go b/network/net_windows.go index 00ad4af5..b9280d54 100644 --- a/network/net_windows.go +++ b/network/net_windows.go @@ -5,7 +5,7 @@ import ( "net" "strings" - "github.com/google/gopacket/pcap" + "github.com/gopacket/gopacket/pcap" ) /* @@ -56,4 +56,4 @@ func GetSupportedFrequencies(iface string) ([]int, error) { func ForceMonitorMode(iface string) error { return nil -} \ No newline at end of file +} diff --git a/network/pcap.go b/network/pcap.go index 62ec5657..25820339 100644 --- a/network/pcap.go +++ b/network/pcap.go @@ -5,7 +5,7 @@ import ( "time" "github.com/evilsocket/islazy/tui" - "github.com/google/gopacket/pcap" + "github.com/gopacket/gopacket/pcap" ) const ( diff --git a/network/wifi.go b/network/wifi.go index 2ec4b435..6c3c90e2 100644 --- a/network/wifi.go +++ b/network/wifi.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" - "github.com/google/gopacket/pcapgo" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" + "github.com/gopacket/gopacket/pcapgo" "github.com/evilsocket/islazy/data" "github.com/evilsocket/islazy/fs" diff --git a/network/wifi_handshake.go b/network/wifi_handshake.go index 29c3305b..69325ce2 100644 --- a/network/wifi_handshake.go +++ b/network/wifi_handshake.go @@ -3,8 +3,8 @@ package network import ( "sync" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" ) type Handshake struct { diff --git a/packets/arp.go b/packets/arp.go index 10816ddc..04cf1bd0 100644 --- a/packets/arp.go +++ b/packets/arp.go @@ -3,7 +3,7 @@ package packets import ( "net" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket/layers" ) func NewARPTo(from net.IP, from_hw net.HardwareAddr, to net.IP, to_hw net.HardwareAddr, req uint16) (layers.Ethernet, layers.ARP) { diff --git a/packets/dhcp6.go b/packets/dhcp6.go index 01056597..3072dc1e 100644 --- a/packets/dhcp6.go +++ b/packets/dhcp6.go @@ -3,7 +3,7 @@ package packets import ( "errors" // TODO: refactor to use gopacket when gopacket folks - // will fix this > https://github.com/google/gopacket/issues/334 + // will fix this > https://github.com/gopacket/gopacket/issues/334 "github.com/mdlayher/dhcp6" ) diff --git a/packets/dhcp6_layer.go b/packets/dhcp6_layer.go index c5e620aa..24bb5970 100644 --- a/packets/dhcp6_layer.go +++ b/packets/dhcp6_layer.go @@ -1,8 +1,8 @@ package packets import ( - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" ) type DHCPv6Layer struct { diff --git a/packets/dhcp6_layer_test.go b/packets/dhcp6_layer_test.go index af151a43..3aeb0dce 100644 --- a/packets/dhcp6_layer_test.go +++ b/packets/dhcp6_layer_test.go @@ -1,7 +1,7 @@ package packets import ( - "github.com/google/gopacket" + "github.com/gopacket/gopacket" "testing" ) diff --git a/packets/dot11.go b/packets/dot11.go index 38110949..9c265bd0 100644 --- a/packets/dot11.go +++ b/packets/dot11.go @@ -6,8 +6,8 @@ import ( "github.com/bettercap/bettercap/v2/network" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" ) var ( diff --git a/packets/dot11_test.go b/packets/dot11_test.go index e06b6f06..35b9ddd5 100644 --- a/packets/dot11_test.go +++ b/packets/dot11_test.go @@ -1,8 +1,8 @@ package packets import ( - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" "net" "reflect" "testing" diff --git a/packets/dot11_wps.go b/packets/dot11_wps.go index 038dd084..cbf3484a 100644 --- a/packets/dot11_wps.go +++ b/packets/dot11_wps.go @@ -7,8 +7,8 @@ import ( "fmt" "net" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" ) var ( diff --git a/packets/icmp6.go b/packets/icmp6.go index 4abc0801..87e24acb 100644 --- a/packets/icmp6.go +++ b/packets/icmp6.go @@ -1,7 +1,7 @@ package packets import ( - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket/layers" "net" ) diff --git a/packets/mdns.go b/packets/mdns.go index 2bcddf5a..08893210 100644 --- a/packets/mdns.go +++ b/packets/mdns.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/evilsocket/islazy/str" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" ) const MDNSPort = 5353 diff --git a/packets/nbns.go b/packets/nbns.go index 6c8fc46f..c66b7d30 100644 --- a/packets/nbns.go +++ b/packets/nbns.go @@ -5,8 +5,8 @@ import ( "github.com/evilsocket/islazy/str" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" ) const ( diff --git a/packets/queue.go b/packets/queue.go index abfeca02..874fe0f4 100644 --- a/packets/queue.go +++ b/packets/queue.go @@ -9,9 +9,9 @@ import ( "github.com/bettercap/bettercap/v2/network" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" - "github.com/google/gopacket/pcap" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" + "github.com/gopacket/gopacket/pcap" ) type Activity struct { diff --git a/packets/serialize.go b/packets/serialize.go index 7bf52c2d..ff63cabe 100644 --- a/packets/serialize.go +++ b/packets/serialize.go @@ -1,7 +1,7 @@ package packets import ( - "github.com/google/gopacket" + "github.com/gopacket/gopacket" ) var SerializationOptions = gopacket.SerializeOptions{ diff --git a/packets/tcp.go b/packets/tcp.go index 5beb79ab..9427fdfd 100644 --- a/packets/tcp.go +++ b/packets/tcp.go @@ -1,7 +1,7 @@ package packets import ( - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket/layers" "net" ) @@ -37,11 +37,11 @@ func NewTCPSyn(from net.IP, from_hw net.HardwareAddr, to net.IP, to_hw net.Hardw EthernetType: layers.EthernetTypeIPv6, } ip6 := layers.IPv6{ - Version: 6, + Version: 6, NextHeader: layers.IPProtocolTCP, HopLimit: 64, - SrcIP: from, - DstIP: to, + SrcIP: from, + DstIP: to, } tcp := layers.TCP{ SrcPort: layers.TCPPort(srcPort), diff --git a/packets/udp.go b/packets/udp.go index a8e86002..ace8baed 100644 --- a/packets/udp.go +++ b/packets/udp.go @@ -1,7 +1,7 @@ package packets import ( - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket/layers" "net" ) diff --git a/packets/upnp.go b/packets/upnp.go index b29c5fcf..4123fe79 100644 --- a/packets/upnp.go +++ b/packets/upnp.go @@ -10,8 +10,8 @@ import ( "github.com/evilsocket/islazy/str" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" + "github.com/gopacket/gopacket" + "github.com/gopacket/gopacket/layers" ) const (