chore: switch to excrypto vs inline x/crypto patches

runZeroInc · Sep 29, 2024 · c0c433f · c0c433f
1 parent d57767d
commit c0c433f
Show file tree

Hide file tree

Showing 403 changed files with 123 additions and 94,633 deletions.
diff --git a/auth/auth.go b/auth/auth.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/runZeroInc/sshamble/crypto/ssh"
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 )
 
 type AuthHandler func(*ssh.UnauthClientConn, map[string][]byte, *AuthResult) error

diff --git a/auth/config.go b/auth/config.go
@@ -1,7 +1,7 @@
 package auth
 
 import (
-	"github.com/runZeroInc/sshamble/crypto/ssh"
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 )
 
 const (

diff --git a/auth/halfauth_bogus_research.go b/auth/halfauth_bogus_research.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/runZeroInc/sshamble/crypto/ssh"
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 )
 
 type HalfSignerBogus struct {

diff --git a/auth/halfauth_research.go b/auth/halfauth_research.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"io"
 
-	"github.com/runZeroInc/sshamble/crypto/ssh"
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 )
 
 var ErrHalfAuth = errors.New("half-auth")

diff --git a/auth/options.go b/auth/options.go
@@ -5,7 +5,7 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"github.com/runZeroInc/sshamble/crypto/ssh"
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/auth/pubkey_file.go b/auth/pubkey_file.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/runZeroInc/sshamble/crypto/ssh"
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/auth/results.go b/auth/results.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/runZeroInc/sshamble/crypto/ssh"
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 )
 
 type VulnResult struct {

diff --git a/badkeys/badkeys.go b/badkeys/badkeys.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/runZeroInc/sshamble/crypto/ssh"
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 )
 
 const BadKeysMetaURL = "https://update.badkeys.info/v0/badkeysdata.json"

diff --git a/badkeys/cache_test.go b/badkeys/cache_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/cmd/check_bypass.go b/cmd/check_bypass.go
@@ -4,8 +4,8 @@ import (
 	"net"
 	"strings"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 )
 
 func bypassAtInterestingStage(tname string, addr string, conf *ScanConfig, res *auth.AuthResult) bool {

diff --git a/cmd/check_gssapi.go b/cmd/check_gssapi.go
@@ -1,8 +1,8 @@
 package cmd
 
 import (
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 )
 
 // TODO: Complete implementation

diff --git a/cmd/check_hostkeys.go b/cmd/check_hostkeys.go
@@ -3,9 +3,9 @@ package cmd
 import (
 	"encoding/base64"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
 	"github.com/runZeroInc/sshamble/badkeys"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 )
 
 const checkBadKeysBlocklist = "badkeys-blocklist"

diff --git a/cmd/check_keyboard.go b/cmd/check_keyboard.go
@@ -3,8 +3,8 @@ package cmd
 import (
 	"strings"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 )
 
 func sshCheckKeyboardHelper(addr string, tname string, conf *ScanConfig, options *auth.Options, root *auth.AuthResult, testPass string) *auth.AuthResult {

diff --git a/cmd/check_password.go b/cmd/check_password.go
@@ -5,8 +5,8 @@ import (
 	"encoding/base64"
 	"time"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 )
 
 func genRandomPassword() string {

diff --git a/cmd/check_pubkey.go b/cmd/check_pubkey.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 )
 
 const checkPubkeyAny = "pubkey-any"

diff --git a/cmd/check_userenum.go b/cmd/check_userenum.go
@@ -11,8 +11,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 	"gonum.org/v1/gonum/stat"
 )
 

diff --git a/cmd/cmd_analyze.go b/cmd/cmd_analyze.go
@@ -12,9 +12,9 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
 	"github.com/runZeroInc/sshamble/badkeys"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/cmd_scan.go b/cmd/cmd_scan.go
@@ -13,9 +13,9 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
 	"github.com/runZeroInc/sshamble/badkeys"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/interact.go b/cmd/interact.go
@@ -16,8 +16,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 	"golang.org/x/term"
 )
 

diff --git a/cmd/keys.go b/cmd/keys.go
@@ -10,7 +10,7 @@ import (
 	"encoding/pem"
 	"os"
 
-	"github.com/runZeroInc/sshamble/crypto/ssh"
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 )
 
 func generateTestKeys(conf *ScanConfig) {

diff --git a/cmd/session.go b/cmd/session.go
@@ -3,8 +3,8 @@ package cmd
 import (
 	"io"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 )
 
 func sessionGetSTDIO(ses *ssh.Session) (*auth.SyncByteBuffer, *auth.SyncByteBuffer, io.WriteCloser, error) {

diff --git a/cmd/session_vuln_generic_env.go b/cmd/session_vuln_generic_env.go
@@ -6,8 +6,8 @@ import (
 	"regexp"
 	"time"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 )
 
 const checkVulnGenericEnv = "vuln-generic-env"

diff --git a/cmd/session_vuln_gogs.go b/cmd/session_vuln_gogs.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 )
 
 const checkVulnGogsEnv = "vuln-gogs-env"

diff --git a/cmd/session_vuln_ruckus.go b/cmd/session_vuln_ruckus.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 )
 
 const checkVulnRuckusPasswordEscape = "vuln-ruckus-password-escape"

diff --git a/cmd/session_vuln_softserve.go b/cmd/session_vuln_softserve.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 )
 
 const checkVulnSoftServe = "vuln-softserve-env"

diff --git a/cmd/session_vuln_tcp_forward.go b/cmd/session_vuln_tcp_forward.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/runZeroInc/excrypto/x/crypto/ssh"
 	"github.com/runZeroInc/sshamble/auth"
-	"github.com/runZeroInc/sshamble/crypto/ssh"
 )
 
 type fwdTest struct {

diff --git a/crypto.rediff.sh b/crypto.rediff.sh
diff --git a/crypto.resync.sh b/crypto.resync.sh
diff --git a/crypto/.gitattributes b/crypto/.gitattributes
diff --git a/crypto/.gitignore b/crypto/.gitignore
diff --git a/crypto/CONTRIBUTING.md b/crypto/CONTRIBUTING.md
diff --git a/crypto/LICENSE b/crypto/LICENSE
diff --git a/crypto/PATENTS b/crypto/PATENTS
diff --git a/crypto/README.md b/crypto/README.md
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ import ( @@
     	"sync"
     	"time"
-    	"github.com/runZeroInc/sshamble/crypto/ssh"
+    	"github.com/runZeroInc/excrypto/x/crypto/ssh"
     )
     type AuthHandler func(*ssh.UnauthClientConn, map[string][]byte, *AuthResult) error
@@ Expand Down @@