Move everything under v2

alphasoc · Apr 4, 2024 · 2b4fd4c · 2b4fd4c
1 parent b329a50
commit 2b4fd4c
Show file tree

Hide file tree

Showing 888 changed files with 56,832 additions and 26,449 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 Download the latest flightsim binary for your OS from the [GitHub Releases](https://github.com/alphasoc/flightsim/releases) page. Alternatively, the utility can be built using [Golang](https://golang.org/doc/install) in any environment (e.g. Linux, MacOS, Windows), as follows:
 
 ```
-go install github.com/alphasoc/flightsim@latest
+go install github.com/alphasoc/flightsim/v2@latest
 ```
 
 ## Running Network Flight Simulator

diff --git a/go.mod b/go.mod
diff --git a/cmd/get/get.go → v2/cmd/get/get.go b/cmd/get/get.go → v2/cmd/get/get.go
@@ -9,7 +9,7 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/alphasoc/flightsim/wisdom"
+	"github.com/alphasoc/flightsim/v2/wisdom"
 )
 
 var Version string

diff --git a/cmd/run/print.go → v2/cmd/run/print.go b/cmd/run/print.go → v2/cmd/run/print.go
diff --git a/cmd/run/run.go → v2/cmd/run/run.go b/cmd/run/run.go → v2/cmd/run/run.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/alphasoc/flightsim/simulator"
-	"github.com/alphasoc/flightsim/utils"
-	"github.com/alphasoc/flightsim/wisdom"
+	"github.com/alphasoc/flightsim/v2/simulator"
+	"github.com/alphasoc/flightsim/v2/utils"
+	"github.com/alphasoc/flightsim/v2/wisdom"
 )
 
 var (

diff --git a/v2/go.mod b/v2/go.mod
@@ -0,0 +1,14 @@
+module github.com/alphasoc/flightsim/v2
+
+go 1.19
+
+require (
+	github.com/cretz/bine v0.2.0
+	github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf
+	github.com/lrstanley/girc v0.0.0-20240317214256-a4a3d96369cb
+	github.com/pkg/errors v0.9.1
+	golang.org/x/crypto v0.21.0
+	golang.org/x/net v0.23.0
+)
+
+require golang.org/x/sys v0.18.0 // indirect
diff --git a/go.sum → v2/go.sum b/go.sum → v2/go.sum
@@ -2,29 +2,30 @@ github.com/cretz/bine v0.2.0 h1:8GiDRGlTgz+o8H9DSnsl+5MeBK4HsExxgl6WgzOCuZo=
 github.com/cretz/bine v0.2.0/go.mod h1:WU4o9QR9wWp8AVKtTM1XD5vUHkEqnf2vVSo6dBqbetI=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/inhies/go-bytesize v0.0.0-20201103132853-d0aed0d254f8 h1:RrGCja4Grfz7QM2hw+SUZIYlbHoqBfbvzlWRT3seXB8=
-github.com/inhies/go-bytesize v0.0.0-20201103132853-d0aed0d254f8/go.mod h1:KrtyD5PFj++GKkFS/7/RRrfnRhAMGQwy75GLCHWrCNs=
-github.com/lrstanley/girc v0.0.0-20230507010347-3c8fa7715074 h1:Uuzmwjx9dzTIfh9bdK9l5y9DQgpmgEFaifJGB5jHxb4=
-github.com/lrstanley/girc v0.0.0-20230507010347-3c8fa7715074/go.mod h1:lgrnhcF8bg/Bd5HA5DOb4Z+uGqUqGnp4skr+J2GwVgI=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf h1:FtEj8sfIcaaBfAKrE1Cwb61YDtYq9JxChK1c7AKce7s=
+github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf/go.mod h1:yrqSXGoD/4EKfF26AOGzscPOgTTJcyAwM2rpixWT+t4=
+github.com/lrstanley/girc v0.0.0-20240317214256-a4a3d96369cb h1:k2h6Qb3FPzxq/Dh43WOfuzIUs9g3PUGbV01UQccNLMI=
+github.com/lrstanley/girc v0.0.0-20240317214256-a4a3d96369cb/go.mod h1:lgrnhcF8bg/Bd5HA5DOb4Z+uGqUqGnp4skr+J2GwVgI=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210525063256-abc453219eb5 h1:wjuX4b5yYQnEQHzd+CBcrcC6OVR2J1CN6mUy0oSxIPo=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.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.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

diff --git a/main.go → v2/main.go b/main.go → v2/main.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/alphasoc/flightsim/cmd/get"
-	"github.com/alphasoc/flightsim/cmd/run"
+	"github.com/alphasoc/flightsim/v2/cmd/get"
+	"github.com/alphasoc/flightsim/v2/cmd/run"
 )
 
 var Version = ""

diff --git a/simulator/cleartext-protocol.go → v2/simulator/cleartext-protocol.go b/simulator/cleartext-protocol.go → v2/simulator/cleartext-protocol.go
diff --git a/simulator/dga.go → v2/simulator/dga.go b/simulator/dga.go → v2/simulator/dga.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/alphasoc/flightsim/utils"
+	"github.com/alphasoc/flightsim/v2/utils"
 )
 
 var dgaTLDs = []string{".com", ".net", ".biz", ".top", ".info", ".xyz", ".space"}

diff --git a/simulator/hijack.go → v2/simulator/hijack.go b/simulator/hijack.go → v2/simulator/hijack.go
diff --git a/simulator/irc.go → v2/simulator/irc.go b/simulator/irc.go → v2/simulator/irc.go
diff --git a/simulator/miner.go → v2/simulator/miner.go b/simulator/miner.go → v2/simulator/miner.go
diff --git a/simulator/oast.go → v2/simulator/oast.go b/simulator/oast.go → v2/simulator/oast.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/alphasoc/flightsim/utils"
+	"github.com/alphasoc/flightsim/v2/utils"
 )
 
 // InteractshDefaultDomains is a list of default domains used by Interactsh.

diff --git a/simulator/scan.go → v2/simulator/scan.go b/simulator/scan.go → v2/simulator/scan.go
diff --git a/simulator/scan_test.go → v2/simulator/scan_test.go b/simulator/scan_test.go → v2/simulator/scan_test.go
diff --git a/simulator/simulator.go → v2/simulator/simulator.go b/simulator/simulator.go → v2/simulator/simulator.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/alphasoc/flightsim/utils"
+	"github.com/alphasoc/flightsim/v2/utils"
 )
 
 // HostMsgFormatter allows a simulator to implement a custom HostMsg method to be called in

diff --git a/simulator/simulator_test.go → v2/simulator/simulator_test.go b/simulator/simulator_test.go → v2/simulator/simulator_test.go
diff --git a/simulator/spambot.go → v2/simulator/spambot.go b/simulator/spambot.go → v2/simulator/spambot.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/alphasoc/flightsim/utils"
+	"github.com/alphasoc/flightsim/v2/utils"
 )
 
-//List of domain from https://github.com/mailcheck/mailcheck/wiki/List-of-Popular-Domains
+// List of domain from https://github.com/mailcheck/mailcheck/wiki/List-of-Popular-Domains
 var domains = []string{
 	/* Default domains included */
 	"aol.com", "att.net", "comcast.net", "facebook.com", "gmail.com", "gmx.com", "googlemail.com",

diff --git a/simulator/ssh-exfil.go → v2/simulator/ssh-exfil.go b/simulator/ssh-exfil.go → v2/simulator/ssh-exfil.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math/rand"
 
-	simssh "github.com/alphasoc/flightsim/simulator/ssh"
+	simssh "github.com/alphasoc/flightsim/v2/simulator/ssh"
 	bytesize "github.com/inhies/go-bytesize"
 )
 

diff --git a/simulator/ssh-transfer.go → v2/simulator/ssh-transfer.go b/simulator/ssh-transfer.go → v2/simulator/ssh-transfer.go
@@ -6,8 +6,8 @@ import (
 	"net"
 	"strings"
 
-	simssh "github.com/alphasoc/flightsim/simulator/ssh"
-	"github.com/alphasoc/flightsim/utils"
+	simssh "github.com/alphasoc/flightsim/v2/simulator/ssh"
+	"github.com/alphasoc/flightsim/v2/utils"
 	"golang.org/x/crypto/ssh"
 
 	bytesize "github.com/inhies/go-bytesize"

diff --git a/simulator/ssh/auth.go → v2/simulator/ssh/auth.go b/simulator/ssh/auth.go → v2/simulator/ssh/auth.go
diff --git a/simulator/ssh/client.go → v2/simulator/ssh/client.go b/simulator/ssh/client.go → v2/simulator/ssh/client.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/alphasoc/flightsim/simulator/ssh/fxp"
+	"github.com/alphasoc/flightsim/v2/simulator/ssh/fxp"
 	"github.com/inhies/go-bytesize"
 	"golang.org/x/crypto/ssh"
 )

diff --git a/simulator/ssh/fxp/fxp.go → v2/simulator/ssh/fxp/fxp.go b/simulator/ssh/fxp/fxp.go → v2/simulator/ssh/fxp/fxp.go
@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"errors"
 
-	"github.com/alphasoc/flightsim/utils"
+	"github.com/alphasoc/flightsim/v2/utils"
 )
 
 // Only SSH_FX_OK error code is needed for our purposes.

diff --git a/simulator/ssh/packet.go → v2/simulator/ssh/packet.go b/simulator/ssh/packet.go → v2/simulator/ssh/packet.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/alphasoc/flightsim/simulator/ssh/fxp"
-	"github.com/alphasoc/flightsim/utils"
+	"github.com/alphasoc/flightsim/v2/simulator/ssh/fxp"
+	"github.com/alphasoc/flightsim/v2/utils"
 )
 
 // Packet interface represents specific sftp packet type (data section to be exact)
@@ -101,8 +101,9 @@ func OpenResp(data []byte) (*fxp.Handle, error) {
 
 // StatusResp parses an SSH/SFTP status response.  A status response may be returned
 // for any client request.  In particular, we care about:
-//   1. status responses to write requests (success/error cases).
-//   2. status responses carrying errors.
+//  1. status responses to write requests (success/error cases).
+//  2. status responses carrying errors.
+//
 // A Status packet and an error are returned.
 func StatusResp(data []byte) (*fxp.Status, error) {
 	status := &fxp.Status{}

diff --git a/simulator/ssh/scope.go → v2/simulator/ssh/scope.go b/simulator/ssh/scope.go → v2/simulator/ssh/scope.go
diff --git a/simulator/telegram-bot.go → v2/simulator/telegram-bot.go b/simulator/telegram-bot.go → v2/simulator/telegram-bot.go
diff --git a/simulator/tor.go → v2/simulator/tor.go b/simulator/tor.go → v2/simulator/tor.go
diff --git a/simulator/tunnel-dns.go → v2/simulator/tunnel-dns.go b/simulator/tunnel-dns.go → v2/simulator/tunnel-dns.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/alphasoc/flightsim/utils"
+	"github.com/alphasoc/flightsim/v2/utils"
 )
 
 // Tunnel simulator.

diff --git a/simulator/tunnel-icmp.go → v2/simulator/tunnel-icmp.go b/simulator/tunnel-icmp.go → v2/simulator/tunnel-icmp.go
diff --git a/utils/conn.go → v2/utils/conn.go b/utils/conn.go → v2/utils/conn.go
diff --git a/utils/marshal.go → v2/utils/marshal.go b/utils/marshal.go → v2/utils/marshal.go
diff --git a/utils/net.go → v2/utils/net.go b/utils/net.go → v2/utils/net.go
diff --git a/utils/rand.go → v2/utils/rand.go b/utils/rand.go → v2/utils/rand.go
diff --git a/utils/rand_test.go → v2/utils/rand_test.go b/utils/rand_test.go → v2/utils/rand_test.go
diff --git a/vendor/github.com/cretz/bine/LICENSE → v2/vendor/github.com/cretz/bine/LICENSE b/vendor/github.com/cretz/bine/LICENSE → v2/vendor/github.com/cretz/bine/LICENSE
diff --git a/...om/cretz/bine/control/cmd_authenticate.go → ...om/cretz/bine/control/cmd_authenticate.go b/...om/cretz/bine/control/cmd_authenticate.go → ...om/cretz/bine/control/cmd_authenticate.go
diff --git a/...hub.com/cretz/bine/control/cmd_circuit.go → ...hub.com/cretz/bine/control/cmd_circuit.go b/...hub.com/cretz/bine/control/cmd_circuit.go → ...hub.com/cretz/bine/control/cmd_circuit.go
diff --git a/...github.com/cretz/bine/control/cmd_conf.go → ...github.com/cretz/bine/control/cmd_conf.go b/...github.com/cretz/bine/control/cmd_conf.go → ...github.com/cretz/bine/control/cmd_conf.go
diff --git a/...ithub.com/cretz/bine/control/cmd_event.go → ...ithub.com/cretz/bine/control/cmd_event.go b/...ithub.com/cretz/bine/control/cmd_event.go → ...ithub.com/cretz/bine/control/cmd_event.go
diff --git a/...m/cretz/bine/control/cmd_hiddenservice.go → ...m/cretz/bine/control/cmd_hiddenservice.go b/...m/cretz/bine/control/cmd_hiddenservice.go → ...m/cretz/bine/control/cmd_hiddenservice.go
diff --git a/...github.com/cretz/bine/control/cmd_misc.go → ...github.com/cretz/bine/control/cmd_misc.go b/...github.com/cretz/bine/control/cmd_misc.go → ...github.com/cretz/bine/control/cmd_misc.go
diff --git a/...ithub.com/cretz/bine/control/cmd_onion.go → ...ithub.com/cretz/bine/control/cmd_onion.go b/...ithub.com/cretz/bine/control/cmd_onion.go → ...ithub.com/cretz/bine/control/cmd_onion.go
diff --git a/...om/cretz/bine/control/cmd_protocolinfo.go → ...om/cretz/bine/control/cmd_protocolinfo.go b/...om/cretz/bine/control/cmd_protocolinfo.go → ...om/cretz/bine/control/cmd_protocolinfo.go
diff --git a/...thub.com/cretz/bine/control/cmd_stream.go → ...thub.com/cretz/bine/control/cmd_stream.go b/...thub.com/cretz/bine/control/cmd_stream.go → ...thub.com/cretz/bine/control/cmd_stream.go
diff --git a/vendor/github.com/cretz/bine/control/conn.go → ...dor/github.com/cretz/bine/control/conn.go b/vendor/github.com/cretz/bine/control/conn.go → ...dor/github.com/cretz/bine/control/conn.go
diff --git a/vendor/github.com/cretz/bine/control/doc.go → ...ndor/github.com/cretz/bine/control/doc.go b/vendor/github.com/cretz/bine/control/doc.go → ...ndor/github.com/cretz/bine/control/doc.go
diff --git a/...r/github.com/cretz/bine/control/keyval.go → ...r/github.com/cretz/bine/control/keyval.go b/...r/github.com/cretz/bine/control/keyval.go → ...r/github.com/cretz/bine/control/keyval.go
diff --git a/...github.com/cretz/bine/control/response.go → ...github.com/cretz/bine/control/response.go b/...github.com/cretz/bine/control/response.go → ...github.com/cretz/bine/control/response.go
diff --git a/...r/github.com/cretz/bine/control/status.go → ...r/github.com/cretz/bine/control/status.go b/...r/github.com/cretz/bine/control/status.go → ...r/github.com/cretz/bine/control/status.go
diff --git a/.../github.com/cretz/bine/process/process.go → .../github.com/cretz/bine/process/process.go b/.../github.com/cretz/bine/process/process.go → .../github.com/cretz/bine/process/process.go
diff --git a/vendor/github.com/cretz/bine/tor/dialer.go → ...endor/github.com/cretz/bine/tor/dialer.go b/vendor/github.com/cretz/bine/tor/dialer.go → ...endor/github.com/cretz/bine/tor/dialer.go
diff --git a/vendor/github.com/cretz/bine/tor/doc.go → v2/vendor/github.com/cretz/bine/tor/doc.go b/vendor/github.com/cretz/bine/tor/doc.go → v2/vendor/github.com/cretz/bine/tor/doc.go
diff --git a/vendor/github.com/cretz/bine/tor/listen.go → ...endor/github.com/cretz/bine/tor/listen.go b/vendor/github.com/cretz/bine/tor/listen.go → ...endor/github.com/cretz/bine/tor/listen.go
diff --git a/vendor/github.com/cretz/bine/tor/log.go → v2/vendor/github.com/cretz/bine/tor/log.go b/vendor/github.com/cretz/bine/tor/log.go → v2/vendor/github.com/cretz/bine/tor/log.go
diff --git a/vendor/github.com/cretz/bine/tor/tor.go → v2/vendor/github.com/cretz/bine/tor/tor.go b/vendor/github.com/cretz/bine/tor/tor.go → v2/vendor/github.com/cretz/bine/tor/tor.go
diff --git a/vendor/github.com/cretz/bine/torutil/doc.go → ...ndor/github.com/cretz/bine/torutil/doc.go b/vendor/github.com/cretz/bine/torutil/doc.go → ...ndor/github.com/cretz/bine/torutil/doc.go
diff --git a/...com/cretz/bine/torutil/ed25519/ed25519.go → ...com/cretz/bine/torutil/ed25519/ed25519.go b/...com/cretz/bine/torutil/ed25519/ed25519.go → ...com/cretz/bine/torutil/ed25519/ed25519.go
diff --git a/...l/ed25519/internal/edwards25519/README.md → ...l/ed25519/internal/edwards25519/README.md b/...l/ed25519/internal/edwards25519/README.md → ...l/ed25519/internal/edwards25519/README.md
diff --git a/...il/ed25519/internal/edwards25519/const.go → ...il/ed25519/internal/edwards25519/const.go b/...il/ed25519/internal/edwards25519/const.go → ...il/ed25519/internal/edwards25519/const.go
diff --git a/...519/internal/edwards25519/edwards25519.go → ...519/internal/edwards25519/edwards25519.go b/...519/internal/edwards25519/edwards25519.go → ...519/internal/edwards25519/edwards25519.go
diff --git a/vendor/github.com/cretz/bine/torutil/key.go → ...ndor/github.com/cretz/bine/torutil/key.go b/vendor/github.com/cretz/bine/torutil/key.go → ...ndor/github.com/cretz/bine/torutil/key.go
diff --git a/...r/github.com/cretz/bine/torutil/string.go → ...r/github.com/cretz/bine/torutil/string.go b/...r/github.com/cretz/bine/torutil/string.go → ...r/github.com/cretz/bine/torutil/string.go
diff --git a/vendor/github.com/inhies/go-bytesize/LICENSE → ...dor/github.com/inhies/go-bytesize/LICENSE b/vendor/github.com/inhies/go-bytesize/LICENSE → ...dor/github.com/inhies/go-bytesize/LICENSE
diff --git a/...r/github.com/inhies/go-bytesize/README.md → ...r/github.com/inhies/go-bytesize/README.md b/...r/github.com/inhies/go-bytesize/README.md → ...r/github.com/inhies/go-bytesize/README.md
diff --git a/...github.com/inhies/go-bytesize/bytesize.go → ...github.com/inhies/go-bytesize/bytesize.go b/...github.com/inhies/go-bytesize/bytesize.go → ...github.com/inhies/go-bytesize/bytesize.go
diff --git a/vendor/github.com/lrstanley/girc/LICENSE → v2/vendor/github.com/lrstanley/girc/LICENSE b/vendor/github.com/lrstanley/girc/LICENSE → v2/vendor/github.com/lrstanley/girc/LICENSE
diff --git a/vendor/github.com/lrstanley/girc/README.md → ...endor/github.com/lrstanley/girc/README.md b/vendor/github.com/lrstanley/girc/README.md → ...endor/github.com/lrstanley/girc/README.md
diff --git a/vendor/github.com/lrstanley/girc/builtin.go → ...ndor/github.com/lrstanley/girc/builtin.go b/vendor/github.com/lrstanley/girc/builtin.go → ...ndor/github.com/lrstanley/girc/builtin.go
diff --git a/vendor/github.com/lrstanley/girc/cap.go → v2/vendor/github.com/lrstanley/girc/cap.go b/vendor/github.com/lrstanley/girc/cap.go → v2/vendor/github.com/lrstanley/girc/cap.go
diff --git a/vendor/github.com/lrstanley/girc/cap_sasl.go → ...dor/github.com/lrstanley/girc/cap_sasl.go b/vendor/github.com/lrstanley/girc/cap_sasl.go → ...dor/github.com/lrstanley/girc/cap_sasl.go
diff --git a/vendor/github.com/lrstanley/girc/cap_tags.go → ...dor/github.com/lrstanley/girc/cap_tags.go b/vendor/github.com/lrstanley/girc/cap_tags.go → ...dor/github.com/lrstanley/girc/cap_tags.go
diff --git a/vendor/github.com/lrstanley/girc/client.go → ...endor/github.com/lrstanley/girc/client.go b/vendor/github.com/lrstanley/girc/client.go → ...endor/github.com/lrstanley/girc/client.go
diff --git a/vendor/github.com/lrstanley/girc/commands.go → ...dor/github.com/lrstanley/girc/commands.go b/vendor/github.com/lrstanley/girc/commands.go → ...dor/github.com/lrstanley/girc/commands.go
diff --git a/vendor/github.com/lrstanley/girc/conn.go → v2/vendor/github.com/lrstanley/girc/conn.go b/vendor/github.com/lrstanley/girc/conn.go → v2/vendor/github.com/lrstanley/girc/conn.go
diff --git a/...or/github.com/lrstanley/girc/constants.go → ...or/github.com/lrstanley/girc/constants.go b/...or/github.com/lrstanley/girc/constants.go → ...or/github.com/lrstanley/girc/constants.go
diff --git a/vendor/github.com/lrstanley/girc/ctcp.go → v2/vendor/github.com/lrstanley/girc/ctcp.go b/vendor/github.com/lrstanley/girc/ctcp.go → v2/vendor/github.com/lrstanley/girc/ctcp.go
diff --git a/vendor/github.com/lrstanley/girc/doc.go → v2/vendor/github.com/lrstanley/girc/doc.go b/vendor/github.com/lrstanley/girc/doc.go → v2/vendor/github.com/lrstanley/girc/doc.go
diff --git a/vendor/github.com/lrstanley/girc/event.go → v2/vendor/github.com/lrstanley/girc/event.go b/vendor/github.com/lrstanley/girc/event.go → v2/vendor/github.com/lrstanley/girc/event.go
diff --git a/vendor/github.com/lrstanley/girc/format.go → ...endor/github.com/lrstanley/girc/format.go b/vendor/github.com/lrstanley/girc/format.go → ...endor/github.com/lrstanley/girc/format.go
diff --git a/vendor/github.com/lrstanley/girc/handler.go → ...ndor/github.com/lrstanley/girc/handler.go b/vendor/github.com/lrstanley/girc/handler.go → ...ndor/github.com/lrstanley/girc/handler.go
diff --git a/...tanley/girc/internal/ctxgroup/ctxgroup.go → ...tanley/girc/internal/ctxgroup/ctxgroup.go b/...tanley/girc/internal/ctxgroup/ctxgroup.go → ...tanley/girc/internal/ctxgroup/ctxgroup.go
diff --git a/vendor/github.com/lrstanley/girc/modes.go → v2/vendor/github.com/lrstanley/girc/modes.go b/vendor/github.com/lrstanley/girc/modes.go → v2/vendor/github.com/lrstanley/girc/modes.go
diff --git a/vendor/github.com/lrstanley/girc/state.go → v2/vendor/github.com/lrstanley/girc/state.go b/vendor/github.com/lrstanley/girc/state.go → v2/vendor/github.com/lrstanley/girc/state.go
diff --git a/vendor/github.com/pkg/errors/LICENSE → v2/vendor/github.com/pkg/errors/LICENSE b/vendor/github.com/pkg/errors/LICENSE → v2/vendor/github.com/pkg/errors/LICENSE
diff --git a/v2/vendor/github.com/pkg/errors/Makefile b/v2/vendor/github.com/pkg/errors/Makefile
diff --git a/vendor/github.com/pkg/errors/README.md → v2/vendor/github.com/pkg/errors/README.md b/vendor/github.com/pkg/errors/README.md → v2/vendor/github.com/pkg/errors/README.md
diff --git a/vendor/github.com/pkg/errors/appveyor.yml → v2/vendor/github.com/pkg/errors/appveyor.yml b/vendor/github.com/pkg/errors/appveyor.yml → v2/vendor/github.com/pkg/errors/appveyor.yml