quexten/goldwarden
1
1
Fork 0
mirror of https://github.com/quexten/goldwarden.git synced 2024-11-30 12:32:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add debugging info to cipherstring decryption

Browse Source
This commit is contained in:
Bernd Schoolmann 2024-02-21 06:39:06 +01:00
parent 7653cf382b
commit ac9251d0f4
No known key found for this signature in database
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/bitwarden/crypto/encstring.go
View File

@ -47,13 +47,13 @@ func (s *EncString) UnmarshalText(data []byte) error {
i := bytes.IndexByte(data, '.') i := bytes.IndexByte(data, '.')
if i < 0 { if i < 0 {
return errors.New("invalid cipher string format") return errors.New("invalid cipher string format, missign type. total length: " + strconv.Itoa(len(data)))
} }
typStr := string(data[:i]) typStr := string(data[:i])
var err error var err error
if t, err := strconv.Atoi(typStr); err != nil { if t, err := strconv.Atoi(typStr); err != nil {
return errors.New("invalid cipher string type") return errors.New("invalid cipher string type, could not parse, length: " + strconv.Itoa(len(data)))
} else { } else {
s.Type = EncStringType(t) s.Type = EncStringType(t)
} }
@ -61,13 +61,13 @@ func (s *EncString) UnmarshalText(data []byte) error {
switch s.Type { switch s.Type {
case AesCbc128_HmacSha256_B64, AesCbc256_HmacSha256_B64, AesCbc256_B64: case AesCbc128_HmacSha256_B64, AesCbc256_HmacSha256_B64, AesCbc256_B64:
default: default:
return errors.New("invalid cipher string type") return errors.New("invalid cipher string type, unknown type: " + strconv.Itoa(int(s.Type)))
} }
data = data[i+1:] data = data[i+1:]
parts := bytes.Split(data, []byte("|")) parts := bytes.Split(data, []byte("|"))
if len(parts) != 3 { if len(parts) != 3 {
return errors.New("invalid cipher string format") return errors.New("invalid cipher string format, missing parts, length: " + strconv.Itoa(len(data)) + "type: " + strconv.Itoa(int(s.Type)))
} }
if s.IV, err = b64decode(parts[0]); err != nil { if s.IV, err = b64decode(parts[0]); err != nil {