Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

accounts/keystore: handle error for invalid key in DecryptKey #27432

Merged
merged 2 commits into from Jun 7, 2023
Merged

accounts/keystore: handle error for invalid key in DecryptKey #27432

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f0285b
fix bugs: key is nil in DecryptKey
Jun 7, 2023
d6d4338
accounts/keystore: use ToECDSA
fjl Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions accounts/keystore/passphrase.go
View file
Open in desktop
Expand Up @@ -225,10 +225,13 @@ func DecryptKey(keyjson []byte, auth string) (*Key, error) {
if err != nil {
return nil, err
}
key := crypto.ToECDSAUnsafe(keyBytes)
key, err := crypto.ToECDSA(keyBytes)
if err != nil {
return nil, fmt.Errorf("invalid key: %w", err)
}
id, err := uuid.FromBytes(keyId)
if err != nil {
return nil, err
return nil, fmt.Errorf("invalid UUID: %w", err)
}
return &Key{
Id: id,
Expand Down