fixup! address some comments from original PR

johnstcn · johnstcn · commit 552e425ed22a · 2023-08-29T14:28:28.000Z
diff --git a/enterprise/dbcrypt/cipher.go b/enterprise/dbcrypt/cipher.go
@@ -46,9 +46,9 @@ func (a *AES256) Encrypt(plaintext []byte) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	// TODO: the below fails with "cipher: message authentication failed"
-	//return a.aead.Seal(nil, nonce, plaintext, nil), nil
-	return a.aead.Seal(nonce, nonce, plaintext, nil), nil
+	dst := make([]byte, len(nonce))
+	copy(dst, nonce)
+	return a.aead.Seal(dst, nonce, plaintext, nil), nil
 }
 
 func (a *AES256) Decrypt(ciphertext []byte) ([]byte, error) {

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ func (a *AES256) Encrypt(plaintext []byte) ([]byte, error) {`
`46`	`46`	`if err != nil {`
`47`	`47`	`return nil, err`
`48`	`48`	`}`
`49`		`- // TODO: the below fails with "cipher: message authentication failed"`
`50`		`- //return a.aead.Seal(nil, nonce, plaintext, nil), nil`
`51`		`- return a.aead.Seal(nonce, nonce, plaintext, nil), nil`
	`49`	`+ dst := make([]byte, len(nonce))`
	`50`	`+ copy(dst, nonce)`
	`51`	`+ return a.aead.Seal(dst, nonce, plaintext, nil), nil`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`func (a *AES256) Decrypt(ciphertext []byte) ([]byte, error) {`