forked from quic-go/quic-go
remove the error return value when receiving TLS extensions
This commit is contained in:
9
vendor/github.com/marten-seemann/qtls/13.go
generated
vendored
9
vendor/github.com/marten-seemann/qtls/13.go
generated
vendored
@@ -862,16 +862,15 @@ func getCertsFromEntries(certEntries []certificateEntry) [][]byte {
|
||||
return certs
|
||||
}
|
||||
|
||||
func (hs *clientHandshakeState) processEncryptedExtensions(ee *encryptedExtensionsMsg) error {
|
||||
func (hs *clientHandshakeState) processEncryptedExtensions(ee *encryptedExtensionsMsg) {
|
||||
c := hs.c
|
||||
if ee.alpnProtocol != "" {
|
||||
c.clientProtocol = ee.alpnProtocol
|
||||
c.clientProtocolFallback = false
|
||||
}
|
||||
if hs.c.config.ReceivedExtensions != nil {
|
||||
return hs.c.config.ReceivedExtensions(typeEncryptedExtensions, ee.additionalExtensions)
|
||||
hs.c.config.ReceivedExtensions(typeEncryptedExtensions, ee.additionalExtensions)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func verifyPeerHandshakeSignature(
|
||||
@@ -1037,9 +1036,7 @@ func (hs *clientHandshakeState) doTLS13Handshake() error {
|
||||
c.sendAlert(alertUnexpectedMessage)
|
||||
return unexpectedMessageError(encryptedExtensions, msg)
|
||||
}
|
||||
if err := hs.processEncryptedExtensions(encryptedExtensions); err != nil {
|
||||
return err
|
||||
}
|
||||
hs.processEncryptedExtensions(encryptedExtensions)
|
||||
hs.keySchedule.write(encryptedExtensions.marshal())
|
||||
|
||||
// PSKs are not supported, so receive Certificate message.
|
||||
|
||||
2
vendor/github.com/marten-seemann/qtls/common.go
generated
vendored
2
vendor/github.com/marten-seemann/qtls/common.go
generated
vendored
@@ -631,7 +631,7 @@ type Config struct {
|
||||
// Currently only implemented for the ClientHello message (sent by the
|
||||
// client) and for the EncryptedExtensions message (sent by the server).
|
||||
// Only valid for TLS 1.3.
|
||||
ReceivedExtensions func(handshakeMessageType uint8, exts []Extension) error
|
||||
ReceivedExtensions func(handshakeMessageType uint8, exts []Extension)
|
||||
|
||||
serverInitOnce sync.Once // guards calling (*Config).serverInit
|
||||
|
||||
|
||||
5
vendor/github.com/marten-seemann/qtls/handshake_server.go
generated
vendored
5
vendor/github.com/marten-seemann/qtls/handshake_server.go
generated
vendored
@@ -261,10 +261,7 @@ Curves:
|
||||
hs.hello.compressionMethod = compressionNone
|
||||
} else {
|
||||
if hs.c.config.ReceivedExtensions != nil {
|
||||
if err := hs.c.config.ReceivedExtensions(typeClientHello, hs.clientHello.additionalExtensions); err != nil {
|
||||
c.sendAlert(alertInternalError)
|
||||
return false, err
|
||||
}
|
||||
hs.c.config.ReceivedExtensions(typeClientHello, hs.clientHello.additionalExtensions)
|
||||
}
|
||||
hs.hello = new(serverHelloMsg)
|
||||
hs.hello13Enc = new(encryptedExtensionsMsg)
|
||||
|
||||
Reference in New Issue
Block a user