Skip to content

Commit 3afb90d

Browse files
Ne0nd0gNe0nd0g
committed
Fix module semantic versioning
1 parent 66b5cd2 commit 3afb90d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+158
-159
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BUILD=$(shell git rev-parse HEAD)
1717
DIR=bin/v${VERSION}/${BUILD}
1818

1919
# Merlin Agent Variables
20-
XBUILD=-X "github.com/Ne0nd0g/merlin-agent/core.Build=${BUILD}"
20+
XBUILD=-X "github.com/Ne0nd0g/merlin-agent/v2/core.Build=${BUILD}"
2121
URL ?= https://127.0.0.1:443
2222
XURL=-X "main.url=${URL}"
2323
PSK ?= merlin

‎agent/agent.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import (
3434
"github.com/google/uuid"
3535

3636
// Internal
37-
"github.com/Ne0nd0g/merlin-agent/cli"
38-
merlinOS "github.com/Ne0nd0g/merlin-agent/os"
37+
"github.com/Ne0nd0g/merlin-agent/v2/cli"
38+
merlinOS "github.com/Ne0nd0g/merlin-agent/v2/os"
3939
)
4040

4141
// Agent is an aggregate structure that represents a Merlin Agent

‎agent/memory/memory.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"time"
2929

3030
// Internal
31-
"github.com/Ne0nd0g/merlin-agent/agent"
31+
"github.com/Ne0nd0g/merlin-agent/v2/agent"
3232
)
3333

3434
// Repository is the structure that implements the in-memory repository for interacting with the Agent's C2 client

‎authenticators/opaque/opaque.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import (
3737
"github.com/Ne0nd0g/merlin-message/opaque"
3838

3939
// Internal
40-
"github.com/Ne0nd0g/merlin-agent/cli"
41-
"github.com/Ne0nd0g/merlin-agent/core"
40+
"github.com/Ne0nd0g/merlin-agent/v2/cli"
41+
"github.com/Ne0nd0g/merlin-agent/v2/core"
4242
)
4343

4444
// Authenticator is a structure used for OPAQUE authentication

‎cli/cli.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/fatih/color"
2626

2727
// Internal
28-
"github.com/Ne0nd0g/merlin-agent/core"
28+
"github.com/Ne0nd0g/merlin-agent/v2/core"
2929
)
3030

3131
const (

‎clients/http/http.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,22 @@ import (
5555
"github.com/Ne0nd0g/merlin-message"
5656

5757
// Internal
58-
"github.com/Ne0nd0g/merlin-agent/authenticators"
59-
"github.com/Ne0nd0g/merlin-agent/authenticators/none"
60-
oAuth "github.com/Ne0nd0g/merlin-agent/authenticators/opaque"
61-
"github.com/Ne0nd0g/merlin-agent/cli"
62-
"github.com/Ne0nd0g/merlin-agent/clients/memory"
63-
"github.com/Ne0nd0g/merlin-agent/clients/utls"
64-
"github.com/Ne0nd0g/merlin-agent/core"
65-
"github.com/Ne0nd0g/merlin-agent/services/p2p"
66-
transformer "github.com/Ne0nd0g/merlin-agent/transformers"
67-
"github.com/Ne0nd0g/merlin-agent/transformers/encoders/base64"
68-
"github.com/Ne0nd0g/merlin-agent/transformers/encoders/gob"
69-
"github.com/Ne0nd0g/merlin-agent/transformers/encoders/hex"
70-
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/aes"
71-
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/jwe"
72-
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/rc4"
73-
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/xor"
58+
"github.com/Ne0nd0g/merlin-agent/v2/authenticators"
59+
"github.com/Ne0nd0g/merlin-agent/v2/authenticators/none"
60+
oAuth "github.com/Ne0nd0g/merlin-agent/v2/authenticators/opaque"
61+
"github.com/Ne0nd0g/merlin-agent/v2/cli"
62+
"github.com/Ne0nd0g/merlin-agent/v2/clients/memory"
63+
"github.com/Ne0nd0g/merlin-agent/v2/clients/utls"
64+
"github.com/Ne0nd0g/merlin-agent/v2/core"
65+
"github.com/Ne0nd0g/merlin-agent/v2/services/p2p"
66+
transformer "github.com/Ne0nd0g/merlin-agent/v2/transformers"
67+
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/base64"
68+
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/gob"
69+
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/hex"
70+
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/aes"
71+
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/jwe"
72+
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/rc4"
73+
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/xor"
7474
)
7575

7676
// Client is a type of MerlinClient that is used to send and receive Merlin messages from the Merlin server

‎clients/memory/memory.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"sync"
2828

2929
// Internal
30-
"github.com/Ne0nd0g/merlin-agent/clients"
30+
"github.com/Ne0nd0g/merlin-agent/v2/clients"
3131
)
3232

3333
// Repository is the structure that implements the in-memory repository for interacting with the Agent's C2 client

‎clients/mythic/mythic.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ import (
5858
"github.com/Ne0nd0g/merlin-message/jobs"
5959

6060
// Internal
61-
"github.com/Ne0nd0g/merlin-agent/cli"
62-
"github.com/Ne0nd0g/merlin-agent/clients"
63-
"github.com/Ne0nd0g/merlin-agent/clients/utls"
64-
"github.com/Ne0nd0g/merlin-agent/core"
61+
"github.com/Ne0nd0g/merlin-agent/v2/cli"
62+
"github.com/Ne0nd0g/merlin-agent/v2/clients"
63+
"github.com/Ne0nd0g/merlin-agent/v2/clients/utls"
64+
"github.com/Ne0nd0g/merlin-agent/v2/core"
6565
)
6666

6767
// socksConnection is used to map the Mythic incremental integer used for tracking connections to a UUID leveraged by the agent

‎clients/smb/smb.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import (
3737
"github.com/Ne0nd0g/merlin-message"
3838

3939
// Internal
40-
"github.com/Ne0nd0g/merlin-agent/authenticators"
41-
transformer "github.com/Ne0nd0g/merlin-agent/transformers"
40+
"github.com/Ne0nd0g/merlin-agent/v2/authenticators"
41+
transformer "github.com/Ne0nd0g/merlin-agent/v2/transformers"
4242
)
4343

4444
// Client is a type of MerlinClient that is used to send and receive Merlin messages from the Merlin server

‎clients/smb/smb_windows.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@ import (
5151
"github.com/Ne0nd0g/merlin-message"
5252

5353
// Internal
54-
"github.com/Ne0nd0g/merlin-agent/authenticators"
55-
"github.com/Ne0nd0g/merlin-agent/authenticators/none"
56-
"github.com/Ne0nd0g/merlin-agent/authenticators/opaque"
57-
"github.com/Ne0nd0g/merlin-agent/cli"
58-
"github.com/Ne0nd0g/merlin-agent/core"
59-
transformer "github.com/Ne0nd0g/merlin-agent/transformers"
60-
"github.com/Ne0nd0g/merlin-agent/transformers/encoders/base64"
61-
gob2 "github.com/Ne0nd0g/merlin-agent/transformers/encoders/gob"
62-
"github.com/Ne0nd0g/merlin-agent/transformers/encoders/hex"
63-
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/aes"
64-
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/jwe"
65-
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/rc4"
66-
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/xor"
54+
"github.com/Ne0nd0g/merlin-agent/v2/authenticators"
55+
"github.com/Ne0nd0g/merlin-agent/v2/authenticators/none"
56+
"github.com/Ne0nd0g/merlin-agent/v2/authenticators/opaque"
57+
"github.com/Ne0nd0g/merlin-agent/v2/cli"
58+
"github.com/Ne0nd0g/merlin-agent/v2/core"
59+
transformer "github.com/Ne0nd0g/merlin-agent/v2/transformers"
60+
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/base64"
61+
gob2 "github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/gob"
62+
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/hex"
63+
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/aes"
64+
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/jwe"
65+
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/rc4"
66+
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/xor"
6767
)
6868

6969
const (

0 commit comments

Comments
 (0)