From 121b727259c55dead117587e6897dea51c660803 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 21 Jul 2022 23:57:26 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=AF=E6=8C=81=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=9F=AD=E8=AF=AD=E6=B4=BE=E7=94=9F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BB=93=E5=BA=93=E5=AF=86=E9=92=A5=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/5478?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/repository.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 91666d8e5..6b72dd0ea 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -127,6 +127,12 @@ func ResetRepo() (err error) { } func InitRepoKeyFromPassphrase(passphrase string) (err error) { + passphrase = gulu.Str.RemoveInvisible(passphrase) + passphrase = strings.TrimSpace(passphrase) + if "" == passphrase { + return errors.New(Conf.Language(142)) + } + util.PushMsg(Conf.Language(136), 3000) if err = os.RemoveAll(Conf.Repo.GetSaveDir()); nil != err { @@ -136,12 +142,6 @@ func InitRepoKeyFromPassphrase(passphrase string) (err error) { return } - passphrase = gulu.Str.RemoveInvisible(passphrase) - passphrase = strings.TrimSpace(passphrase) - if "" == passphrase { - return errors.New(Conf.Language(142)) - } - salt := fmt.Sprintf("%x", sha256.Sum256([]byte(passphrase)))[:16] key, err := encryption.KDF(passphrase, salt) if nil != err {