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

Fix breaking exported MakeClientSessionState

Browse source
This commit is contained in:
Amir Khan 2024-06-26 14:30:53 -04:00
parent 01c746c919
commit feb41f856b
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/old/examples.go
View file

@ -138,7 +138,6 @@ func HttpGetTicket(hostname string, addr string) (*http.Response, error) {
sessionState := tls.MakeClientSessionState(sessionTicket, uint16(tls.VersionTLS12),
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
masterSecret,
false,
nil, nil)
err = uTlsConn.SetSessionState(sessionState)
@ -173,7 +172,6 @@ func HttpGetTicketHelloID(hostname string, addr string, helloID tls.ClientHelloI
sessionState := tls.MakeClientSessionState(sessionTicket, uint16(tls.VersionTLS12),
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
masterSecret,
false,
nil, nil)
uTlsConn.SetSessionState(sessionState)

10
u_public.go
View file

@ -617,22 +617,24 @@ func (PSS PskIdentities) ToPrivate() []pskIdentity {
// ClientSessionState is public, but all its fields are private. Let's add setters, getters and constructor
// TODO! can we change this enought (or export SessionState),
// such that we wouldn't need to fork crypto/tls?
// ClientSessionState contains the state needed by clients to resume TLS sessions.
func MakeClientSessionState(
SessionTicket []uint8,
Vers uint16,
CipherSuite uint16,
MasterSecret []byte,
ExtMasterSecret bool,
ServerCertificates []*x509.Certificate,
VerifiedChains [][]*x509.Certificate) *ClientSessionState {
// TODO: Add EMS to this constructor in uTLS v2
css := &ClientSessionState{
ticket: SessionTicket,
session: &SessionState{
version: Vers,
cipherSuite: CipherSuite,
secret: MasterSecret,
extMasterSecret: ExtMasterSecret,
peerCertificates: ServerCertificates,
verifiedChains: VerifiedChains,
},
@ -660,7 +662,7 @@ func (css *ClientSessionState) MasterSecret() []byte {
return css.session.secret
}
func (css *ClientSessionState) ExtMasterSecret() bool {
func (css *ClientSessionState) EMS() bool {
return css.session.extMasterSecret
}
@ -695,7 +697,7 @@ func (css *ClientSessionState) SetMasterSecret(MasterSecret []byte) {
}
css.session.secret = MasterSecret
}
func (css *ClientSessionState) SetEms(ems bool) {
func (css *ClientSessionState) SetEMS(ems bool) {
if css.session == nil {
css.session = &SessionState{}
}