From 634a3350d590c347ac183ce7d1d182eb932c2dd2 Mon Sep 17 00:00:00 2001 From: FIGBERT Date: Wed, 16 Aug 2023 17:00:47 -0700 Subject: [PATCH] Standardize around "Recovery Code" language --- headless/headless.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/headless/headless.go b/headless/headless.go index c009341..6aa172a 100644 --- a/headless/headless.go +++ b/headless/headless.go @@ -18,8 +18,8 @@ import ( ) type Config struct { - OutputDir, MxPassword, Homeserver, KeyPath, KeyPassword, RecoveryPhrase string - MxID id.UserID + OutputDir, MxPassword, Homeserver, KeyPath, KeyPassword, RecoveryCode string + MxID id.UserID } func Init(conf Config, updates chan fmt.Stringer) error { @@ -93,7 +93,7 @@ func Init(conf Config, updates chan fmt.Stringer) error { updates <- syncFinished{} // verify (fetch) - key, err := getSSSS(mach, conf.RecoveryPhrase) + key, err := getSSSS(mach, conf.RecoveryCode) if err != nil { return err } @@ -142,7 +142,7 @@ func initDirs() (string, string, string, string, error) { 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() if err != nil { if errors.Is(err, mautrix.MNotFound) { @@ -154,12 +154,12 @@ func getSSSS(mach *crypto.OlmMachine, recoveryPhrase string) (*ssss.Key, error) var key *ssss.Key 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) { return nil, fmt.Errorf("Incorrect passphrase") } } else { - key, err = keyData.VerifyRecoveryKey(recoveryPhrase) + key, err = keyData.VerifyRecoveryKey(recoveryCode) if errors.Is(err, ssss.ErrInvalidRecoveryKey) { return nil, fmt.Errorf("Malformed recovery key") } else if errors.Is(err, ssss.ErrIncorrectSSSSKey) {