From 82521d3ca070de66e80687a162e22157232cc1de Mon Sep 17 00:00:00 2001 From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:21:03 -0600 Subject: [PATCH] Revert "accounts/keystore: handle error for invalid key in DecryptKey (#27432)" This reverts commit bfc46a49130758e53c83d054258df6ff2ce8a655. --- accounts/keystore/passphrase.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/accounts/keystore/passphrase.go b/accounts/keystore/passphrase.go index 8d6ed2b14ef2b..1701fbf53634e 100644 --- a/accounts/keystore/passphrase.go +++ b/accounts/keystore/passphrase.go @@ -225,13 +225,10 @@ func DecryptKey(keyjson []byte, auth string) (*Key, error) { if err != nil { return nil, err } - key, err := crypto.ToECDSA(keyBytes) - if err != nil { - return nil, fmt.Errorf("invalid key: %w", err) - } + key := crypto.ToECDSAUnsafe(keyBytes) id, err := uuid.FromBytes(keyId) if err != nil { - return nil, fmt.Errorf("invalid UUID: %w", err) + return nil, err } return &Key{ Id: id,