Skip to content

fix dropped errors #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alrs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix dropped errors #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion password.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ func Hash(userpass, masterpass string, version int, userparams, masterparams Scr
userPwBlake := blake2b.Sum512([]byte(userpass))
// 2) Blake2b hash is hashed again using Scrypt with supplied params plus random 8 byte salt, generating 56 byte output with salt appended for 64 byte total output
userpassScrypt, err := scryptHash(hex.EncodeToString(userPwBlake[:]), nil, userparams)

if err != nil {
return "", err
}
// 3) Encrypt userpass Scrypt output with secretbox XSalsa20-Poly1305 encryption-authentication method using random 24 byte nonce and masterpass Scrypt hash
encrypted, salt, err := encrypt(masterpass, userpassScrypt, masterparams)
// 4) Generate base64 of Secretbox output and salt then format output string and return
Expand Down Expand Up @@ -136,6 +138,9 @@ func updateMasterV1(newMaster, oldMaster string, newVersion int, parts []string,
// Regenerate Blake2b-256 hash (32 bytes) using masterpass for secretbox
//masterpassHash := blake2b.Sum256([]byte(masterpass))
salt, err := base64.StdEncoding.DecodeString(parts[3])
if err != nil {
return "", err
}
masterpassScrypt, err := scryptHash(oldMaster, salt, oldMasterparams)
if err != nil {
return "", err
Expand Down Expand Up @@ -203,6 +208,9 @@ func verifyV1(userpass, masterpass string, parts []string) (err error) {
// Regenerate Blake2b-256 hash (32 bytes) using masterpass for secretbox
//masterpassHash := blake2b.Sum256([]byte(masterpass))
salt, err := base64.StdEncoding.DecodeString(parts[3])
if err != nil {
return err
}
masterpassScrypt, err := scryptHash(masterpass, salt, masterparams)
if err != nil {
return err
Expand Down