Remove duplicated wrapper crypto functions and use exported implementations directly

This commit is contained in:
2025-05-29 13:08:00 -07:00
parent 8cc15fde3d
commit 8dc2e9d748
7 changed files with 67 additions and 93 deletions
+9 -9
View File
@@ -149,9 +149,9 @@ func (s *Secret) GetValue(unlockKey UnlockKey) ([]byte, error) {
return nil, fmt.Errorf("failed to read encrypted long-term private key: %w", err)
}
// Decrypt the vault's long-term private key using the unlock key
Debug("Decrypting vault's long-term private key with unlock key", "secret_name", s.Name)
ltPrivKeyData, err := decryptWithIdentity(encryptedLtPrivKey, unlockIdentity)
// Decrypt the encrypted long-term private key using the unlock key
Debug("Decrypting long-term private key using unlock key", "secret_name", s.Name)
ltPrivKeyData, err := DecryptWithIdentity(encryptedLtPrivKey, unlockIdentity)
if err != nil {
Debug("Failed to decrypt long-term private key", "error", err, "secret_name", s.Name)
return nil, fmt.Errorf("failed to decrypt long-term private key: %w", err)
@@ -198,11 +198,11 @@ func (s *Secret) decryptWithLongTermKey(ltIdentity *age.X25519Identity) ([]byte,
)
// Step 2: Decrypt the secret's private key using the vault's long-term private key
Debug("Decrypting secret's private key with vault's long-term key", "secret_name", s.Name)
secretPrivKeyData, err := decryptWithIdentity(encryptedSecretPrivKey, ltIdentity)
Debug("Decrypting secret private key using long-term key", "secret_name", s.Name)
secretPrivKeyData, err := DecryptWithIdentity(encryptedSecretPrivKey, ltIdentity)
if err != nil {
Debug("Failed to decrypt secret's private key", "error", err, "secret_name", s.Name)
return nil, fmt.Errorf("failed to decrypt secret's private key: %w", err)
Debug("Failed to decrypt secret private key", "error", err, "secret_name", s.Name)
return nil, fmt.Errorf("failed to decrypt secret private key: %w", err)
}
// Parse the secret's private key
@@ -234,8 +234,8 @@ func (s *Secret) decryptWithLongTermKey(ltIdentity *age.X25519Identity) ([]byte,
)
// Step 4: Decrypt the secret's value using the secret's private key
Debug("Decrypting secret value with secret's private key", "secret_name", s.Name)
decryptedValue, err := decryptWithIdentity(encryptedValue, secretIdentity)
Debug("Decrypting value using secret key", "secret_name", s.Name)
decryptedValue, err := DecryptWithIdentity(encryptedValue, secretIdentity)
if err != nil {
Debug("Failed to decrypt secret value", "error", err, "secret_name", s.Name)
return nil, fmt.Errorf("failed to decrypt secret value: %w", err)