Skip to content

Commit

Permalink
core, crypto/secp256r1: fix error reverts tx error
Browse files Browse the repository at this point in the history
(cherry picked from commit 2820903f591365b17a4c3bdb36bd49ee2d84054c)
  • Loading branch information
ulerdogan authored and anshalshukla committed Nov 3, 2023
1 parent b5559e3 commit 0d115db
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 10 deletions.
8 changes: 7 additions & 1 deletion core/vm/contracts.go
Original file line number Diff line number Diff line change
Expand Up @@ -1138,5 +1138,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])

// 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
}
}
20 changes: 11 additions & 9 deletions crypto/secp256r1/verifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,36 @@ package secp256r1
import (
"crypto/ecdsa"
"crypto/elliptic"
"errors"
"math/big"

"github.com/ethereum/go-ethereum/common"
)

var (
// Half of the order of the subgroup in the elliptic curve
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).
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
publicKey := newPublicKey(x, y)

// Check if they are invalid public key coordinates
if publicKey == nil {
return nil, errors.New("invalid public key coordinates")
return false
}

// Check the malleability issue
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 {
return common.LeftPadBytes(common.Big1.Bytes(), 32), nil
return true
}

return common.LeftPadBytes(common.Big0.Bytes(), 32), nil
return false
}

// Check the malleability issue
Expand Down

0 comments on commit 0d115db

Please sign in to comment.