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

qtls: remove unneeded type alias for the tls.QUICEncryptionLevel (#4220)

Browse source 
* qtls: remove unneeded type alias for the tls.QUICEncryptionLevel

* handshake: make cryptoSetup.WriteRecord private
This commit is contained in:
Marten Seemann 2023-12-29 09:59:56 +07:00 • committed by GitHub
parent a937959fbf
commit d6e3f3229f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/handshake/crypto_setup.go
View file

@ -283,7 +283,7 @@ func (h *cryptoSetup) handleEvent(ev tls.QUICEvent) (done bool, err error) {
h.rejected0RTT() h.rejected0RTT()
return false, nil return false, nil
case tls.QUICWriteData: case tls.QUICWriteData:
h.WriteRecord(ev.Level, ev.Data) h.writeRecord(ev.Level, ev.Data)
return false, nil return false, nil
case tls.QUICHandshakeDone: case tls.QUICHandshakeDone:
h.handshakeComplete() h.handshakeComplete()
@ -490,7 +490,7 @@ func (h *cryptoSetup) SetWriteKey(el tls.QUICEncryptionLevel, suiteID uint16, tr
h.mutex.Lock() h.mutex.Lock()
//nolint:exhaustive // The TLS stack doesn't export Initial keys. //nolint:exhaustive // The TLS stack doesn't export Initial keys.
switch el { switch el {
case qtls.QUICEncryptionLevelEarly: case tls.QUICEncryptionLevelEarly:
if h.perspective == protocol.PerspectiveServer { if h.perspective == protocol.PerspectiveServer {
panic("Received 0-RTT write key for the server") panic("Received 0-RTT write key for the server")
} }
@ -539,15 +539,15 @@ func (h *cryptoSetup) SetWriteKey(el tls.QUICEncryptionLevel, suiteID uint16, tr
} }
} }
// WriteRecord is called when TLS writes data // writeRecord is called when TLS writes data
func (h *cryptoSetup) WriteRecord(encLevel qtls.QUICEncryptionLevel, p []byte) { func (h *cryptoSetup) writeRecord(encLevel tls.QUICEncryptionLevel, p []byte) {
//nolint:exhaustive // handshake records can only be written for Initial and Handshake. //nolint:exhaustive // handshake records can only be written for Initial and Handshake.
switch encLevel { switch encLevel {
case qtls.QUICEncryptionLevelInitial: case tls.QUICEncryptionLevelInitial:
h.events = append(h.events, Event{Kind: EventWriteInitialData, Data: p}) h.events = append(h.events, Event{Kind: EventWriteInitialData, Data: p})
case qtls.QUICEncryptionLevelHandshake: case tls.QUICEncryptionLevelHandshake:
h.events = append(h.events, Event{Kind: EventWriteHandshakeData, Data: p}) h.events = append(h.events, Event{Kind: EventWriteHandshakeData, Data: p})
case qtls.QUICEncryptionLevelApplication: case tls.QUICEncryptionLevelApplication:
panic("unexpected write") panic("unexpected write")
default: default:
panic(fmt.Sprintf("unexpected write encryption level: %s", encLevel)) panic(fmt.Sprintf("unexpected write encryption level: %s", encLevel))

11
internal/qtls/qtls.go
View file

@ -8,17 +8,6 @@ import (
"github.com/quic-go/quic-go/internal/protocol" "github.com/quic-go/quic-go/internal/protocol"
) )
type (
QUICEncryptionLevel = tls.QUICEncryptionLevel
)
const (
QUICEncryptionLevelInitial = tls.QUICEncryptionLevelInitial
QUICEncryptionLevelEarly = tls.QUICEncryptionLevelEarly
QUICEncryptionLevelHandshake = tls.QUICEncryptionLevelHandshake
QUICEncryptionLevelApplication = tls.QUICEncryptionLevelApplication
)
func SetupConfigForServer(qconf *tls.QUICConfig, _ bool, getData func() []byte, handleSessionTicket func([]byte, bool) bool) { func SetupConfigForServer(qconf *tls.QUICConfig, _ bool, getData func() []byte, handleSessionTicket func([]byte, bool) bool) {
conf := qconf.TLSConfig conf := qconf.TLSConfig