Add public getter/setter for SessionState.extMasterSecret

refraction-networking · Jun 19, 2024 · 01c746c · 01c746c
1 parent ebe5d66
commit 01c746c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/examples/old/examples.go b/examples/old/examples.go
@@ -138,6 +138,7 @@ 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)
@@ -172,6 +173,7 @@ 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)

diff --git a/u_public.go b/u_public.go
@@ -623,6 +623,7 @@ func MakeClientSessionState(
 	Vers uint16,
 	CipherSuite uint16,
 	MasterSecret []byte,
+	ExtMasterSecret bool,
 	ServerCertificates []*x509.Certificate,
 	VerifiedChains [][]*x509.Certificate) *ClientSessionState {
 	css := &ClientSessionState{
@@ -631,6 +632,7 @@ func MakeClientSessionState(
 			version:          Vers,
 			cipherSuite:      CipherSuite,
 			secret:           MasterSecret,
+			extMasterSecret:  ExtMasterSecret,
 			peerCertificates: ServerCertificates,
 			verifiedChains:   VerifiedChains,
 		},
@@ -658,6 +660,10 @@ func (css *ClientSessionState) MasterSecret() []byte {
 	return css.session.secret
 }
 
+func (css *ClientSessionState) ExtMasterSecret() bool {
+	return css.session.extMasterSecret
+}
+
 // Certificate chain presented by the server
 func (css *ClientSessionState) ServerCertificates() []*x509.Certificate {
 	return css.session.peerCertificates
@@ -689,6 +695,12 @@ func (css *ClientSessionState) SetMasterSecret(MasterSecret []byte) {
 	}
 	css.session.secret = MasterSecret
 }
+func (css *ClientSessionState) SetEms(ems bool) {
+	if css.session == nil {
+		css.session = &SessionState{}
+	}
+	css.session.extMasterSecret = ems
+}
 func (css *ClientSessionState) SetServerCertificates(ServerCertificates []*x509.Certificate) {
 	if css.session == nil {
 		css.session = &SessionState{}