Skip to content

Commit

Permalink
init migration
Browse files Browse the repository at this point in the history
  • Loading branch information
Swapnil committed Jun 15, 2024
1 parent cf5b1bd commit 79b9f40
Show file tree
Hide file tree
Showing 17 changed files with 31 additions and 30 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/jfjallid/go-smb
module github.com/fourcorelabs/go-smb

go 1.19

Expand Down
5 changes: 3 additions & 2 deletions gss/gss.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package gss
import (
"encoding/asn1"

"github.com/fourcorelabs/go-smb/smb/encoder"
"github.com/jfjallid/ber"
"github.com/jfjallid/go-smb/smb/encoder"
"github.com/jfjallid/golog"
)

var log = golog.Get("github.com/jfjallid/go-smb/gss")
var log = golog.Get("github.com/fourcorelabs/go-smb/gss")
var SpnegoOid = asn1.ObjectIdentifier([]int{1, 3, 6, 1, 5, 5, 2})
var MsKerberosOid = asn1.ObjectIdentifier([]int{1, 2, 840, 48018, 1, 2, 2})
var KerberosOid = asn1.ObjectIdentifier([]int{1, 2, 840, 113554, 1, 2, 2})
Expand Down Expand Up @@ -77,6 +77,7 @@ func (n *NegTokenInit) MarshalBinary(meta *encoder.Metadata) ([]byte, error) {

func (n *NegTokenInit) UnmarshalBinary(buf []byte, meta *encoder.Metadata) error {
data := NegTokenInit{}
asn1.UnmarshalWithParams(buf, &data, "application")
if _, err := ber.UnmarshalWithParams(buf, &data, "application"); err != nil {
log.Debugln(err)
return err
Expand Down
2 changes: 1 addition & 1 deletion ntlmssp/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"fmt"
"time"

"github.com/jfjallid/go-smb/smb/encoder"
"github.com/fourcorelabs/go-smb/smb/encoder"
"github.com/jfjallid/golog"
)

Expand Down
2 changes: 1 addition & 1 deletion ntlmssp/crypto.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"crypto/md5"
"strings"

"github.com/jfjallid/go-smb/smb/encoder"
"github.com/fourcorelabs/go-smb/smb/encoder"
"golang.org/x/crypto/md4"
)

Expand Down
2 changes: 1 addition & 1 deletion ntlmssp/ntlmssp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"errors"
"fmt"

"github.com/jfjallid/go-smb/smb/encoder"
"github.com/fourcorelabs/go-smb/smb/encoder"
)

const Signature = "NTLMSSP\x00"
Expand Down
2 changes: 1 addition & 1 deletion smb/connection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"sync"
"sync/atomic"

"github.com/jfjallid/go-smb/smb/encoder"
"github.com/fourcorelabs/go-smb/smb/encoder"
)

type requestResponse struct {
Expand Down
2 changes: 1 addition & 1 deletion smb/crypto/ccm/ccm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"github.com/jfjallid/golog"
)

var log = golog.Get("github.com/jfjallid/go-smb/smb/crypto/ccm")
var log = golog.Get("github.com/fourcorelabs/go-smb/smb/crypto/ccm")

type ccm struct {
c cipher.Block
Expand Down
4 changes: 2 additions & 2 deletions smb/dcerpc/dcerpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ import (
"strings"
"sync/atomic"

"github.com/jfjallid/go-smb/smb"
"github.com/fourcorelabs/go-smb/smb"
"github.com/jfjallid/golog"
)

var (
MSRPCUuidNdr = "8a885d04-1ceb-11c9-9fe8-08002b104860" // NDR Transfer Syntax version 2.0
re regexp.Regexp = *regexp.MustCompile(`([\dA-Fa-f]{8})-([\dA-Fa-f]{4})-([\dA-Fa-f]{4})-([\dA-Fa-f]{4})-([\dA-Fa-f]{4})([\dA-Fa-f]{8})`)
le binary.ByteOrder = binary.LittleEndian
log = golog.Get("github.com/jfjallid/go-smb/smb/dcerpc")
log = golog.Get("github.com/fourcorelabs/go-smb/smb/dcerpc")
)

// MSRPC Packet Types
Expand Down
4 changes: 2 additions & 2 deletions smb/dcerpc/msrrp/msrrp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (
"strconv"
"strings"

"github.com/jfjallid/go-smb/smb/dcerpc"
"github.com/fourcorelabs/go-smb/smb/dcerpc"
"github.com/jfjallid/golog"
)

var log = golog.Get("github.com/jfjallid/go-smb/smb/dcerpc/msrrp")
var log = golog.Get("github.com/fourcorelabs/go-smb/smb/dcerpc/msrrp")

var (
MSRRPUuid = "338CD001-2244-31F1-AAAA-900038001003"
Expand Down
2 changes: 1 addition & 1 deletion smb/encoder/encoder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import (
"github.com/jfjallid/golog"
)

var log = golog.Get("github.com/jfjallid/go-smb/smb/encoder")
var log = golog.Get("github.com/fourcorelabs/go-smb/smb/encoder")

type BinaryMarshallable interface {
MarshalBinary(*Metadata) ([]byte, error)
Expand Down
4 changes: 2 additions & 2 deletions smb/initiator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ package smb
import (
"encoding/asn1"

"github.com/jfjallid/go-smb/gss"
"github.com/jfjallid/go-smb/ntlmssp"
"github.com/fourcorelabs/go-smb/gss"
"github.com/fourcorelabs/go-smb/ntlmssp"
)

type Initiator interface {
Expand Down
6 changes: 3 additions & 3 deletions smb/relay.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import (
"sync/atomic"
"time"

"github.com/jfjallid/go-smb/gss"
"github.com/jfjallid/go-smb/ntlmssp"
"github.com/jfjallid/go-smb/smb/encoder"
"github.com/fourcorelabs/go-smb/gss"
"github.com/fourcorelabs/go-smb/ntlmssp"
"github.com/fourcorelabs/go-smb/smb/encoder"
)

// Useful with a generic struct when we don't know if this is a Negotiate or Auth message
Expand Down
10 changes: 5 additions & 5 deletions smb/session.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ import (
"sync/atomic"
"time"

"github.com/jfjallid/go-smb/gss"
"github.com/jfjallid/go-smb/ntlmssp"
"github.com/jfjallid/go-smb/smb/crypto/ccm"
"github.com/jfjallid/go-smb/smb/crypto/cmac"
"github.com/jfjallid/go-smb/smb/encoder"
"github.com/fourcorelabs/go-smb/gss"
"github.com/fourcorelabs/go-smb/ntlmssp"
"github.com/fourcorelabs/go-smb/smb/crypto/ccm"
"github.com/fourcorelabs/go-smb/smb/crypto/cmac"
"github.com/fourcorelabs/go-smb/smb/encoder"
"golang.org/x/net/proxy"
)

Expand Down
2 changes: 1 addition & 1 deletion smb/sign_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"encoding/hex"

"github.com/jfjallid/go-smb/smb/crypto/cmac"
"github.com/fourcorelabs/go-smb/smb/crypto/cmac"

"testing"
)
Expand Down
6 changes: 3 additions & 3 deletions smb/smb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ import (

"github.com/jfjallid/golog"

"github.com/jfjallid/go-smb/gss"
"github.com/jfjallid/go-smb/smb/encoder"
"github.com/fourcorelabs/go-smb/gss"
"github.com/fourcorelabs/go-smb/smb/encoder"
)

var log = golog.Get("github.com/jfjallid/go-smb/smb")
var log = golog.Get("github.com/fourcorelabs/go-smb/smb")

const ProtocolSmb = "\xFFSMB"
const ProtocolSmb2 = "\xFESMB"
Expand Down
2 changes: 1 addition & 1 deletion smb/smb1.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"encoding/binary"
"fmt"

"github.com/jfjallid/go-smb/smb/encoder"
"github.com/fourcorelabs/go-smb/smb/encoder"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions smb/spnego.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ package smb
import (
"encoding/asn1"

"github.com/jfjallid/go-smb/gss"
"github.com/jfjallid/go-smb/smb/encoder"
"github.com/fourcorelabs/go-smb/gss"
"github.com/fourcorelabs/go-smb/smb/encoder"
)

type spnegoClient struct {
Expand Down

0 comments on commit 79b9f40

Please sign in to comment.