danvics/goldwarden
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename enctype in encstring

Browse source
This commit is contained in:
Bernd Schoolmann 2024-01-09 23:31:09 +01:00
parent 63ca3f2295
commit efa509ff4e
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

@ -172,7 +172,7 @@ func DecryptWith(s EncString, key SymmetricEncryptionKey) ([]byte, error) {
return dst, nil return dst, nil
} }
func EncryptWith(data []byte, typ EncStringType, key SymmetricEncryptionKey) (EncString, error) { func EncryptWith(data []byte, encType EncStringType, key SymmetricEncryptionKey) (EncString, error) {
encKeyData, err := key.EncryptionKeyBytes() encKeyData, err := key.EncryptionKeyBytes()
if err != nil { if err != nil {
return EncString{}, err return EncString{}, err
@ -183,12 +183,12 @@ func EncryptWith(data []byte, typ EncStringType, key SymmetricEncryptionKey) (En
} }
s := EncString{} s := EncString{}
switch typ { switch encType {
case AesCbc256_B64, AesCbc256_HmacSha256_B64: case AesCbc256_B64, AesCbc256_HmacSha256_B64:
default: default:
return s, fmt.Errorf("encrypt: unsupported cipher type %q", s.Type) return s, fmt.Errorf("encrypt: unsupported cipher type %q", s.Type)
} }
s.Type = typ s.Type = encType
data = padPKCS7(data, aes.BlockSize) data = padPKCS7(data, aes.BlockSize)
block, err := aes.NewCipher(encKeyData) block, err := aes.NewCipher(encKeyData)
@ -203,7 +203,7 @@ func EncryptWith(data []byte, typ EncStringType, key SymmetricEncryptionKey) (En
mode := cipher.NewCBCEncrypter(block, s.IV) mode := cipher.NewCBCEncrypter(block, s.IV)
mode.CryptBlocks(s.CT, data) mode.CryptBlocks(s.CT, data)
if typ == AesCbc256_HmacSha256_B64 { if encType == AesCbc256_HmacSha256_B64 {
if len(macKeyData) == 0 { if len(macKeyData) == 0 {
return s, fmt.Errorf("encrypt: cipher string type expects a MAC") return s, fmt.Errorf("encrypt: cipher string type expects a MAC")
} }