From 6308adf8e57379e1136f4f55ff0d7737c0d0a33b Mon Sep 17 00:00:00 2001
From: Hardcore Sushi <hardcore.sushi@disroot.org>
Date: Wed, 3 May 2023 14:13:18 +0200
Subject: [PATCH] libgocryptfs: fix config loading by scrypt hash

---
 internal/configfile/config_file.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/configfile/config_file.go b/internal/configfile/config_file.go
index 3282baa..789db41 100644
--- a/internal/configfile/config_file.go
+++ b/internal/configfile/config_file.go
@@ -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 {