GitHubMirror/rcw
1
0
Fork 0
mirror of https://github.com/rwinkhart/rcw.git synced 2026-09-03 15:47:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Return error from wrappers.Decrypt() if Argon2 salt is not present

Browse Source
This commit is contained in:
RandyTheSilly
2026-01-25 15:57:26 -05:00
parent 2520e2459e
commit 57eefdf8b4
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrappers/highLevel.go
+8 -3
View File
@@ -1,11 +1,16 @@
package wrappers
import "errors"
// Decrypt decrypts the provided byte slice using the provided passphrase.
func Decrypt(encBytes []byte, passphrase []byte) ([]byte, error) {
var err error = nil
func Decrypt(encBytes, passphrase []byte) ([]byte, error) {
if len(encBytes) < saltSize1 {
return nil, errors.New("High-level decrypt: Encrypted data is too short (invalid Argon2 salt)")
}
salt1 := encBytes[:saltSize1]
encBytes = encBytes[saltSize1:]
key1 := derivePrimaryKey(passphrase, salt1)
var err error
encBytes, err = decryptCha(encBytes, key1)
if err != nil {
return nil, err
@@ -18,7 +23,7 @@ func Decrypt(encBytes []byte, passphrase []byte) ([]byte, error) {
}
// Encrypt encrypts the provided byte slice using the provided passphrase.
func Encrypt(decBytes []byte, passphrase []byte) []byte {
func Encrypt(decBytes, passphrase []byte) []byte {
salt1 := getRandomBytes(saltSize1)
salt2AES := getRandomBytes(saltSize2)
salt2Cha := getRandomBytes(saltSize2)