refactor: only keeps the second approach and passes test in the same way with severHelloMsg and clientHelloMsg

Author: Juktong

common.go

@@ -116,7 +116,6 @@ const (
 	extensionStatusRequestV2         uint16 = 17
 	extensionSCT                     uint16 = 18
 	extensionExtendedMasterSecret    uint16 = 23
-	extensionCompressCertificate     uint16 = 27
 	extensionDelegatedCredentials    uint16 = 34
 	extensionSessionTicket           uint16 = 35
 	extensionPreSharedKey            uint16 = 41

examples/ech/sslkeylogging.log

@@ -1276,12 +1276,11 @@ func (m *newSessionTicketMsgTLS13) unmarshal(data []byte) bool {
 }
 
 type certificateRequestMsgTLS13 struct {
-	original                         []byte
+	original                         []byte // [uTLS]
 	ocspStapling                     bool
 	scts                             bool
 	supportedSignatureAlgorithms     []SignatureScheme
 	supportedSignatureAlgorithmsCert []SignatureScheme
-	certRequestCompressionAlgs       []CertCompressionAlgo
 	certificateAuthorities           [][]byte
 }
 
@@ -1317,17 +1316,6 @@ func (m *certificateRequestMsgTLS13) marshal() ([]byte, error) {
 					})
 				})
 			}
-			if len(m.certRequestCompressionAlgs) > 0 {
-				b.AddUint16(extensionCompressCertificate)
-				b.AddUint16LengthPrefixed(func(b *cryptobyte.Builder) {
-					b.AddUint8LengthPrefixed(func(b *cryptobyte.Builder) {
-						for _, algo := range m.certRequestCompressionAlgs {
-							b.AddUint16(uint16(algo))
-						}
-					})
-				})
-			}
-
 			if len(m.supportedSignatureAlgorithmsCert) > 0 {
 				b.AddUint16(extensionSignatureAlgorithmsCert)
 				b.AddUint16LengthPrefixed(func(b *cryptobyte.Builder) {
@@ -1357,7 +1345,7 @@ func (m *certificateRequestMsgTLS13) marshal() ([]byte, error) {
 }
 
 func (m *certificateRequestMsgTLS13) unmarshal(data []byte) bool {
-	*m = certificateRequestMsgTLS13{original: data}
+	*m = certificateRequestMsgTLS13{original: data} // [uTLS]
 	s := cryptobyte.String(data)
 
 	var context, extensions cryptobyte.String
@@ -1394,19 +1382,6 @@ func (m *certificateRequestMsgTLS13) unmarshal(data []byte) bool {
 				m.supportedSignatureAlgorithms = append(
 					m.supportedSignatureAlgorithms, SignatureScheme(sigAndAlg))
 			}
-		case extensionCompressCertificate:
-			var algs cryptobyte.String
-			if !extData.ReadUint8LengthPrefixed(&algs) || algs.Empty() {
-				return false
-			}
-			for !algs.Empty() {
-				var alg uint16
-				if !algs.ReadUint16(&alg) {
-					return false
-				}
-				m.certRequestCompressionAlgs = append(
-					m.certRequestCompressionAlgs, CertCompressionAlgo(alg))
-			}
 		case extensionSignatureAlgorithmsCert:
 			var sigAndAlgs cryptobyte.String
 			if !extData.ReadUint16LengthPrefixed(&sigAndAlgs) || sigAndAlgs.Empty() {
@@ -1445,10 +1420,13 @@ func (m *certificateRequestMsgTLS13) unmarshal(data []byte) bool {
 	return true
 }
 
+// [UTLS SECTION BEGINS]
 func (m *certificateRequestMsgTLS13) originalBytes() []byte {
 	return m.original
 }
 
+// [UTLS SECTION ENDS]
+
 type certificateMsg struct {
 	certificates [][]byte
 }

handshake_messages.go

@@ -98,6 +98,8 @@ func TestMarshalUnmarshal(t *testing.T) {
 					t.original = nil
 				case *serverHelloMsg:
 					t.original = nil
+				case *certificateRequestMsgTLS13: // [UTLS]
+					t.original = nil // [UTLS]
 				}
 
 				if !reflect.DeepEqual(m1, m) {