status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

accounts/scwallet: fix public key confirmation regression

This commit is contained in:
Péter Szilágyi 2019-05-27 17:27:18 +03:00
parent 75a860880c
commit 7bc1cb3677
No known key found for this signature in database
GPG Key ID: E9AE538CEDF8293D
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
accounts/scwallet/wallet.go
View File

@ -982,12 +982,10 @@ func (s *Session) derive(path accounts.DerivationPath) (accounts.Account, error)
copy(sig[32-len(rbytes):32], rbytes) copy(sig[32-len(rbytes):32], rbytes)
copy(sig[64-len(sbytes):64], sbytes) copy(sig[64-len(sbytes):64], sbytes)
pubkey, err := determinePublicKey(sig, sigdata.PublicKey) if err := confirmPublicKey(sig, sigdata.PublicKey); err != nil {
if err != nil {
return accounts.Account{}, err return accounts.Account{}, err
} }
pub, err := crypto.UnmarshalPubkey(sigdata.PublicKey)
pub, err := crypto.UnmarshalPubkey(pubkey)
if err != nil { if err != nil {
return accounts.Account{}, err return accounts.Account{}, err
} }
@ -1057,10 +1055,10 @@ func (s *Session) sign(path accounts.DerivationPath, hash []byte) ([]byte, error
return sig, nil return sig, nil
} }
// determinePublicKey uses a signature and the X component of a public key to // confirmPublicKey confirms that the given signature belongs to the specified key.
// recover the entire public key. func confirmPublicKey(sig, pubkey []byte) error {
func determinePublicKey(sig, pubkeyX []byte) ([]byte, error) { _, err := makeRecoverableSignature(DerivationSignatureHash[:], sig, pubkey)
return makeRecoverableSignature(DerivationSignatureHash[:], sig, pubkeyX) return err
} }
// makeRecoverableSignature uses a signature and an expected public key to // makeRecoverableSignature uses a signature and an expected public key to