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

Fix some linter issues

This commit is contained in:
Guillaume Ballet 2019-02-21 19:43:14 +01:00
parent 7b230b7ef1
commit ae82c58631
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accounts/scwallet/securechannel.go
View File

@ -165,11 +165,7 @@ func (s *SecureChannelSession) Open() error {
// The IV is the last bytes returned from the Open APDU. // The IV is the last bytes returned from the Open APDU.
s.iv = response.Data[scSecretLength:] s.iv = response.Data[scSecretLength:]
if err := s.mutuallyAuthenticate(); err != nil { return s.mutuallyAuthenticate()
return err
}
return nil
} }
// mutuallyAuthenticate is an internal method to authenticate both ends of the // mutuallyAuthenticate is an internal method to authenticate both ends of the

4
accounts/scwallet/wallet.go
View File

@ -1060,7 +1060,7 @@ func determinePublicKey(sig, pubkeyX []byte) ([]byte, error) {
sig[64] = byte(v) sig[64] = byte(v)
pubkey, err := crypto.Ecrecover(DerivationSignatureHash[:], sig) pubkey, err := crypto.Ecrecover(DerivationSignatureHash[:], sig)
if err == nil { if err == nil {
if bytes.Compare(pubkey[1:33], pubkeyX) == 0 { if bytes.Equal(pubkey[1:33], pubkeyX) {
return pubkey, nil return pubkey, nil
} }
} else if v == 1 || err != secp256k1.ErrRecoverFailed { } else if v == 1 || err != secp256k1.ErrRecoverFailed {
@ -1077,7 +1077,7 @@ func makeRecoverableSignature(hash, sig, expectedPubkey []byte) ([]byte, error)
sig[64] = byte(v) sig[64] = byte(v)
pubkey, err := crypto.Ecrecover(hash, sig) pubkey, err := crypto.Ecrecover(hash, sig)
if err == nil { if err == nil {
if bytes.Compare(pubkey, expectedPubkey) == 0 { if bytes.Equal(pubkey, expectedPubkey) {
return sig, nil return sig, nil
} }
} else if v == 1 || err != secp256k1.ErrRecoverFailed { } else if v == 1 || err != secp256k1.ErrRecoverFailed {