Move minisign to util/

Sevolith · Nov 10, 2023 · eddfa20 · eddfa20
1 parent 21468a6
commit eddfa20
Show file tree

Hide file tree

Showing 34 changed files with 13 additions and 1,432 deletions.
diff --git a/client/command/armory/armory.go b/client/command/armory/armory.go
@@ -36,7 +36,7 @@ import (
 	"github.com/bishopfox/sliver/client/command/extensions"
 	"github.com/bishopfox/sliver/client/command/settings"
 	"github.com/bishopfox/sliver/client/console"
-	"github.com/bishopfox/sliver/server/cryptography/minisign"
+	"github.com/bishopfox/sliver/util/minisign"
 )
 
 // ArmoryIndex - Index JSON containing alias/extension/bundle information

diff --git a/client/command/armory/install.go b/client/command/armory/install.go
@@ -32,7 +32,7 @@ import (
 	"github.com/bishopfox/sliver/client/command/extensions"
 	"github.com/bishopfox/sliver/client/console"
 	"github.com/bishopfox/sliver/client/constants"
-	"github.com/bishopfox/sliver/server/cryptography/minisign"
+	"github.com/bishopfox/sliver/util/minisign"
 )
 
 // ErrPackageNotFound - The package was not found

diff --git a/client/command/armory/parsers.go b/client/command/armory/parsers.go
@@ -33,7 +33,7 @@ import (
 	"time"
 
 	"github.com/bishopfox/sliver/client/assets"
-	"github.com/bishopfox/sliver/server/cryptography/minisign"
+	"github.com/bishopfox/sliver/util/minisign"
 )
 
 // ArmoryIndexParser - Generic interface to fetch armory indexes

diff --git a/go-tests.sh b/go-tests.sh
@@ -67,6 +67,14 @@ else
     exit 1
 fi
 
+# util / minisign
+if go test -tags=server,$TAGS ./util/minisign ; then
+    :
+else
+    cat ~/.sliver/logs/sliver.log
+    exit 1
+fi
+
 ## Implant
 
 # implant / sliver / extension
@@ -131,14 +139,6 @@ else
     exit 1
 fi
 
-# server / cryptography / minisign
-if go test -tags=server,$TAGS ./server/cryptography/minisign ; then
-    :
-else
-    cat ~/.sliver/logs/sliver.log
-    exit 1
-fi
-
 # server / gogo
 if go test -tags=server,$TAGS ./server/gogo ; then
     :

diff --git a/server/cryptography/cryptography.go b/server/cryptography/cryptography.go
@@ -36,9 +36,9 @@ import (
 	"sync"
 
 	"filippo.io/age"
-	"github.com/bishopfox/sliver/server/cryptography/minisign"
 	"github.com/bishopfox/sliver/server/db"
 	"github.com/bishopfox/sliver/util/encoders"
+	"github.com/bishopfox/sliver/util/minisign"
 	"golang.org/x/crypto/chacha20poly1305"
 )
 

diff --git a/server/cryptography/cryptography_test.go b/server/cryptography/cryptography_test.go
@@ -27,7 +27,7 @@ import (
 	"testing"
 
 	implantCrypto "github.com/bishopfox/sliver/implant/sliver/cryptography"
-	"github.com/bishopfox/sliver/server/cryptography/minisign"
+	"github.com/bishopfox/sliver/util/minisign"
 )
 
 var (

diff --git a/server/cryptography/minisign/LICENSE b/server/cryptography/minisign/LICENSE
diff --git a/server/cryptography/minisign/internal/testdata/message.txt b/server/cryptography/minisign/internal/testdata/message.txt
diff --git a/server/cryptography/minisign/internal/testdata/message.txt.minisig b/server/cryptography/minisign/internal/testdata/message.txt.minisig
diff --git a/server/cryptography/minisign/internal/testdata/minisign.key b/server/cryptography/minisign/internal/testdata/minisign.key
diff --git a/server/cryptography/minisign/internal/testdata/minisign.pub b/server/cryptography/minisign/internal/testdata/minisign.pub
diff --git a/server/cryptography/minisign/internal/testdata/robtest.ps1.minisig b/server/cryptography/minisign/internal/testdata/robtest.ps1.minisig
diff --git a/server/cryptography/minisign/minisign.go b/server/cryptography/minisign/minisign.go