0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 支持通过密码短语派生数据仓库密钥 https://github.com/siyuan-note/siyuan/issues/5478

Browse source
This commit is contained in:
Liang Ding 2022-07-21 23:57:26 +08:00
parent a8066a73a2
commit 121b727259
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kernel/model/repository.go
View file

@ -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 {