hardcoresushi
/
libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

libgocryptfs: fix config loading by scrypt hash

This commit is contained in:
Matéo Duparc 2023-05-03 14:13:18 +02:00
parent a238cc392f
commit 6308adf8e5
Signed by: hardcoresushi
GPG Key ID: AFE384344A45E13A
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/configfile/config_file.go
View File

@ -271,10 +271,10 @@ func (cf *ConfFile) EncryptKey(key []byte, password []byte, logN int, giveHash b
func (cf *ConfFile) GetMasterkey(password, givenScryptHash, returnedScryptHashBuff []byte) ([]byte, error) {
var masterkey []byte
var err error
var scryptHash []byte
if len(givenScryptHash) > 0 { //decrypt with hash
masterkey, err = cf.DecryptMasterKeyWithScryptHash(scryptHash)
masterkey, err = cf.DecryptMasterKeyWithScryptHash(givenScryptHash)
} else { //decrypt with password
var scryptHash []byte
masterkey, scryptHash, err = cf.DecryptMasterKey(password, len(returnedScryptHashBuff) > 0)
//copy and wipe scryptHash
for i := range scryptHash {