Fix cloudflare-tls usage

SagerNet · Aug 31, 2023 · 631da08 · 631da08
1 parent 32a432d
commit 631da08
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/connection.go b/connection.go
@@ -680,6 +680,7 @@ func (s *connection) ConnectionState() ConnectionState {
 	defer s.connStateMutex.Unlock()
 	cs := s.cryptoStreamHandler.ConnectionState()
 	s.connState.TLS = cs.ConnectionState
+	s.connState.ExportKeyingMaterial = cs.ConnectionState.ExportKeyingMaterial
 	s.connState.Used0RTT = cs.Used0RTT
 	return s.connState
 }

diff --git a/ech/connection.go b/ech/connection.go
@@ -3,6 +3,7 @@ package quic
 import (
 	"bytes"
 	"context"
+	stdTLS "crypto/tls"
 	"errors"
 	"fmt"
 	"io"
@@ -11,6 +12,7 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
+	"unsafe"
 
 	"github.com/sagernet/cloudflare-tls"
 	"github.com/sagernet/quic-go/congestion"
@@ -679,7 +681,9 @@ func (s *connection) ConnectionState() ConnectionState {
 	s.connStateMutex.Lock()
 	defer s.connStateMutex.Unlock()
 	cs := s.cryptoStreamHandler.ConnectionState()
-	s.connState.TLS = cs.ConnectionState
+	// s.connState.TLS = cs.ConnectionState
+	s.connState.TLS = *(*stdTLS.ConnectionState)(unsafe.Pointer(&cs.ConnectionState))
+	s.connState.ExportKeyingMaterial = cs.ConnectionState.ExportKeyingMaterial
 	s.connState.Used0RTT = cs.Used0RTT
 	return s.connState
 }

diff --git a/interface.go b/interface.go
@@ -357,4 +357,6 @@ type ConnectionState struct {
 	Used0RTT bool
 	// Version is the QUIC version of the QUIC connection.
 	Version VersionNumber
+
+	ExportKeyingMaterial func(label string, context []byte, length int) ([]byte, error)
 }