mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-04 12:37:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

crypto/tls: use new ecdsa.VerifyASN1 API

Browse source 
Change-Id: I2a233190bda78ca022ff4074b4553788847d7583
Reviewed-on: https://go-review.googlesource.com/c/go/+/220720
Run-TryBot: Katie Hockman <katie@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Filippo Valsorda <filippo@golang.org>
This commit is contained in:
Katie Hockman 2020-02-24 17:23:19 -05:00
parent 5e6895faa7
commit 008ada74ec
2 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
auth.go
View file

@ -11,7 +11,6 @@ import (
"crypto/ed25519" "crypto/ed25519"
"crypto/elliptic" "crypto/elliptic"
"crypto/rsa" "crypto/rsa"
"encoding/asn1"
"errors" "errors"
"fmt" "fmt"
"hash" "hash"
@ -27,14 +26,7 @@ func verifyHandshakeSignature(sigType uint8, pubkey crypto.PublicKey, hashFunc c
if !ok { if !ok {
return fmt.Errorf("expected an ECDSA public key, got %T", pubkey) return fmt.Errorf("expected an ECDSA public key, got %T", pubkey)
} }
ecdsaSig := new(ecdsaSignature) if !ecdsa.VerifyASN1(pubKey, signed, sig) {
if _, err := asn1.Unmarshal(sig, ecdsaSig); err != nil {
return err
}
if ecdsaSig.R.Sign() <= 0 || ecdsaSig.S.Sign() <= 0 {
return errors.New("ECDSA signature contained zero or negative values")
}
if !ecdsa.Verify(pubKey, signed, ecdsaSig.R, ecdsaSig.S) {
return errors.New("ECDSA verification failure") return errors.New("ECDSA verification failure")
} }
case signatureEd25519: case signatureEd25519:

8
common.go
View file

@ -19,7 +19,6 @@ import (
"fmt" "fmt"
"internal/cpu" "internal/cpu"
"io" "io"
"math/big"
"net" "net"
"strings" "strings"
"sync" "sync"
@ -1264,13 +1263,6 @@ func (c *lruSessionCache) Get(sessionKey string) (*ClientSessionState, bool) {
return nil, false return nil, false
} }
// TODO(jsing): Make these available to both crypto/x509 and crypto/tls.
type dsaSignature struct {
R, S *big.Int
}
type ecdsaSignature dsaSignature
var emptyConfig Config var emptyConfig Config
func defaultConfig() *Config { func defaultConfig() *Config {