Mirrors/gomuks
1
0
Fork 1
mirror of https://github.com/tulir/gomuks.git synced 2025-04-20 10:33:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Standardize around "Recovery Code" language

Browse source
This commit is contained in:
FIGBERT 2023-08-16 17:00:47 -07:00
parent 8a1e095f58
commit 634a3350d5
No known key found for this signature in database
GPG key ID: 67F1598D607A844B
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
headless/headless.go
View file

@ -18,7 +18,7 @@ import (
) )
type Config struct { type Config struct {
OutputDir, MxPassword, Homeserver, KeyPath, KeyPassword, RecoveryPhrase string OutputDir, MxPassword, Homeserver, KeyPath, KeyPassword, RecoveryCode string
MxID id.UserID MxID id.UserID
} }
@ -93,7 +93,7 @@ func Init(conf Config, updates chan fmt.Stringer) error {
updates <- syncFinished{} updates <- syncFinished{}
// verify (fetch) // verify (fetch)
key, err := getSSSS(mach, conf.RecoveryPhrase) key, err := getSSSS(mach, conf.RecoveryCode)
if err != nil { if err != nil {
return err return err
} }
@ -142,7 +142,7 @@ func initDirs() (string, string, string, string, error) {
return config, data, cache, download, nil return config, data, cache, download, nil
} }
func getSSSS(mach *crypto.OlmMachine, recoveryPhrase string) (*ssss.Key, error) { func getSSSS(mach *crypto.OlmMachine, recoveryCode string) (*ssss.Key, error) {
_, keyData, err := mach.SSSS.GetDefaultKeyData() _, keyData, err := mach.SSSS.GetDefaultKeyData()
if err != nil { if err != nil {
if errors.Is(err, mautrix.MNotFound) { if errors.Is(err, mautrix.MNotFound) {
@ -154,12 +154,12 @@ func getSSSS(mach *crypto.OlmMachine, recoveryPhrase string) (*ssss.Key, error)
var key *ssss.Key var key *ssss.Key
if keyData.Passphrase != nil && keyData.Passphrase.Algorithm == ssss.PassphraseAlgorithmPBKDF2 { if keyData.Passphrase != nil && keyData.Passphrase.Algorithm == ssss.PassphraseAlgorithmPBKDF2 {
key, err = keyData.VerifyPassphrase(recoveryPhrase) key, err = keyData.VerifyPassphrase(recoveryCode)
if errors.Is(err, ssss.ErrIncorrectSSSSKey) { if errors.Is(err, ssss.ErrIncorrectSSSSKey) {
return nil, fmt.Errorf("Incorrect passphrase") return nil, fmt.Errorf("Incorrect passphrase")
} }
} else { } else {
key, err = keyData.VerifyRecoveryKey(recoveryPhrase) key, err = keyData.VerifyRecoveryKey(recoveryCode)
if errors.Is(err, ssss.ErrInvalidRecoveryKey) { if errors.Is(err, ssss.ErrInvalidRecoveryKey) {
return nil, fmt.Errorf("Malformed recovery key") return nil, fmt.Errorf("Malformed recovery key")
} else if errors.Is(err, ssss.ErrIncorrectSSSSKey) { } else if errors.Is(err, ssss.ErrIncorrectSSSSKey) {