core, crypto/secp256r1: fix error reverts tx error

pull/27540/head
Ulaş Erdoğan 1 year ago
parent f5b6d7e995
commit 2820903f59
  1. 8
      core/vm/contracts.go
  2. 20
      crypto/secp256r1/verifier.go

@ -1166,5 +1166,11 @@ func (c *p256Verify) Run(input []byte) ([]byte, error) {
x, y := new(big.Int).SetBytes(input[96:128]), new(big.Int).SetBytes(input[128:160]) x, y := new(big.Int).SetBytes(input[96:128]), new(big.Int).SetBytes(input[128:160])
// Verify the secp256r1 signature // Verify the secp256r1 signature
return secp256r1.Verify(hash, r, s, x, y) if secp256r1.Verify(hash, r, s, x, y) {
// Signature is valid
return common.LeftPadBytes(common.Big1.Bytes(), 32), nil
} else {
// Signature is invalid
return nil, nil
}
} }

@ -3,34 +3,36 @@ package secp256r1
import ( import (
"crypto/ecdsa" "crypto/ecdsa"
"crypto/elliptic" "crypto/elliptic"
"errors"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common"
) )
var ( var (
// Half of the order of the subgroup in the elliptic curve
secp256k1halfN = new(big.Int).Div(elliptic.P256().Params().N, big.NewInt(2)) secp256k1halfN = new(big.Int).Div(elliptic.P256().Params().N, big.NewInt(2))
) )
// Verifies the given signature (r, s) for the given hash and public key (x, y). // Verifies the given signature (r, s) for the given hash and public key (x, y).
func Verify(hash []byte, r, s, x, y *big.Int) ([]byte, error) { func Verify(hash []byte, r, s, x, y *big.Int) bool {
// Create the public key format // Create the public key format
publicKey := newPublicKey(x, y) publicKey := newPublicKey(x, y)
// Check if they are invalid public key coordinates
if publicKey == nil { if publicKey == nil {
return nil, errors.New("invalid public key coordinates") return false
} }
// Check the malleability issue
if checkMalleability(s) { if checkMalleability(s) {
return nil, errors.New("malleability issue") return false
} }
// Verify the signature with the public key and return 1 if it's valid, 0 otherwise // Verify the signature with the public key,
// then return true if it's valid, false otherwise
if ok := ecdsa.Verify(publicKey, hash, r, s); ok { if ok := ecdsa.Verify(publicKey, hash, r, s); ok {
return common.LeftPadBytes(common.Big1.Bytes(), 32), nil return true
} }
return common.LeftPadBytes(common.Big0.Bytes(), 32), nil return false
} }
// Check the malleability issue // Check the malleability issue

Loading…
Cancel
Save