diff --git a/crypto/dcc/dcc.go b/crypto/dcc/dcc.go index 45037695..fb846d91 100644 --- a/crypto/dcc/dcc.go +++ b/crypto/dcc/dcc.go @@ -5,7 +5,7 @@ import ( "github.com/TheManticoreProject/Manticore/crypto/md4" "github.com/TheManticoreProject/Manticore/crypto/nt" - "github.com/TheManticoreProject/Manticore/utils/encoding/utf16" + "github.com/TheManticoreProject/Manticore/encoding/utf16" "encoding/hex" "strings" diff --git a/crypto/dcc2/dcc2.go b/crypto/dcc2/dcc2.go index 9a74f4ab..c0b8fe28 100644 --- a/crypto/dcc2/dcc2.go +++ b/crypto/dcc2/dcc2.go @@ -8,7 +8,7 @@ import ( "github.com/TheManticoreProject/Manticore/crypto/md4" "github.com/TheManticoreProject/Manticore/crypto/nt" - "github.com/TheManticoreProject/Manticore/utils/encoding/utf16" + "github.com/TheManticoreProject/Manticore/encoding/utf16" "golang.org/x/crypto/pbkdf2" ) diff --git a/crypto/gppp/gppp.go b/crypto/gppp/gppp.go index 5e91f10b..ffb516fe 100644 --- a/crypto/gppp/gppp.go +++ b/crypto/gppp/gppp.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/TheManticoreProject/Manticore/crypto/pkcs7" - "github.com/TheManticoreProject/Manticore/utils/encoding/utf16" + "github.com/TheManticoreProject/Manticore/encoding/utf16" ) // AES Key as per the Microsoft documentation diff --git a/crypto/nt/nt.go b/crypto/nt/nt.go index 4c3fa641..f84c393e 100644 --- a/crypto/nt/nt.go +++ b/crypto/nt/nt.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/TheManticoreProject/Manticore/crypto/md4" - "github.com/TheManticoreProject/Manticore/utils/encoding/utf16" + "github.com/TheManticoreProject/Manticore/encoding/utf16" ) // NTHash computes the NT hash of a password string diff --git a/crypto/ntlmv2/ntlmv2_ctx.go b/crypto/ntlmv2/ntlmv2_ctx.go index 619da103..73e53665 100644 --- a/crypto/ntlmv2/ntlmv2_ctx.go +++ b/crypto/ntlmv2/ntlmv2_ctx.go @@ -9,7 +9,7 @@ import ( "github.com/TheManticoreProject/Manticore/crypto/lm" "github.com/TheManticoreProject/Manticore/crypto/nt" - "github.com/TheManticoreProject/Manticore/utils/encoding/utf16" + "github.com/TheManticoreProject/Manticore/encoding/utf16" ) // NTLMv2 represents the components needed for NTLMv2 authentication diff --git a/crypto/spnego/authcontext.go b/crypto/spnego/authcontext.go index 91847331..2940a340 100644 --- a/crypto/spnego/authcontext.go +++ b/crypto/spnego/authcontext.go @@ -2,7 +2,7 @@ package spnego import ( "github.com/TheManticoreProject/Manticore/crypto/spnego/ntlm/message/challenge" - "github.com/TheManticoreProject/Manticore/utils/encoding/utf16" + "github.com/TheManticoreProject/Manticore/encoding/utf16" ) // AuthType represents the authentication type diff --git a/crypto/spnego/ntlm/message/authenticate/authenticate.go b/crypto/spnego/ntlm/message/authenticate/authenticate.go index 995d80fc..2a97cffe 100644 --- a/crypto/spnego/ntlm/message/authenticate/authenticate.go +++ b/crypto/spnego/ntlm/message/authenticate/authenticate.go @@ -14,7 +14,7 @@ import ( "github.com/TheManticoreProject/Manticore/crypto/spnego/ntlm/message/negotiate/flags" "github.com/TheManticoreProject/Manticore/crypto/spnego/ntlm/message/types" "github.com/TheManticoreProject/Manticore/crypto/spnego/ntlm/version" - "github.com/TheManticoreProject/Manticore/utils/encoding/utf16" + "github.com/TheManticoreProject/Manticore/encoding/utf16" ) // AuthenticateMessage is the third message in NTLM authentication diff --git a/crypto/spnego/ntlm/message/negotiate/negotiate.go b/crypto/spnego/ntlm/message/negotiate/negotiate.go index c2a3bb84..f404a59a 100644 --- a/crypto/spnego/ntlm/message/negotiate/negotiate.go +++ b/crypto/spnego/ntlm/message/negotiate/negotiate.go @@ -10,7 +10,7 @@ import ( "github.com/TheManticoreProject/Manticore/crypto/spnego/ntlm/message/negotiate/flags" "github.com/TheManticoreProject/Manticore/crypto/spnego/ntlm/message/types" "github.com/TheManticoreProject/Manticore/crypto/spnego/ntlm/version" - "github.com/TheManticoreProject/Manticore/utils/encoding/utf16" + "github.com/TheManticoreProject/Manticore/encoding/utf16" ) // NegotiateMessage is the first message in NTLM authentication diff --git a/encoding/ascii/ascii.go b/encoding/ascii/ascii.go new file mode 100644 index 00000000..6c55f14b --- /dev/null +++ b/encoding/ascii/ascii.go @@ -0,0 +1,29 @@ +package ascii + +// asciiCharset contains all 256 ASCII byte values from 0x00 to 0xFF +var asciiCharset = []uint8{ + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, + 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, + 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, + 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, + 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, + 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, +} + +// GetAsciiCharset returns a copy of the ASCII charset containing all 256 byte values from 0x00 to 0xFF. +// This function returns a copy to prevent accidental mutation of the internal charset. +func GetAsciiCharset() []uint8 { + result := make([]uint8, len(asciiCharset)) + copy(result, asciiCharset) + return result +} diff --git a/encoding/ascii/ascii_test.go b/encoding/ascii/ascii_test.go new file mode 100644 index 00000000..996c84a9 --- /dev/null +++ b/encoding/ascii/ascii_test.go @@ -0,0 +1,12 @@ +package ascii + +import "testing" + +func TestASCIICharset(t *testing.T) { + charset := GetAsciiCharset() + for i := 0; i < 256; i++ { + if charset[i] != uint8(i) { + t.Errorf("AsciiCharset[%d] = %d; expected %d", i, charset[i], uint8(i)) + } + } +} diff --git a/encoding/ebcdic/cp037/cp037.go b/encoding/ebcdic/cp037/cp037.go new file mode 100644 index 00000000..0e14b458 --- /dev/null +++ b/encoding/ebcdic/cp037/cp037.go @@ -0,0 +1,55 @@ +package cp037 + +// AsciiToEbcdicCp037Map +var AsciiToEbcdicCp037Map = [...]uint8{ + 0x00, 0x01, 0x02, 0x03, 0x9c, 0x09, 0x86, 0x7f, 0x97, 0x8d, 0x8e, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x9d, 0x85, 0x08, 0x87, 0x18, 0x19, 0x92, 0x8f, 0x1c, 0x1d, 0x1e, 0x1f, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x0a, 0x17, 0x1b, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x05, 0x06, 0x07, + 0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04, 0x98, 0x99, 0x9a, 0x9b, 0x14, 0x15, 0x9e, 0x1a, + 0x20, 0xa0, 0xe2, 0xe4, 0xe0, 0xe1, 0xe3, 0xe5, 0xe7, 0xf1, 0xa2, 0x2e, 0x3c, 0x28, 0x2b, 0x7c, + 0x26, 0xe9, 0xea, 0xeb, 0xe8, 0xed, 0xee, 0xef, 0xec, 0xdf, 0x21, 0x24, 0x2a, 0x29, 0x3b, 0xac, + 0x2d, 0x2f, 0xc2, 0xc4, 0xc0, 0xc1, 0xc3, 0xc5, 0xc7, 0xd1, 0xa6, 0x2c, 0x25, 0x5f, 0x3e, 0x3f, + 0xf8, 0xc9, 0xca, 0xcb, 0xc8, 0xcd, 0xce, 0xcf, 0xcc, 0x60, 0x3a, 0x23, 0x40, 0x27, 0x3d, 0x22, + 0xd8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0xab, 0xbb, 0xf0, 0xfd, 0xfe, 0xb1, + 0xb0, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0xaa, 0xba, 0xe6, 0xb8, 0xc6, 0xa4, + 0xb5, 0x7e, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0xa1, 0xbf, 0xd0, 0xdd, 0xde, 0xae, + 0x5e, 0xa3, 0xa5, 0xb7, 0xa9, 0xa7, 0xb6, 0xbc, 0xbd, 0xbe, 0x5b, 0x5d, 0xaf, 0xa8, 0xb4, 0xd7, + 0x7b, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0xad, 0xf4, 0xf6, 0xf2, 0xf3, 0xf5, + 0x7d, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0xb9, 0xfb, 0xfc, 0xf9, 0xfa, 0xff, + 0x5c, 0xf7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0xb2, 0xd4, 0xd6, 0xd2, 0xd3, 0xd5, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0xb3, 0xdb, 0xdc, 0xd9, 0xda, 0x9f, +} + +// EbcdicCp037ToAsciiMap +var EbcdicCp037ToAsciiMap = [...]uint8{ + 0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, 0x16, 0x05, 0x25, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f, + 0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d, 0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61, + 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f, + 0x7c, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, + 0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xba, 0xe0, 0xbb, 0xb0, 0x6d, + 0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, + 0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xc0, 0x4f, 0xd0, 0xa1, 0x07, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x15, 0x06, 0x17, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x1b, + 0x30, 0x31, 0x1a, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3a, 0x3b, 0x04, 0x14, 0x3e, 0xff, + 0x41, 0xaa, 0x4a, 0xb1, 0x9f, 0xb2, 0x6a, 0xb5, 0xbd, 0xb4, 0x9a, 0x8a, 0x5f, 0xca, 0xaf, 0xbc, + 0x90, 0x8f, 0xea, 0xfa, 0xbe, 0xa0, 0xb6, 0xb3, 0x9d, 0xda, 0x9b, 0x8b, 0xb7, 0xb8, 0xb9, 0xab, + 0x64, 0x65, 0x62, 0x66, 0x63, 0x67, 0x9e, 0x68, 0x74, 0x71, 0x72, 0x73, 0x78, 0x75, 0x76, 0x77, + 0xac, 0x69, 0xed, 0xee, 0xeb, 0xef, 0xec, 0xbf, 0x80, 0xfd, 0xfe, 0xfb, 0xfc, 0xad, 0xae, 0x59, + 0x44, 0x45, 0x42, 0x46, 0x43, 0x47, 0x9c, 0x48, 0x54, 0x51, 0x52, 0x53, 0x58, 0x55, 0x56, 0x57, + 0x8c, 0x49, 0xcd, 0xce, 0xcb, 0xcf, 0xcc, 0xe1, 0x70, 0xdd, 0xde, 0xdb, 0xdc, 0x8d, 0x8e, 0xdf, +} + +func EbcdicCp037ToAscii(b []uint8) []uint8 { + for i, v := range b { + b[i] = EbcdicCp037ToAsciiMap[v] + } + return b +} + +func AsciiToEbcdicCp037(b []uint8) []uint8 { + for i, v := range b { + b[i] = AsciiToEbcdicCp037Map[v] + } + return b +} diff --git a/encoding/ebcdic/cp037/cp037_test.go b/encoding/ebcdic/cp037/cp037_test.go new file mode 100644 index 00000000..10f1267b --- /dev/null +++ b/encoding/ebcdic/cp037/cp037_test.go @@ -0,0 +1,34 @@ +package cp037_test + +import ( + "testing" + + "github.com/TheManticoreProject/Manticore/encoding/ascii" + "github.com/TheManticoreProject/Manticore/encoding/ebcdic/cp037" +) + +func TestCp037ToAsciiMap(t *testing.T) { + asciiCharset := ascii.GetAsciiCharset() + result := cp037.EbcdicCp037ToAscii(asciiCharset) + if len(result) != len(cp037.EbcdicCp037ToAsciiMap[:]) { + t.Fatalf("Result length mismatch, got %d expected %d", len(result), len(cp037.EbcdicCp037ToAsciiMap[:])) + } + for i, v := range cp037.EbcdicCp037ToAsciiMap[:] { + if result[i] != v { + t.Errorf("Ebcdiccp037ToAscii failed at index %d: got %v, expected %v", i, result[i], v) + } + } +} + +func TestAsciiToCp037Map(t *testing.T) { + asciiCharset := ascii.GetAsciiCharset() + result := cp037.AsciiToEbcdicCp037(asciiCharset) + if len(result) != len(cp037.AsciiToEbcdicCp037Map[:]) { + t.Fatalf("Result length mismatch, got %d expected %d", len(result), len(cp037.AsciiToEbcdicCp037Map[:])) + } + for i, v := range cp037.AsciiToEbcdicCp037Map[:] { + if result[i] != v { + t.Errorf("Ebcdiccp037ToAscii failed at index %d: got %v, expected %v", i, result[i], v) + } + } +} diff --git a/encoding/ebcdic/cp500/cp500.go b/encoding/ebcdic/cp500/cp500.go new file mode 100644 index 00000000..790289e5 --- /dev/null +++ b/encoding/ebcdic/cp500/cp500.go @@ -0,0 +1,55 @@ +package cp500 + +// AsciiToEbcdicCp500Map +var AsciiToEbcdicCp500Map = []uint8{ + 0x00, 0x01, 0x02, 0x03, 0x9c, 0x09, 0x86, 0x7f, 0x97, 0x8d, 0x8e, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x9d, 0x85, 0x08, 0x87, 0x18, 0x19, 0x92, 0x8f, 0x1c, 0x1d, 0x1e, 0x1f, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x0a, 0x17, 0x1b, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x05, 0x06, 0x07, + 0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04, 0x98, 0x99, 0x9a, 0x9b, 0x14, 0x15, 0x9e, 0x1a, + 0x20, 0xa0, 0xe2, 0xe4, 0xe0, 0xe1, 0xe3, 0xe5, 0xe7, 0xf1, 0x5b, 0x2e, 0x3c, 0x28, 0x2b, 0x21, + 0x26, 0xe9, 0xea, 0xeb, 0xe8, 0xed, 0xee, 0xef, 0xec, 0xdf, 0x5d, 0x24, 0x2a, 0x29, 0x3b, 0x5e, + 0x2d, 0x2f, 0xc2, 0xc4, 0xc0, 0xc1, 0xc3, 0xc5, 0xc7, 0xd1, 0xa6, 0x2c, 0x25, 0x5f, 0x3e, 0x3f, + 0xf8, 0xc9, 0xca, 0xcb, 0xc8, 0xcd, 0xce, 0xcf, 0xcc, 0x60, 0x3a, 0x23, 0x40, 0x27, 0x3d, 0x22, + 0xd8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0xab, 0xbb, 0xf0, 0xfd, 0xfe, 0xb1, + 0xb0, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0xaa, 0xba, 0xe6, 0xb8, 0xc6, 0xa4, + 0xb5, 0x7e, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0xa1, 0xbf, 0xd0, 0xdd, 0xde, 0xae, + 0xa2, 0xa3, 0xa5, 0xb7, 0xa9, 0xa7, 0xb6, 0xbc, 0xbd, 0xbe, 0xac, 0x7c, 0xaf, 0xa8, 0xb4, 0xd7, + 0x7b, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0xad, 0xf4, 0xf6, 0xf2, 0xf3, 0xf5, + 0x7d, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0xb9, 0xfb, 0xfc, 0xf9, 0xfa, 0xff, + 0x5c, 0xf7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0xb2, 0xd4, 0xd6, 0xd2, 0xd3, 0xd5, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0xb3, 0xdb, 0xdc, 0xd9, 0xda, 0x9f, +} + +// EbcdicCp500ToAsciiMap +var EbcdicCp500ToAsciiMap = []uint8{ + 0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, 0x16, 0x05, 0x25, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f, + 0x40, 0x4f, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d, 0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61, + 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f, + 0x7c, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, + 0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0x4a, 0xe0, 0x5a, 0x5f, 0x6d, + 0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, + 0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xc0, 0xbb, 0xd0, 0xa1, 0x07, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x15, 0x06, 0x17, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x1b, + 0x30, 0x31, 0x1a, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3a, 0x3b, 0x04, 0x14, 0x3e, 0xff, + 0x41, 0xaa, 0xb0, 0xb1, 0x9f, 0xb2, 0x6a, 0xb5, 0xbd, 0xb4, 0x9a, 0x8a, 0xba, 0xca, 0xaf, 0xbc, + 0x90, 0x8f, 0xea, 0xfa, 0xbe, 0xa0, 0xb6, 0xb3, 0x9d, 0xda, 0x9b, 0x8b, 0xb7, 0xb8, 0xb9, 0xab, + 0x64, 0x65, 0x62, 0x66, 0x63, 0x67, 0x9e, 0x68, 0x74, 0x71, 0x72, 0x73, 0x78, 0x75, 0x76, 0x77, + 0xac, 0x69, 0xed, 0xee, 0xeb, 0xef, 0xec, 0xbf, 0x80, 0xfd, 0xfe, 0xfb, 0xfc, 0xad, 0xae, 0x59, + 0x44, 0x45, 0x42, 0x46, 0x43, 0x47, 0x9c, 0x48, 0x54, 0x51, 0x52, 0x53, 0x58, 0x55, 0x56, 0x57, + 0x8c, 0x49, 0xcd, 0xce, 0xcb, 0xcf, 0xcc, 0xe1, 0x70, 0xdd, 0xde, 0xdb, 0xdc, 0x8d, 0x8e, 0xdf, +} + +func EbcdicCp500ToAscii(b []uint8) []uint8 { + for i, v := range b { + b[i] = EbcdicCp500ToAsciiMap[v] + } + return b +} + +func AsciiToEbcdicCp500(b []uint8) []uint8 { + for i, v := range b { + b[i] = AsciiToEbcdicCp500Map[v] + } + return b +} diff --git a/encoding/ebcdic/cp500/cp500_test.go b/encoding/ebcdic/cp500/cp500_test.go new file mode 100644 index 00000000..7cf36a36 --- /dev/null +++ b/encoding/ebcdic/cp500/cp500_test.go @@ -0,0 +1,34 @@ +package cp500_test + +import ( + "testing" + + "github.com/TheManticoreProject/Manticore/encoding/ascii" + "github.com/TheManticoreProject/Manticore/encoding/ebcdic/cp500" +) + +func TestCp500ToAsciiMap(t *testing.T) { + asciiCharset := ascii.GetAsciiCharset() + result := cp500.EbcdicCp500ToAscii(asciiCharset) + if len(result) != len(cp500.EbcdicCp500ToAsciiMap[:]) { + t.Fatalf("Result length mismatch, got %d expected %d", len(result), len(cp500.EbcdicCp500ToAsciiMap[:])) + } + for i, v := range cp500.EbcdicCp500ToAsciiMap[:] { + if result[i] != v { + t.Errorf("Ebcdiccp500ToAscii failed at index %d: got %v, expected %v", i, result[i], v) + } + } +} + +func TestAsciiToCp500Map(t *testing.T) { + asciiCharset := ascii.GetAsciiCharset() + result := cp500.AsciiToEbcdicCp500(asciiCharset) + if len(result) != len(cp500.AsciiToEbcdicCp500Map[:]) { + t.Fatalf("Result length mismatch, got %d expected %d", len(result), len(cp500.AsciiToEbcdicCp500Map[:])) + } + for i, v := range cp500.AsciiToEbcdicCp500Map[:] { + if result[i] != v { + t.Errorf("Ebcdiccp500ToAscii failed at index %d: got %v, expected %v", i, result[i], v) + } + } +} diff --git a/encoding/ebcdic/ebcdic.go b/encoding/ebcdic/ebcdic.go new file mode 100644 index 00000000..083830f6 --- /dev/null +++ b/encoding/ebcdic/ebcdic.go @@ -0,0 +1,44 @@ +package ebcdic + +import ( + "fmt" + + "github.com/TheManticoreProject/Manticore/encoding/ebcdic/cp037" + "github.com/TheManticoreProject/Manticore/encoding/ebcdic/cp500" +) + +var AvailableCodepages = []string{ + "cp037", + "cp500", +} + +var CodepageToEbcdicToAsciiMap = map[string][]uint8{ + "cp037": cp037.EbcdicCp037ToAsciiMap[:], + "cp500": cp500.EbcdicCp500ToAsciiMap[:], +} +var CodepageToAsciiToEbcdicMap = map[string][]uint8{ + "cp037": cp037.AsciiToEbcdicCp037Map[:], + "cp500": cp500.AsciiToEbcdicCp500Map[:], +} + +func EbcdicToAscii(codepage string, b []uint8) ([]uint8, error) { + ebcdicToAsciiMap, ok := CodepageToEbcdicToAsciiMap[codepage] + if !ok { + return nil, fmt.Errorf("codepage %s not found", codepage) + } + for i, v := range b { + b[i] = ebcdicToAsciiMap[v] + } + return b, nil +} + +func AsciiToEbcdic(codepage string, b []uint8) ([]uint8, error) { + asciiToEbcdicMap, ok := CodepageToAsciiToEbcdicMap[codepage] + if !ok { + return nil, fmt.Errorf("codepage %s not found", codepage) + } + for i, v := range b { + b[i] = asciiToEbcdicMap[v] + } + return b, nil +} diff --git a/encoding/ebcdic/ebcdic_test.go b/encoding/ebcdic/ebcdic_test.go new file mode 100644 index 00000000..aa757aaa --- /dev/null +++ b/encoding/ebcdic/ebcdic_test.go @@ -0,0 +1,69 @@ +package ebcdic_test + +import ( + "testing" + + "github.com/TheManticoreProject/Manticore/encoding/ascii" + "github.com/TheManticoreProject/Manticore/encoding/ebcdic" +) + +func TestAsciiToEbcdicToAsciiInvolution(t *testing.T) { + for _, codepage := range ebcdic.AvailableCodepages { + asciiCharset := ascii.GetAsciiCharset() + + // Encode ASCII -> EBCDIC for this codepage + ebcdicData, err := ebcdic.AsciiToEbcdic(codepage, asciiCharset) + if err != nil { + t.Fatalf("AsciiToEbcdic failed for codepage %s: %v", codepage, err) + } + + // Decode EBCDIC -> ASCII for this codepage + roundTrip, err := ebcdic.EbcdicToAscii(codepage, ebcdicData) + if err != nil { + t.Fatalf("EbcdicToAscii failed for codepage %s: %v", codepage, err) + } + + expectedCharset := ascii.GetAsciiCharset() + if len(roundTrip) != len(expectedCharset) { + t.Errorf("Roundtrip length mismatch for codepage %s: got %d, want %d", codepage, len(roundTrip), len(expectedCharset)) + continue + } + + for i := range expectedCharset { + if roundTrip[i] != expectedCharset[i] { + t.Errorf("Roundtrip mismatch at index %d for codepage %s: got %02x, want %02x", i, codepage, roundTrip[i], expectedCharset[i]) + } + } + } +} + +func TestAsciiToEbcdic(t *testing.T) { + for _, codepage := range ebcdic.AvailableCodepages { + + // Get the EBCDIC to ASCII map for this codepage + asciiToEbcdicMap, ok := ebcdic.CodepageToAsciiToEbcdicMap[codepage] + if !ok { + t.Fatalf("CodepageToEbcdicToAsciiMap for codepage %s not found", codepage) + } + + // Get a fresh copy of the ASCII charset for each codepage + asciiCharset := ascii.GetAsciiCharset() + + // Encode ASCII -> EBCDIC for this codepage + ebcdicData, err := ebcdic.AsciiToEbcdic(codepage, asciiCharset) + if err != nil { + t.Fatalf("AsciiToEbcdic failed for codepage %s: %v", codepage, err) + } + + if len(ebcdicData) != len(asciiToEbcdicMap) { + t.Errorf("EBCDIC length mismatch for codepage %s: got %d, want %d", codepage, len(ebcdicData), len(asciiToEbcdicMap[:])) + continue + } + + for i := range asciiToEbcdicMap[:] { + if ebcdicData[i] != asciiToEbcdicMap[i] { + t.Errorf("ASCII to EBCDIC mismatch at index %d for codepage %s: got %02x, want %02x", i, codepage, ebcdicData[i], asciiToEbcdicMap[i]) + } + } + } +} diff --git a/utils/encoding/utf16/utf16le.go b/encoding/utf16/utf16le.go similarity index 100% rename from utils/encoding/utf16/utf16le.go rename to encoding/utf16/utf16le.go diff --git a/utils/encoding/utf16/utf16le_test.go b/encoding/utf16/utf16le_test.go similarity index 100% rename from utils/encoding/utf16/utf16le_test.go rename to encoding/utf16/utf16le_test.go diff --git a/network/cifs/client/session.go b/network/cifs/client/session.go index abf9ad11..b80bfac8 100644 --- a/network/cifs/client/session.go +++ b/network/cifs/client/session.go @@ -10,7 +10,7 @@ import ( "github.com/TheManticoreProject/Manticore/network/cifs/message/header/flags" "github.com/TheManticoreProject/Manticore/network/cifs/message/header/flags2" "github.com/TheManticoreProject/Manticore/network/cifs/types" - "github.com/TheManticoreProject/Manticore/utils/encoding/utf16" + "github.com/TheManticoreProject/Manticore/encoding/utf16" ) // Session represents an established session between the client and server diff --git a/network/cifs/types/SMB_STRING_test.go b/network/cifs/types/SMB_STRING_test.go index 06756ef6..09eee4fb 100644 --- a/network/cifs/types/SMB_STRING_test.go +++ b/network/cifs/types/SMB_STRING_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/TheManticoreProject/Manticore/network/cifs/types" - "github.com/TheManticoreProject/Manticore/utils/encoding/utf16" + "github.com/TheManticoreProject/Manticore/encoding/utf16" ) func TestSMB_STRING_Marshal(t *testing.T) { diff --git a/network/smb/smb_v10/client/session.go b/network/smb/smb_v10/client/session.go index 0bb002e2..de00152c 100644 --- a/network/smb/smb_v10/client/session.go +++ b/network/smb/smb_v10/client/session.go @@ -13,7 +13,7 @@ import ( "github.com/TheManticoreProject/Manticore/network/smb/smb_v10/message/header/flags" "github.com/TheManticoreProject/Manticore/network/smb/smb_v10/message/header/flags2" "github.com/TheManticoreProject/Manticore/network/smb/smb_v10/types" - "github.com/TheManticoreProject/Manticore/utils/encoding/utf16" + "github.com/TheManticoreProject/Manticore/encoding/utf16" "github.com/TheManticoreProject/Manticore/windows/credentials" "github.com/TheManticoreProject/Manticore/windows/nt_status" ) diff --git a/network/smb/smb_v10/message/commands/SessionSetupAndxRequest.go b/network/smb/smb_v10/message/commands/SessionSetupAndxRequest.go index 30afdb2d..c2747781 100644 --- a/network/smb/smb_v10/message/commands/SessionSetupAndxRequest.go +++ b/network/smb/smb_v10/message/commands/SessionSetupAndxRequest.go @@ -13,7 +13,7 @@ import ( "github.com/TheManticoreProject/Manticore/network/smb/smb_v10/types" "github.com/TheManticoreProject/Manticore/utils" - "github.com/TheManticoreProject/Manticore/utils/encoding/utf16" + "github.com/TheManticoreProject/Manticore/encoding/utf16" ) // SessionSetupAndxRequest diff --git a/network/smb/smb_v10/types/SMB_STRING_test.go b/network/smb/smb_v10/types/SMB_STRING_test.go index 52c9e91a..a863a4b5 100644 --- a/network/smb/smb_v10/types/SMB_STRING_test.go +++ b/network/smb/smb_v10/types/SMB_STRING_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/TheManticoreProject/Manticore/network/smb/smb_v10/types" - "github.com/TheManticoreProject/Manticore/utils/encoding/utf16" + "github.com/TheManticoreProject/Manticore/encoding/utf16" ) func TestSMB_STRING_Marshal(t *testing.T) {