Remove mimcry package add only hook

config.go

@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/pion/dtls/v2/pkg/crypto/elliptic"
-	"github.com/pion/dtls/v2/pkg/mimicry"
+	"github.com/pion/dtls/v2/pkg/protocol/handshake"
 	"github.com/pion/logging"
 )
 
@@ -198,9 +198,8 @@ type Config struct {
 	// https://datatracker.ietf.org/doc/html/rfc9146#section-4
 	PaddingLengthGenerator func(uint) uint
 
-	MimicryEnabled bool
-
-	ClientHelloFingerprint mimicry.ClientHelloFingerprint
+	// Random, SessionID, Cookie
+	ClientHelloMessageHook func(handshake.Random, []byte, []byte) handshake.Message
 }
 
 func defaultConnectContextMaker() (context.Context, func()) {

conn.go

@@ -202,8 +202,7 @@ func createConn(ctx context.Context, nextConn net.PacketConn, rAddr net.Addr, co
 		localGetClientCertificate:   config.GetClientCertificate,
 		insecureSkipHelloVerify:     config.InsecureSkipVerifyHello,
 		connectionIDGenerator:       config.ConnectionIDGenerator,
-		mimicryEnabled:              config.MimicryEnabled,
-		clientHelloFingerprint:      config.ClientHelloFingerprint,
+		clientHelloMessageHook:      config.ClientHelloMessageHook,
 	}
 
 	// rfc5246#section-7.4.3

e2e/e2e_test.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/pion/dtls/v2"
 	"github.com/pion/dtls/v2/pkg/crypto/selfsign"
+	"github.com/pion/dtls/v2/pkg/mimicry"
 	"github.com/pion/transport/v3/test"
 )
 
@@ -569,45 +570,6 @@ func testPionE2ESimpleRSAClientCert(t *testing.T, server, client func(*comm), op
 	comm.assert(t)
 }
 
-func testPionE2ESimpleMimicry(t *testing.T, server, client func(*comm), opts ...dtlsConfOpts) {
-	lim := test.TimeOut(time.Second * 30)
-	defer lim.Stop()
-
-	report := test.CheckRoutines(t)
-	defer report()
-
-	t.Run("Mimicry ClientHello", func(t *testing.T) {
-		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
-		defer cancel()
-
-		cert, err := selfsign.GenerateSelfSignedWithDNS("localhost")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		client_cfg := &dtls.Config{
-			Certificates:       []tls.Certificate{cert},
-			MimicryEnabled:     true,
-			InsecureSkipVerify: true,
-		}
-
-		server_cfg := &dtls.Config{
-			Certificates:           []tls.Certificate{cert},
-			SRTPProtectionProfiles: []dtls.SRTPProtectionProfile{dtls.SRTP_AES128_CM_HMAC_SHA1_80, dtls.SRTP_AES128_CM_HMAC_SHA1_32, dtls.SRTP_AEAD_AES_128_GCM, dtls.SRTP_AEAD_AES_256_GCM},
-			InsecureSkipVerify:     true,
-		}
-
-		for _, o := range opts {
-			o(client_cfg)
-			o(server_cfg)
-		}
-		serverPort := randomPort(t)
-		comm := newComm(ctx, client_cfg, server_cfg, serverPort, server, client)
-		defer comm.cleanup(t)
-		comm.assert(t)
-	})
-}
-
 func TestPionE2ESimple(t *testing.T) {
 	testPionE2ESimple(t, serverPion, clientPion)
 }
@@ -663,7 +625,3 @@ func TestPionE2ESimpleECDSAClientCertCID(t *testing.T) {
 func TestPionE2ESimpleRSAClientCertCID(t *testing.T) {
 	testPionE2ESimpleRSAClientCert(t, serverPion, clientPion, withConnectionIDGenerator(dtls.RandomCIDGenerator(8)))
 }
-
-func TestPionE2ESimpleMimicry(t *testing.T) {
-	testPionE2ESimpleMimicry(t, serverPion, clientPion)
-}

flight1handler.go

@@ -7,7 +7,6 @@ import (
 	"context"
 
 	"github.com/pion/dtls/v2/pkg/crypto/elliptic"
-	"github.com/pion/dtls/v2/pkg/mimicry"
 	"github.com/pion/dtls/v2/pkg/protocol"
 	"github.com/pion/dtls/v2/pkg/protocol/alert"
 	"github.com/pion/dtls/v2/pkg/protocol/extension"
@@ -134,25 +133,15 @@ func flight1Generate(c flightConn, state *State, _ *handshakeCache, cfg *handsha
 		extensions = append(extensions, &extension.ConnectionID{CID: state.localConnectionID})
 	}
 
-	if cfg.mimicryEnabled {
-		msg := &mimicry.MimickedClientHello{
-			Random:    state.localRandom,
-			SessionID: state.SessionID,
-			Cookie:    state.cookie,
-		}
-
-		msg.LoadFingerprint(cfg.clientHelloFingerprint)
-
-		cfg.localSRTPProtectionProfiles = msg.SRTPProtectionProfiles
-
+	if cfg.clientHelloMessageHook != nil {
 		return []*packet{
 			{
 				record: &recordlayer.RecordLayer{
 					Header: recordlayer.Header{
 						Version: protocol.Version1_2,
 					},
 					Content: &handshake.Handshake{
-						Message: msg,
+						Message: cfg.clientHelloMessageHook(state.localRandom, state.SessionID, state.cookie),
 					},
 				},
 			},

flight3handler.go

@@ -10,7 +10,6 @@ import (
 	"github.com/pion/dtls/v2/internal/ciphersuite/types"
 	"github.com/pion/dtls/v2/pkg/crypto/elliptic"
 	"github.com/pion/dtls/v2/pkg/crypto/prf"
-	"github.com/pion/dtls/v2/pkg/mimicry"
 	"github.com/pion/dtls/v2/pkg/protocol"
 	"github.com/pion/dtls/v2/pkg/protocol/alert"
 	"github.com/pion/dtls/v2/pkg/protocol/extension"
@@ -288,25 +287,15 @@ func flight3Generate(_ flightConn, state *State, _ *handshakeCache, cfg *handsha
 		extensions = append(extensions, &extension.ConnectionID{CID: state.localConnectionID})
 	}
 
-	if cfg.mimicryEnabled {
-		msg := &mimicry.MimickedClientHello{
-			Random:    state.localRandom,
-			SessionID: state.SessionID,
-			Cookie:    state.cookie,
-		}
-
-		msg.LoadFingerprint(cfg.clientHelloFingerprint)
-
-		cfg.localSRTPProtectionProfiles = msg.SRTPProtectionProfiles
-
+	if cfg.clientHelloMessageHook != nil {
 		return []*packet{
 			{
 				record: &recordlayer.RecordLayer{
 					Header: recordlayer.Header{
 						Version: protocol.Version1_2,
 					},
 					Content: &handshake.Handshake{
-						Message: msg,
+						Message: cfg.clientHelloMessageHook(state.localRandom, state.SessionID, state.cookie),
 					},
 				},
 			},

handshaker.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/pion/dtls/v2/pkg/crypto/elliptic"
 	"github.com/pion/dtls/v2/pkg/crypto/signaturehash"
-	"github.com/pion/dtls/v2/pkg/mimicry"
 	"github.com/pion/dtls/v2/pkg/protocol/alert"
 	"github.com/pion/dtls/v2/pkg/protocol/handshake"
 	"github.com/pion/logging"
@@ -127,8 +126,7 @@ type handshakeConfig struct {
 
 	mu sync.Mutex
 
-	mimicryEnabled         bool
-	clientHelloFingerprint mimicry.ClientHelloFingerprint
+	clientHelloMessageHook func(handshake.Random, []byte, []byte) handshake.Message // Random, SessionID, Cookie
 }
 
 type flightConn interface {