From 4d43e6f13344080d75fe35567e306b85d98b8bbe Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Sun, 28 Apr 2024 17:21:33 +0200 Subject: [PATCH 1/4] Fix symmetric crypto key spelling --- agent/actions/actions.go | 8 ++++---- agent/actions/login.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/agent/actions/actions.go b/agent/actions/actions.go index 8790293..403d39a 100644 --- a/agent/actions/actions.go +++ b/agent/actions/actions.go @@ -64,17 +64,17 @@ func sync(ctx context.Context, vault *vault.Vault, cfg *config.Config) bool { return false } - var protectedUserSymetricKey crypto.SymmetricEncryptionKey + var protectedUserSymmetricKey crypto.SymmetricEncryptionKey if vault.Keyring.IsMemguard { - protectedUserSymetricKey, err = crypto.MemguardSymmetricEncryptionKeyFromBytes(userSymmetricKey) + protectedUserSymmetricKey, err = crypto.MemguardSymmetricEncryptionKeyFromBytes(userSymmetricKey) } else { - protectedUserSymetricKey, err = crypto.MemorySymmetricEncryptionKeyFromBytes(userSymmetricKey) + protectedUserSymmetricKey, err = crypto.MemorySymmetricEncryptionKeyFromBytes(userSymmetricKey) } if err != nil { return false } - err = bitwarden.DoFullSync(context.WithValue(ctx, bitwarden.AuthToken{}, token.AccessToken), vault, cfg, &protectedUserSymetricKey, true) + err = bitwarden.DoFullSync(context.WithValue(ctx, bitwarden.AuthToken{}, token.AccessToken), vault, cfg, &protectedUserSymmetricKey, true) if err != nil { return false } diff --git a/agent/actions/login.go b/agent/actions/login.go index 2e22af4..c277ef9 100644 --- a/agent/actions/login.go +++ b/agent/actions/login.go @@ -106,11 +106,11 @@ func handleLogin(msg messages.IPCMessage, cfg *config.Config, vault *vault.Vault err = cfg.SetUserSymmetricKey(vault.Keyring.GetAccountKey().Bytes()) err = cfg.SetMasterPasswordHash([]byte(masterpasswordHash)) err = cfg.SetMasterKey([]byte(masterKey.GetBytes())) - var protectedUserSymetricKey crypto.SymmetricEncryptionKey + var protectedUserSymmetricKey crypto.SymmetricEncryptionKey if vault.Keyring.IsMemguard { - protectedUserSymetricKey, err = crypto.MemguardSymmetricEncryptionKeyFromBytes(vault.Keyring.GetAccountKey().Bytes()) + protectedUserSymmetricKey, err = crypto.MemguardSymmetricEncryptionKeyFromBytes(vault.Keyring.GetAccountKey().Bytes()) } else { - protectedUserSymetricKey, err = crypto.MemorySymmetricEncryptionKeyFromBytes(vault.Keyring.GetAccountKey().Bytes()) + protectedUserSymmetricKey, err = crypto.MemorySymmetricEncryptionKeyFromBytes(vault.Keyring.GetAccountKey().Bytes()) } if err != nil { defer func() { @@ -129,7 +129,7 @@ func handleLogin(msg messages.IPCMessage, cfg *config.Config, vault *vault.Vault } return } - err = bitwarden.DoFullSync(context.WithValue(ctx, bitwarden.AuthToken{}, token.AccessToken), vault, cfg, &protectedUserSymetricKey, false) + err = bitwarden.DoFullSync(context.WithValue(ctx, bitwarden.AuthToken{}, token.AccessToken), vault, cfg, &protectedUserSymmetricKey, false) response, err = messages.IPCMessageFromPayload(messages.ActionResponse{ Success: true, From 7ba5d466c501b704c1614609108159482e60b914 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Sun, 28 Apr 2024 17:24:56 +0200 Subject: [PATCH 2/4] Fix asymetric spelling --- agent/bitwarden/crypto/crypto.go | 4 ++-- agent/bitwarden/passwordless.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agent/bitwarden/crypto/crypto.go b/agent/bitwarden/crypto/crypto.go index dbae73a..097cec8 100644 --- a/agent/bitwarden/crypto/crypto.go +++ b/agent/bitwarden/crypto/crypto.go @@ -113,11 +113,11 @@ func (key MemguardSymmetricEncryptionKey) MacKeyBytes() ([]byte, error) { return keyBytes, nil } -func MemoryAssymmetricEncryptionKeyFromBytes(key []byte) (MemoryAsymmetricEncryptionKey, error) { +func MemoryAsymmetricEncryptionKeyFromBytes(key []byte) (MemoryAsymmetricEncryptionKey, error) { return MemoryAsymmetricEncryptionKey{key}, nil } -func MemguardAssymmetricEncryptionKeyFromBytes(key []byte) (MemguardAsymmetricEncryptionKey, error) { +func MemguardAsymmetricEncryptionKeyFromBytes(key []byte) (MemguardAsymmetricEncryptionKey, error) { k := memguard.NewEnclave(key) return MemguardAsymmetricEncryptionKey{k}, nil } diff --git a/agent/bitwarden/passwordless.go b/agent/bitwarden/passwordless.go index 1f8b18f..e912b5d 100644 --- a/agent/bitwarden/passwordless.go +++ b/agent/bitwarden/passwordless.go @@ -72,7 +72,7 @@ func CreateAuthResponse(ctx context.Context, authRequest AuthRequestData, keyrin if err != nil { return AuthRequestResponseData{}, err } - requesterKey, err := crypto.MemoryAssymmetricEncryptionKeyFromBytes(publicKey) + requesterKey, err := crypto.MemoryAsymmetricEncryptionKeyFromBytes(publicKey) if err != nil { return AuthRequestResponseData{}, err } From 69e79980e5c5a725fa15045eeec86fb898ad3131 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Sun, 28 Apr 2024 17:25:37 +0200 Subject: [PATCH 3/4] Fix bufer spelling --- agent/pincache/pincache.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/pincache/pincache.go b/agent/pincache/pincache.go index 2e65786..64b3816 100644 --- a/agent/pincache/pincache.go +++ b/agent/pincache/pincache.go @@ -16,11 +16,11 @@ func SetPin(useMemguard bool, pin []byte) { func GetPin() ([]byte, error) { approved := biometrics.CheckBiometrics(biometrics.SSHKey) if approved { - bufer, err := cachedPin.Open() + buffer, err := cachedPin.Open() if err != nil { return nil, err } - return bufer.Bytes(), nil + return buffer.Bytes(), nil } else { return nil, errors.New("biometrics not approved") } From a404bba9d80f48628d922509255278567171ae8d Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Sun, 28 Apr 2024 17:27:55 +0200 Subject: [PATCH 4/4] Fix cipher spelling --- agent/actions/ssh.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/actions/ssh.go b/agent/actions/ssh.go index 5c1fa97..21fc767 100644 --- a/agent/actions/ssh.go +++ b/agent/actions/ssh.go @@ -29,9 +29,9 @@ func handleAddSSH(msg messages.IPCMessage, cfg *config.Config, vault *vault.Vaul actionsLog.Warn(err.Error()) } ctx := context.WithValue(context.TODO(), bitwarden.AuthToken{}, token.AccessToken) - ciph, err := bitwarden.PostCipher(ctx, cipher, cfg) + postedCipher, err := bitwarden.PostCipher(ctx, cipher, cfg) if err == nil { - vault.AddOrUpdateSecureNote(ciph) + vault.AddOrUpdateSecureNote(postedCipher) } else { actionsLog.Warn("Error posting ssh key cipher: " + err.Error()) }