From 0a8d8382e8fcc2e93e470d16a2ea3bf64b7b0ee7 Mon Sep 17 00:00:00 2001 From: Sean DuBois Date: Wed, 24 Jul 2024 22:21:58 -0400 Subject: [PATCH] Prepare /v3 Update go.mod and imports for /v3 --- bench_test.go | 4 ++-- certificate.go | 2 +- certificate_test.go | 2 +- cipher_suite.go | 6 ++--- cipher_suite_test.go | 4 ++-- compression_method.go | 2 +- config.go | 4 ++-- config_test.go | 2 +- conn.go | 14 +++++------ conn_go_test.go | 4 ++-- conn_test.go | 24 +++++++++---------- connection_id.go | 8 +++---- connection_id_test.go | 8 +++---- crypto.go | 4 ++-- crypto_test.go | 4 ++-- e2e/e2e_lossy_test.go | 6 ++--- e2e/e2e_openssl_test.go | 2 +- e2e/e2e_test.go | 8 +++---- errors.go | 4 ++-- examples/dial/cid/main.go | 4 ++-- examples/dial/psk/main.go | 4 ++-- examples/dial/selfsign/main.go | 6 ++--- examples/dial/verify/main.go | 4 ++-- examples/listen/cid/main.go | 4 ++-- examples/listen/psk/main.go | 4 ++-- examples/listen/selfsign/main.go | 6 ++--- .../verify-brute-force-protection/main.go | 4 ++-- examples/listen/verify/main.go | 4 ++-- flight0handler.go | 10 ++++---- flight1handler.go | 12 +++++----- flight1handler_test.go | 6 ++--- flight2handler.go | 8 +++---- flight3handler.go | 16 ++++++------- flight3handler_test.go | 10 ++++---- flight4bhandler.go | 12 +++++----- flight4handler.go | 20 ++++++++-------- flight4handler_test.go | 12 +++++----- flight5bhandler.go | 10 ++++---- flight5handler.go | 12 +++++----- flight6handler.go | 10 ++++---- flighthandler.go | 2 +- fragment_buffer.go | 6 ++--- go.mod | 2 +- handshake_cache.go | 4 ++-- handshake_cache_test.go | 4 ++-- handshake_test.go | 6 ++--- handshaker.go | 8 +++---- handshaker_test.go | 10 ++++---- internal/ciphersuite/aes_128_ccm.go | 4 ++-- internal/ciphersuite/aes_256_ccm.go | 4 ++-- internal/ciphersuite/aes_ccm.go | 8 +++---- internal/ciphersuite/ciphersuite.go | 4 ++-- .../tls_ecdhe_ecdsa_with_aes_128_ccm.go | 4 ++-- .../tls_ecdhe_ecdsa_with_aes_128_ccm8.go | 4 ++-- ...tls_ecdhe_ecdsa_with_aes_128_gcm_sha256.go | 8 +++---- .../tls_ecdhe_ecdsa_with_aes_256_cbc_sha.go | 8 +++---- .../tls_ecdhe_psk_with_aes_128_cbc_sha256.go | 8 +++---- .../tls_ecdhe_rsa_with_aes_128_gcm_sha256.go | 2 +- .../tls_ecdhe_rsa_with_aes_256_cbc_sha.go | 2 +- .../tls_ecdhe_rsa_with_aes_256_gcm_sha384.go | 2 +- .../tls_psk_with_aes_128_cbc_sha256.go | 8 +++---- .../ciphersuite/tls_psk_with_aes_128_ccm.go | 4 ++-- .../ciphersuite/tls_psk_with_aes_128_ccm8.go | 4 ++-- .../tls_psk_with_aes_128_gcm_sha256.go | 2 +- .../ciphersuite/tls_psk_with_aes_256_ccm8.go | 4 ++-- internal/net/udp/packet_conn.go | 4 ++-- internal/net/udp/packet_conn_test.go | 2 +- listener.go | 8 +++---- packet.go | 2 +- pkg/crypto/ciphersuite/cbc.go | 8 +++---- pkg/crypto/ciphersuite/ccm.go | 6 ++--- pkg/crypto/ciphersuite/ciphersuite.go | 6 ++--- pkg/crypto/ciphersuite/ciphersuite_test.go | 4 ++-- pkg/crypto/ciphersuite/gcm.go | 4 ++-- pkg/crypto/hash/hash_test.go | 2 +- pkg/crypto/prf/prf.go | 4 ++-- pkg/crypto/prf/prf_test.go | 2 +- pkg/crypto/signaturehash/signaturehash.go | 4 ++-- .../signaturehash/signaturehash_test.go | 4 ++-- pkg/protocol/alert/alert.go | 2 +- pkg/protocol/extension/errors.go | 2 +- .../extension/supported_elliptic_curves.go | 2 +- .../supported_elliptic_curves_test.go | 2 +- .../extension/supported_point_formats.go | 2 +- .../extension/supported_point_formats_test.go | 2 +- .../supported_signature_algorithms.go | 6 ++--- .../supported_signature_algorithms_test.go | 6 ++--- pkg/protocol/handshake/errors.go | 2 +- pkg/protocol/handshake/handshake.go | 6 ++--- pkg/protocol/handshake/header.go | 2 +- pkg/protocol/handshake/message_certificate.go | 2 +- .../handshake/message_certificate_request.go | 8 +++---- .../message_certificate_request_test.go | 8 +++---- .../handshake/message_certificate_verify.go | 4 ++-- .../message_certificate_verify_test.go | 4 ++-- .../handshake/message_client_hello.go | 4 ++-- .../handshake/message_client_hello_test.go | 6 ++--- .../handshake/message_client_key_exchange.go | 2 +- .../message_client_key_exchange_test.go | 2 +- .../handshake/message_hello_verify_request.go | 2 +- .../message_hello_verify_request_test.go | 2 +- .../handshake/message_server_hello.go | 4 ++-- .../handshake/message_server_hello_test.go | 4 ++-- .../handshake/message_server_key_exchange.go | 8 +++---- .../message_server_key_exchange_test.go | 8 +++---- pkg/protocol/recordlayer/errors.go | 2 +- pkg/protocol/recordlayer/header.go | 4 ++-- pkg/protocol/recordlayer/inner_plaintext.go | 2 +- pkg/protocol/recordlayer/recordlayer.go | 6 ++--- pkg/protocol/recordlayer/recordlayer_test.go | 2 +- resume_test.go | 4 ++-- srtp_protection_profile.go | 2 +- state.go | 8 +++---- 113 files changed, 302 insertions(+), 302 deletions(-) diff --git a/bench_test.go b/bench_test.go index 885b311f2..57fe93ff1 100644 --- a/bench_test.go +++ b/bench_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/pion/dtls/v2/pkg/crypto/selfsign" - dtlsnet "github.com/pion/dtls/v2/pkg/net" + "github.com/pion/dtls/v3/pkg/crypto/selfsign" + dtlsnet "github.com/pion/dtls/v3/pkg/net" "github.com/pion/logging" "github.com/pion/transport/v3/dpipe" "github.com/pion/transport/v3/test" diff --git a/certificate.go b/certificate.go index e8dd2b83f..7e184dfd5 100644 --- a/certificate.go +++ b/certificate.go @@ -10,7 +10,7 @@ import ( "fmt" "strings" - "github.com/pion/dtls/v2/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/handshake" ) // ClientHelloInfo contains information from a ClientHello message in order to diff --git a/certificate_test.go b/certificate_test.go index 8c0868f45..37598a639 100644 --- a/certificate_test.go +++ b/certificate_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "github.com/pion/dtls/v2/pkg/crypto/selfsign" + "github.com/pion/dtls/v3/pkg/crypto/selfsign" ) func TestGetCertificate(t *testing.T) { diff --git a/cipher_suite.go b/cipher_suite.go index 6f7015c02..af95dec2e 100644 --- a/cipher_suite.go +++ b/cipher_suite.go @@ -11,9 +11,9 @@ import ( "fmt" "hash" - "github.com/pion/dtls/v2/internal/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/internal/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) // CipherSuiteID is an ID for our supported CipherSuites diff --git a/cipher_suite_test.go b/cipher_suite_test.go index 3aa4c8fe6..bd1f803ec 100644 --- a/cipher_suite_test.go +++ b/cipher_suite_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/pion/dtls/v2/internal/ciphersuite" - dtlsnet "github.com/pion/dtls/v2/pkg/net" + "github.com/pion/dtls/v3/internal/ciphersuite" + dtlsnet "github.com/pion/dtls/v3/pkg/net" "github.com/pion/transport/v3/dpipe" "github.com/pion/transport/v3/test" ) diff --git a/compression_method.go b/compression_method.go index 7e44de009..49b11c718 100644 --- a/compression_method.go +++ b/compression_method.go @@ -3,7 +3,7 @@ package dtls -import "github.com/pion/dtls/v2/pkg/protocol" +import "github.com/pion/dtls/v3/pkg/protocol" func defaultCompressionMethods() []*protocol.CompressionMethod { return []*protocol.CompressionMethod{ diff --git a/config.go b/config.go index f97930294..2fb241959 100644 --- a/config.go +++ b/config.go @@ -13,8 +13,8 @@ import ( "net" "time" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/protocol/handshake" "github.com/pion/logging" ) diff --git a/config_test.go b/config_test.go index 806d66929..99e25a4c2 100644 --- a/config_test.go +++ b/config_test.go @@ -11,7 +11,7 @@ import ( "errors" "testing" - "github.com/pion/dtls/v2/pkg/crypto/selfsign" + "github.com/pion/dtls/v3/pkg/crypto/selfsign" ) func TestValidateConfig(t *testing.T) { diff --git a/conn.go b/conn.go index 0d8896550..ce3234731 100644 --- a/conn.go +++ b/conn.go @@ -14,13 +14,13 @@ import ( "sync/atomic" "time" - "github.com/pion/dtls/v2/internal/closer" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/crypto/signaturehash" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/internal/closer" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/signaturehash" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" "github.com/pion/logging" "github.com/pion/transport/v3/deadline" "github.com/pion/transport/v3/netctx" diff --git a/conn_go_test.go b/conn_go_test.go index bd542f27d..6b05d8d76 100644 --- a/conn_go_test.go +++ b/conn_go_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - "github.com/pion/dtls/v2/pkg/crypto/selfsign" - dtlsnet "github.com/pion/dtls/v2/pkg/net" + "github.com/pion/dtls/v3/pkg/crypto/selfsign" + dtlsnet "github.com/pion/dtls/v3/pkg/net" "github.com/pion/transport/v3/dpipe" "github.com/pion/transport/v3/test" ) diff --git a/conn_test.go b/conn_test.go index 83a90f2d2..7192178a8 100644 --- a/conn_test.go +++ b/conn_test.go @@ -24,18 +24,18 @@ import ( "testing" "time" - "github.com/pion/dtls/v2/internal/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/crypto/hash" - "github.com/pion/dtls/v2/pkg/crypto/selfsign" - "github.com/pion/dtls/v2/pkg/crypto/signature" - "github.com/pion/dtls/v2/pkg/crypto/signaturehash" - dtlsnet "github.com/pion/dtls/v2/pkg/net" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/extension" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/internal/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/hash" + "github.com/pion/dtls/v3/pkg/crypto/selfsign" + "github.com/pion/dtls/v3/pkg/crypto/signature" + "github.com/pion/dtls/v3/pkg/crypto/signaturehash" + dtlsnet "github.com/pion/dtls/v3/pkg/net" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" "github.com/pion/logging" "github.com/pion/transport/v3/dpipe" "github.com/pion/transport/v3/test" diff --git a/connection_id.go b/connection_id.go index b2fbbd7a8..f0e94631b 100644 --- a/connection_id.go +++ b/connection_id.go @@ -6,10 +6,10 @@ package dtls import ( "crypto/rand" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/extension" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) // RandomCIDGenerator is a random Connection ID generator where CID is the diff --git a/connection_id_test.go b/connection_id_test.go index bc9a991d1..8936aba98 100644 --- a/connection_id_test.go +++ b/connection_id_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/extension" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) func TestRandomConnectionIDGenerator(t *testing.T) { diff --git a/crypto.go b/crypto.go index 7b01002f3..beddb40a8 100644 --- a/crypto.go +++ b/crypto.go @@ -15,8 +15,8 @@ import ( "math/big" "time" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/crypto/hash" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/hash" ) type ecdsaSignature struct { diff --git a/crypto_test.go b/crypto_test.go index 3b88fccee..e3f572eb5 100644 --- a/crypto_test.go +++ b/crypto_test.go @@ -9,8 +9,8 @@ import ( "encoding/pem" "testing" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/crypto/hash" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/hash" ) // nolint: gosec diff --git a/e2e/e2e_lossy_test.go b/e2e/e2e_lossy_test.go index a306584bb..5be97eb4c 100644 --- a/e2e/e2e_lossy_test.go +++ b/e2e/e2e_lossy_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/pion/dtls/v2" - "github.com/pion/dtls/v2/pkg/crypto/selfsign" - dtlsnet "github.com/pion/dtls/v2/pkg/net" + "github.com/pion/dtls/v3" + "github.com/pion/dtls/v3/pkg/crypto/selfsign" + dtlsnet "github.com/pion/dtls/v3/pkg/net" transportTest "github.com/pion/transport/v3/test" ) diff --git a/e2e/e2e_openssl_test.go b/e2e/e2e_openssl_test.go index dbcda4a07..97da68e88 100644 --- a/e2e/e2e_openssl_test.go +++ b/e2e/e2e_openssl_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/pion/dtls/v2" + "github.com/pion/dtls/v3" ) func serverOpenSSL(c *comm) { diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 0d8ba35bc..06f9b78fb 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "github.com/pion/dtls/v2" - "github.com/pion/dtls/v2/pkg/crypto/selfsign" - "github.com/pion/dtls/v2/pkg/protocol/extension" - "github.com/pion/dtls/v2/pkg/protocol/handshake" + "github.com/pion/dtls/v3" + "github.com/pion/dtls/v3/pkg/crypto/selfsign" + "github.com/pion/dtls/v3/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol/handshake" "github.com/pion/transport/v3/test" ) diff --git a/errors.go b/errors.go index 025d8645e..f03fb11c0 100644 --- a/errors.go +++ b/errors.go @@ -11,8 +11,8 @@ import ( "net" "os" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/alert" ) // Typed errors diff --git a/examples/dial/cid/main.go b/examples/dial/cid/main.go index 4859e72b1..b52631f1a 100644 --- a/examples/dial/cid/main.go +++ b/examples/dial/cid/main.go @@ -10,8 +10,8 @@ import ( "net" "time" - "github.com/pion/dtls/v2" - "github.com/pion/dtls/v2/examples/util" + "github.com/pion/dtls/v3" + "github.com/pion/dtls/v3/examples/util" ) func main() { diff --git a/examples/dial/psk/main.go b/examples/dial/psk/main.go index 94731e93a..112826bbc 100644 --- a/examples/dial/psk/main.go +++ b/examples/dial/psk/main.go @@ -10,8 +10,8 @@ import ( "net" "time" - "github.com/pion/dtls/v2" - "github.com/pion/dtls/v2/examples/util" + "github.com/pion/dtls/v3" + "github.com/pion/dtls/v3/examples/util" ) func main() { diff --git a/examples/dial/selfsign/main.go b/examples/dial/selfsign/main.go index b3be5a8f8..7d86adf13 100644 --- a/examples/dial/selfsign/main.go +++ b/examples/dial/selfsign/main.go @@ -11,9 +11,9 @@ import ( "net" "time" - "github.com/pion/dtls/v2" - "github.com/pion/dtls/v2/examples/util" - "github.com/pion/dtls/v2/pkg/crypto/selfsign" + "github.com/pion/dtls/v3" + "github.com/pion/dtls/v3/examples/util" + "github.com/pion/dtls/v3/pkg/crypto/selfsign" ) func main() { diff --git a/examples/dial/verify/main.go b/examples/dial/verify/main.go index ed5352dd5..e572aec2d 100644 --- a/examples/dial/verify/main.go +++ b/examples/dial/verify/main.go @@ -12,8 +12,8 @@ import ( "net" "time" - "github.com/pion/dtls/v2" - "github.com/pion/dtls/v2/examples/util" + "github.com/pion/dtls/v3" + "github.com/pion/dtls/v3/examples/util" ) func main() { diff --git a/examples/listen/cid/main.go b/examples/listen/cid/main.go index 11be4bc21..25cc3287d 100644 --- a/examples/listen/cid/main.go +++ b/examples/listen/cid/main.go @@ -9,8 +9,8 @@ import ( "fmt" "net" - "github.com/pion/dtls/v2" - "github.com/pion/dtls/v2/examples/util" + "github.com/pion/dtls/v3" + "github.com/pion/dtls/v3/examples/util" ) func main() { diff --git a/examples/listen/psk/main.go b/examples/listen/psk/main.go index e6c16514c..4fdcc838f 100644 --- a/examples/listen/psk/main.go +++ b/examples/listen/psk/main.go @@ -9,8 +9,8 @@ import ( "fmt" "net" - "github.com/pion/dtls/v2" - "github.com/pion/dtls/v2/examples/util" + "github.com/pion/dtls/v3" + "github.com/pion/dtls/v3/examples/util" ) func main() { diff --git a/examples/listen/selfsign/main.go b/examples/listen/selfsign/main.go index af1010102..a73b1479c 100644 --- a/examples/listen/selfsign/main.go +++ b/examples/listen/selfsign/main.go @@ -10,9 +10,9 @@ import ( "fmt" "net" - "github.com/pion/dtls/v2" - "github.com/pion/dtls/v2/examples/util" - "github.com/pion/dtls/v2/pkg/crypto/selfsign" + "github.com/pion/dtls/v3" + "github.com/pion/dtls/v3/examples/util" + "github.com/pion/dtls/v3/pkg/crypto/selfsign" ) func main() { diff --git a/examples/listen/verify-brute-force-protection/main.go b/examples/listen/verify-brute-force-protection/main.go index bcb518164..aaa1a90ad 100644 --- a/examples/listen/verify-brute-force-protection/main.go +++ b/examples/listen/verify-brute-force-protection/main.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "github.com/pion/dtls/v2" - "github.com/pion/dtls/v2/examples/util" + "github.com/pion/dtls/v3" + "github.com/pion/dtls/v3/examples/util" ) func main() { diff --git a/examples/listen/verify/main.go b/examples/listen/verify/main.go index 5ef6e038f..cb19ee605 100644 --- a/examples/listen/verify/main.go +++ b/examples/listen/verify/main.go @@ -11,8 +11,8 @@ import ( "fmt" "net" - "github.com/pion/dtls/v2" - "github.com/pion/dtls/v2/examples/util" + "github.com/pion/dtls/v3" + "github.com/pion/dtls/v3/examples/util" ) func main() { diff --git a/flight0handler.go b/flight0handler.go index c965fd0b5..77d403276 100644 --- a/flight0handler.go +++ b/flight0handler.go @@ -7,11 +7,11 @@ import ( "context" "crypto/rand" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/extension" - "github.com/pion/dtls/v2/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol/handshake" ) func flight0Parse(_ context.Context, _ flightConn, state *State, cache *handshakeCache, cfg *handshakeConfig) (flightVal, *alert.Alert, error) { diff --git a/flight1handler.go b/flight1handler.go index bcbddc3ec..69019c91c 100644 --- a/flight1handler.go +++ b/flight1handler.go @@ -6,12 +6,12 @@ package dtls import ( "context" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/extension" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) func flight1Parse(ctx context.Context, c flightConn, state *State, cache *handshakeCache, cfg *handshakeConfig) (flightVal, *alert.Alert, error) { diff --git a/flight1handler_test.go b/flight1handler_test.go index 461ef7cf6..f6dc46c3e 100644 --- a/flight1handler_test.go +++ b/flight1handler_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/pion/dtls/v2/internal/ciphersuite" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/handshake" + "github.com/pion/dtls/v3/internal/ciphersuite" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/handshake" "github.com/pion/logging" "github.com/pion/transport/v3/test" ) diff --git a/flight2handler.go b/flight2handler.go index 26e57d2f2..0af457c35 100644 --- a/flight2handler.go +++ b/flight2handler.go @@ -7,10 +7,10 @@ import ( "bytes" "context" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) func flight2Parse(ctx context.Context, c flightConn, state *State, cache *handshakeCache, cfg *handshakeConfig) (flightVal, *alert.Alert, error) { diff --git a/flight3handler.go b/flight3handler.go index 678b1e5a7..39d9380cb 100644 --- a/flight3handler.go +++ b/flight3handler.go @@ -7,14 +7,14 @@ import ( "bytes" "context" - "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/protocol" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/extension" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/internal/ciphersuite/types" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) func flight3Parse(ctx context.Context, c flightConn, state *State, cache *handshakeCache, cfg *handshakeConfig) (flightVal, *alert.Alert, error) { //nolint:gocognit diff --git a/flight3handler_test.go b/flight3handler_test.go index 537e206db..e801be00a 100644 --- a/flight3handler_test.go +++ b/flight3handler_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - dtlsnet "github.com/pion/dtls/v2/pkg/net" - "github.com/pion/dtls/v2/pkg/protocol/extension" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + dtlsnet "github.com/pion/dtls/v3/pkg/net" + "github.com/pion/dtls/v3/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" "github.com/pion/transport/v3/dpipe" "github.com/pion/transport/v3/test" ) diff --git a/flight4bhandler.go b/flight4bhandler.go index d653f4d94..71e7044cb 100644 --- a/flight4bhandler.go +++ b/flight4bhandler.go @@ -7,12 +7,12 @@ import ( "bytes" "context" - "github.com/pion/dtls/v2/pkg/crypto/prf" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/extension" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) func flight4bParse(_ context.Context, _ flightConn, state *State, cache *handshakeCache, cfg *handshakeConfig) (flightVal, *alert.Alert, error) { diff --git a/flight4handler.go b/flight4handler.go index b1ff6c3ff..af8cf6b4b 100644 --- a/flight4handler.go +++ b/flight4handler.go @@ -8,16 +8,16 @@ import ( "crypto/rand" "crypto/x509" - "github.com/pion/dtls/v2/internal/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/crypto/prf" - "github.com/pion/dtls/v2/pkg/crypto/signaturehash" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/extension" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/internal/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/crypto/signaturehash" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) func flight4Parse(ctx context.Context, c flightConn, state *State, cache *handshakeCache, cfg *handshakeConfig) (flightVal, *alert.Alert, error) { //nolint:gocognit diff --git a/flight4handler_test.go b/flight4handler_test.go index bf99a160e..20e9d2253 100644 --- a/flight4handler_test.go +++ b/flight4handler_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "github.com/pion/dtls/v2/internal/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/crypto/selfsign" - "github.com/pion/dtls/v2/pkg/crypto/signaturehash" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/handshake" + "github.com/pion/dtls/v3/internal/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/selfsign" + "github.com/pion/dtls/v3/pkg/crypto/signaturehash" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/handshake" "github.com/pion/transport/v3/test" ) diff --git a/flight5bhandler.go b/flight5bhandler.go index ddd37324c..27a05cc21 100644 --- a/flight5bhandler.go +++ b/flight5bhandler.go @@ -6,11 +6,11 @@ package dtls import ( "context" - "github.com/pion/dtls/v2/pkg/crypto/prf" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) func flight5bParse(_ context.Context, _ flightConn, state *State, cache *handshakeCache, cfg *handshakeConfig) (flightVal, *alert.Alert, error) { diff --git a/flight5handler.go b/flight5handler.go index 14ad66e53..2f6e7b3ee 100644 --- a/flight5handler.go +++ b/flight5handler.go @@ -9,12 +9,12 @@ import ( "crypto" "crypto/x509" - "github.com/pion/dtls/v2/pkg/crypto/prf" - "github.com/pion/dtls/v2/pkg/crypto/signaturehash" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/crypto/signaturehash" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) func flight5Parse(_ context.Context, c flightConn, state *State, cache *handshakeCache, cfg *handshakeConfig) (flightVal, *alert.Alert, error) { diff --git a/flight6handler.go b/flight6handler.go index c03890425..576dc551b 100644 --- a/flight6handler.go +++ b/flight6handler.go @@ -6,11 +6,11 @@ package dtls import ( "context" - "github.com/pion/dtls/v2/pkg/crypto/prf" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) func flight6Parse(_ context.Context, _ flightConn, state *State, cache *handshakeCache, cfg *handshakeConfig) (flightVal, *alert.Alert, error) { diff --git a/flighthandler.go b/flighthandler.go index ceb4a992b..651ff17e0 100644 --- a/flighthandler.go +++ b/flighthandler.go @@ -6,7 +6,7 @@ package dtls import ( "context" - "github.com/pion/dtls/v2/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/alert" ) // Parse received handshakes and return next flightVal diff --git a/fragment_buffer.go b/fragment_buffer.go index f7785ec32..37223ab07 100644 --- a/fragment_buffer.go +++ b/fragment_buffer.go @@ -4,9 +4,9 @@ package dtls import ( - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) // 2 megabytes diff --git a/go.mod b/go.mod index 8313206c9..6ddc83232 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/pion/dtls/v2 +module github.com/pion/dtls/v3 require ( github.com/pion/logging v0.2.2 diff --git a/handshake_cache.go b/handshake_cache.go index 85c87e640..285c71331 100644 --- a/handshake_cache.go +++ b/handshake_cache.go @@ -6,8 +6,8 @@ package dtls import ( "sync" - "github.com/pion/dtls/v2/pkg/crypto/prf" - "github.com/pion/dtls/v2/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/protocol/handshake" ) type handshakeCacheItem struct { diff --git a/handshake_cache_test.go b/handshake_cache_test.go index 44a15b587..647a3f35e 100644 --- a/handshake_cache_test.go +++ b/handshake_cache_test.go @@ -7,8 +7,8 @@ import ( "bytes" "testing" - "github.com/pion/dtls/v2/internal/ciphersuite" - "github.com/pion/dtls/v2/pkg/protocol/handshake" + "github.com/pion/dtls/v3/internal/ciphersuite" + "github.com/pion/dtls/v3/pkg/protocol/handshake" ) func TestHandshakeCacheSinglePush(t *testing.T) { diff --git a/handshake_test.go b/handshake_test.go index 5bba7f812..4cadb610f 100644 --- a/handshake_test.go +++ b/handshake_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/extension" - "github.com/pion/dtls/v2/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol/handshake" ) func TestHandshakeMessage(t *testing.T) { diff --git a/handshaker.go b/handshaker.go index 62a4bf6e8..0c2a43643 100644 --- a/handshaker.go +++ b/handshaker.go @@ -12,10 +12,10 @@ import ( "sync" "time" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/crypto/signaturehash" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/signaturehash" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/handshake" "github.com/pion/logging" ) diff --git a/handshaker_test.go b/handshaker_test.go index b814fc90b..39b7ff20c 100644 --- a/handshaker_test.go +++ b/handshaker_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - "github.com/pion/dtls/v2/pkg/crypto/selfsign" - "github.com/pion/dtls/v2/pkg/crypto/signaturehash" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/handshake" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/crypto/selfsign" + "github.com/pion/dtls/v3/pkg/crypto/signaturehash" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" "github.com/pion/logging" "github.com/pion/transport/v3/test" ) diff --git a/internal/ciphersuite/aes_128_ccm.go b/internal/ciphersuite/aes_128_ccm.go index f78b6dc2c..0877c2c18 100644 --- a/internal/ciphersuite/aes_128_ccm.go +++ b/internal/ciphersuite/aes_128_ccm.go @@ -4,8 +4,8 @@ package ciphersuite import ( - "github.com/pion/dtls/v2/pkg/crypto/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" ) // Aes128Ccm is a base class used by multiple AES-CCM Ciphers diff --git a/internal/ciphersuite/aes_256_ccm.go b/internal/ciphersuite/aes_256_ccm.go index bb8128627..bbdf06d81 100644 --- a/internal/ciphersuite/aes_256_ccm.go +++ b/internal/ciphersuite/aes_256_ccm.go @@ -4,8 +4,8 @@ package ciphersuite import ( - "github.com/pion/dtls/v2/pkg/crypto/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" ) // Aes256Ccm is a base class used by multiple AES-CCM Ciphers diff --git a/internal/ciphersuite/aes_ccm.go b/internal/ciphersuite/aes_ccm.go index ee3cca903..54eafcf80 100644 --- a/internal/ciphersuite/aes_ccm.go +++ b/internal/ciphersuite/aes_ccm.go @@ -9,10 +9,10 @@ import ( "hash" "sync/atomic" - "github.com/pion/dtls/v2/pkg/crypto/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" - "github.com/pion/dtls/v2/pkg/crypto/prf" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/crypto/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) // AesCcm is a base class used by multiple AES-CCM Ciphers diff --git a/internal/ciphersuite/ciphersuite.go b/internal/ciphersuite/ciphersuite.go index f44f29fd3..4778be72a 100644 --- a/internal/ciphersuite/ciphersuite.go +++ b/internal/ciphersuite/ciphersuite.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - "github.com/pion/dtls/v2/internal/ciphersuite/types" - "github.com/pion/dtls/v2/pkg/protocol" + "github.com/pion/dtls/v3/internal/ciphersuite/types" + "github.com/pion/dtls/v3/pkg/protocol" ) var errCipherSuiteNotInit = &protocol.TemporaryError{Err: errors.New("CipherSuite has not been initialized")} //nolint:goerr113 diff --git a/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_128_ccm.go b/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_128_ccm.go index 8367b2c6d..e55290799 100644 --- a/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_128_ccm.go +++ b/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_128_ccm.go @@ -4,8 +4,8 @@ package ciphersuite import ( - "github.com/pion/dtls/v2/pkg/crypto/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" ) // NewTLSEcdheEcdsaWithAes128Ccm constructs a TLS_ECDHE_ECDSA_WITH_AES_128_CCM Cipher diff --git a/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_128_ccm8.go b/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_128_ccm8.go index 11b687327..a423a13f1 100644 --- a/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_128_ccm8.go +++ b/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_128_ccm8.go @@ -4,8 +4,8 @@ package ciphersuite import ( - "github.com/pion/dtls/v2/pkg/crypto/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" ) // NewTLSEcdheEcdsaWithAes128Ccm8 creates a new TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 CipherSuite diff --git a/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_128_gcm_sha256.go b/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_128_gcm_sha256.go index 362370b98..9f7b27788 100644 --- a/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_128_gcm_sha256.go +++ b/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_128_gcm_sha256.go @@ -9,10 +9,10 @@ import ( "hash" "sync/atomic" - "github.com/pion/dtls/v2/pkg/crypto/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" - "github.com/pion/dtls/v2/pkg/crypto/prf" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/crypto/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) // TLSEcdheEcdsaWithAes128GcmSha256 represents a TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 CipherSuite diff --git a/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_256_cbc_sha.go b/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_256_cbc_sha.go index 07ad66fd1..87f5ef395 100644 --- a/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_256_cbc_sha.go +++ b/internal/ciphersuite/tls_ecdhe_ecdsa_with_aes_256_cbc_sha.go @@ -10,10 +10,10 @@ import ( "hash" "sync/atomic" - "github.com/pion/dtls/v2/pkg/crypto/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" - "github.com/pion/dtls/v2/pkg/crypto/prf" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/crypto/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) // TLSEcdheEcdsaWithAes256CbcSha represents a TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA CipherSuite diff --git a/internal/ciphersuite/tls_ecdhe_psk_with_aes_128_cbc_sha256.go b/internal/ciphersuite/tls_ecdhe_psk_with_aes_128_cbc_sha256.go index 10cc58c0b..87b80f421 100644 --- a/internal/ciphersuite/tls_ecdhe_psk_with_aes_128_cbc_sha256.go +++ b/internal/ciphersuite/tls_ecdhe_psk_with_aes_128_cbc_sha256.go @@ -9,10 +9,10 @@ import ( "hash" "sync/atomic" - "github.com/pion/dtls/v2/pkg/crypto/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" - "github.com/pion/dtls/v2/pkg/crypto/prf" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/crypto/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) // TLSEcdhePskWithAes128CbcSha256 implements the TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256 CipherSuite diff --git a/internal/ciphersuite/tls_ecdhe_rsa_with_aes_128_gcm_sha256.go b/internal/ciphersuite/tls_ecdhe_rsa_with_aes_128_gcm_sha256.go index 478a2e0dc..5ac17ed97 100644 --- a/internal/ciphersuite/tls_ecdhe_rsa_with_aes_128_gcm_sha256.go +++ b/internal/ciphersuite/tls_ecdhe_rsa_with_aes_128_gcm_sha256.go @@ -3,7 +3,7 @@ package ciphersuite -import "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" +import "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" // TLSEcdheRsaWithAes128GcmSha256 implements the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 CipherSuite type TLSEcdheRsaWithAes128GcmSha256 struct { diff --git a/internal/ciphersuite/tls_ecdhe_rsa_with_aes_256_cbc_sha.go b/internal/ciphersuite/tls_ecdhe_rsa_with_aes_256_cbc_sha.go index 8e88ee639..545c2e46f 100644 --- a/internal/ciphersuite/tls_ecdhe_rsa_with_aes_256_cbc_sha.go +++ b/internal/ciphersuite/tls_ecdhe_rsa_with_aes_256_cbc_sha.go @@ -3,7 +3,7 @@ package ciphersuite -import "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" +import "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" // TLSEcdheRsaWithAes256CbcSha implements the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA CipherSuite type TLSEcdheRsaWithAes256CbcSha struct { diff --git a/internal/ciphersuite/tls_ecdhe_rsa_with_aes_256_gcm_sha384.go b/internal/ciphersuite/tls_ecdhe_rsa_with_aes_256_gcm_sha384.go index 752fb529c..5750cc386 100644 --- a/internal/ciphersuite/tls_ecdhe_rsa_with_aes_256_gcm_sha384.go +++ b/internal/ciphersuite/tls_ecdhe_rsa_with_aes_256_gcm_sha384.go @@ -3,7 +3,7 @@ package ciphersuite -import "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" +import "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" // TLSEcdheRsaWithAes256GcmSha384 implements the TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 CipherSuite type TLSEcdheRsaWithAes256GcmSha384 struct { diff --git a/internal/ciphersuite/tls_psk_with_aes_128_cbc_sha256.go b/internal/ciphersuite/tls_psk_with_aes_128_cbc_sha256.go index dea0dfc75..dc485c46b 100644 --- a/internal/ciphersuite/tls_psk_with_aes_128_cbc_sha256.go +++ b/internal/ciphersuite/tls_psk_with_aes_128_cbc_sha256.go @@ -9,10 +9,10 @@ import ( "hash" "sync/atomic" - "github.com/pion/dtls/v2/pkg/crypto/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" - "github.com/pion/dtls/v2/pkg/crypto/prf" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/crypto/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) // TLSPskWithAes128CbcSha256 implements the TLS_PSK_WITH_AES_128_CBC_SHA256 CipherSuite diff --git a/internal/ciphersuite/tls_psk_with_aes_128_ccm.go b/internal/ciphersuite/tls_psk_with_aes_128_ccm.go index 1ded09b88..6344f11fb 100644 --- a/internal/ciphersuite/tls_psk_with_aes_128_ccm.go +++ b/internal/ciphersuite/tls_psk_with_aes_128_ccm.go @@ -4,8 +4,8 @@ package ciphersuite import ( - "github.com/pion/dtls/v2/pkg/crypto/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" ) // NewTLSPskWithAes128Ccm returns the TLS_PSK_WITH_AES_128_CCM CipherSuite diff --git a/internal/ciphersuite/tls_psk_with_aes_128_ccm8.go b/internal/ciphersuite/tls_psk_with_aes_128_ccm8.go index 478197074..4b0827533 100644 --- a/internal/ciphersuite/tls_psk_with_aes_128_ccm8.go +++ b/internal/ciphersuite/tls_psk_with_aes_128_ccm8.go @@ -4,8 +4,8 @@ package ciphersuite import ( - "github.com/pion/dtls/v2/pkg/crypto/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" ) // NewTLSPskWithAes128Ccm8 returns the TLS_PSK_WITH_AES_128_CCM_8 CipherSuite diff --git a/internal/ciphersuite/tls_psk_with_aes_128_gcm_sha256.go b/internal/ciphersuite/tls_psk_with_aes_128_gcm_sha256.go index 8ab5b89a8..3a5e7e753 100644 --- a/internal/ciphersuite/tls_psk_with_aes_128_gcm_sha256.go +++ b/internal/ciphersuite/tls_psk_with_aes_128_gcm_sha256.go @@ -3,7 +3,7 @@ package ciphersuite -import "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" +import "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" // TLSPskWithAes128GcmSha256 implements the TLS_PSK_WITH_AES_128_GCM_SHA256 CipherSuite type TLSPskWithAes128GcmSha256 struct { diff --git a/internal/ciphersuite/tls_psk_with_aes_256_ccm8.go b/internal/ciphersuite/tls_psk_with_aes_256_ccm8.go index 32d503018..211bdae03 100644 --- a/internal/ciphersuite/tls_psk_with_aes_256_ccm8.go +++ b/internal/ciphersuite/tls_psk_with_aes_256_ccm8.go @@ -4,8 +4,8 @@ package ciphersuite import ( - "github.com/pion/dtls/v2/pkg/crypto/ciphersuite" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/ciphersuite" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" ) // NewTLSPskWithAes256Ccm8 returns the TLS_PSK_WITH_AES_256_CCM_8 CipherSuite diff --git a/internal/net/udp/packet_conn.go b/internal/net/udp/packet_conn.go index 7dafbe23e..da5b6fae8 100644 --- a/internal/net/udp/packet_conn.go +++ b/internal/net/udp/packet_conn.go @@ -24,8 +24,8 @@ import ( "sync/atomic" "time" - idtlsnet "github.com/pion/dtls/v2/internal/net" - dtlsnet "github.com/pion/dtls/v2/pkg/net" + idtlsnet "github.com/pion/dtls/v3/internal/net" + dtlsnet "github.com/pion/dtls/v3/pkg/net" "github.com/pion/transport/v3/deadline" ) diff --git a/internal/net/udp/packet_conn_test.go b/internal/net/udp/packet_conn_test.go index cb239b3e0..2e9f4a063 100644 --- a/internal/net/udp/packet_conn_test.go +++ b/internal/net/udp/packet_conn_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - dtlsnet "github.com/pion/dtls/v2/pkg/net" + dtlsnet "github.com/pion/dtls/v3/pkg/net" "github.com/pion/transport/v3/test" ) diff --git a/listener.go b/listener.go index cb75d4143..22e56ce52 100644 --- a/listener.go +++ b/listener.go @@ -6,10 +6,10 @@ package dtls import ( "net" - "github.com/pion/dtls/v2/internal/net/udp" - dtlsnet "github.com/pion/dtls/v2/pkg/net" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/internal/net/udp" + dtlsnet "github.com/pion/dtls/v3/pkg/net" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) // Listen creates a DTLS listener diff --git a/packet.go b/packet.go index 052c33a19..c224eff1b 100644 --- a/packet.go +++ b/packet.go @@ -4,7 +4,7 @@ package dtls import ( - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) type packet struct { diff --git a/pkg/crypto/ciphersuite/cbc.go b/pkg/crypto/ciphersuite/cbc.go index 008a8365b..68a080d5d 100644 --- a/pkg/crypto/ciphersuite/cbc.go +++ b/pkg/crypto/ciphersuite/cbc.go @@ -11,10 +11,10 @@ import ( //nolint:gci "encoding/binary" "hash" - "github.com/pion/dtls/v2/internal/util" - "github.com/pion/dtls/v2/pkg/crypto/prf" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/internal/util" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" "golang.org/x/crypto/cryptobyte" ) diff --git a/pkg/crypto/ciphersuite/ccm.go b/pkg/crypto/ciphersuite/ccm.go index 6fb185d85..4c296e2bb 100644 --- a/pkg/crypto/ciphersuite/ccm.go +++ b/pkg/crypto/ciphersuite/ccm.go @@ -9,9 +9,9 @@ import ( "encoding/binary" "fmt" - "github.com/pion/dtls/v2/pkg/crypto/ccm" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/crypto/ccm" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) // CCMTagLen is the length of Authentication Tag diff --git a/pkg/crypto/ciphersuite/ciphersuite.go b/pkg/crypto/ciphersuite/ciphersuite.go index a3130be12..90ddf6105 100644 --- a/pkg/crypto/ciphersuite/ciphersuite.go +++ b/pkg/crypto/ciphersuite/ciphersuite.go @@ -8,9 +8,9 @@ import ( "encoding/binary" "errors" - "github.com/pion/dtls/v2/internal/util" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/internal/util" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" "golang.org/x/crypto/cryptobyte" ) diff --git a/pkg/crypto/ciphersuite/ciphersuite_test.go b/pkg/crypto/ciphersuite/ciphersuite_test.go index 0c2652f79..100d718d9 100644 --- a/pkg/crypto/ciphersuite/ciphersuite_test.go +++ b/pkg/crypto/ciphersuite/ciphersuite_test.go @@ -8,8 +8,8 @@ import ( "bytes" "testing" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) func TestGenerateAEADAdditionalDataCID(t *testing.T) { diff --git a/pkg/crypto/ciphersuite/gcm.go b/pkg/crypto/ciphersuite/gcm.go index 1d09c8eb9..a7f828246 100644 --- a/pkg/crypto/ciphersuite/gcm.go +++ b/pkg/crypto/ciphersuite/gcm.go @@ -10,8 +10,8 @@ import ( "encoding/binary" "fmt" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/recordlayer" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/recordlayer" ) const ( diff --git a/pkg/crypto/hash/hash_test.go b/pkg/crypto/hash/hash_test.go index e6711c69e..d6660254b 100644 --- a/pkg/crypto/hash/hash_test.go +++ b/pkg/crypto/hash/hash_test.go @@ -6,7 +6,7 @@ package hash import ( "testing" - "github.com/pion/dtls/v2/pkg/crypto/fingerprint" + "github.com/pion/dtls/v3/pkg/crypto/fingerprint" ) func TestHashAlgorithm_StringRoundtrip(t *testing.T) { diff --git a/pkg/crypto/prf/prf.go b/pkg/crypto/prf/prf.go index 6e7b3ecba..b5ac19f79 100644 --- a/pkg/crypto/prf/prf.go +++ b/pkg/crypto/prf/prf.go @@ -13,8 +13,8 @@ import ( //nolint:gci "hash" "math" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/protocol" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/protocol" "golang.org/x/crypto/curve25519" ) diff --git a/pkg/crypto/prf/prf_test.go b/pkg/crypto/prf/prf_test.go index bd375b9aa..fa9b32510 100644 --- a/pkg/crypto/prf/prf_test.go +++ b/pkg/crypto/prf/prf_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" ) func TestPreMasterSecret(t *testing.T) { diff --git a/pkg/crypto/signaturehash/signaturehash.go b/pkg/crypto/signaturehash/signaturehash.go index 2561accd1..38587768b 100644 --- a/pkg/crypto/signaturehash/signaturehash.go +++ b/pkg/crypto/signaturehash/signaturehash.go @@ -12,8 +12,8 @@ import ( "crypto/tls" "fmt" - "github.com/pion/dtls/v2/pkg/crypto/hash" - "github.com/pion/dtls/v2/pkg/crypto/signature" + "github.com/pion/dtls/v3/pkg/crypto/hash" + "github.com/pion/dtls/v3/pkg/crypto/signature" ) // Algorithm is a signature/hash algorithm pairs which may be used in diff --git a/pkg/crypto/signaturehash/signaturehash_test.go b/pkg/crypto/signaturehash/signaturehash_test.go index 6df4dbcab..54afce324 100644 --- a/pkg/crypto/signaturehash/signaturehash_test.go +++ b/pkg/crypto/signaturehash/signaturehash_test.go @@ -9,8 +9,8 @@ import ( "reflect" "testing" - "github.com/pion/dtls/v2/pkg/crypto/hash" - "github.com/pion/dtls/v2/pkg/crypto/signature" + "github.com/pion/dtls/v3/pkg/crypto/hash" + "github.com/pion/dtls/v3/pkg/crypto/signature" ) func TestParseSignatureSchemes(t *testing.T) { diff --git a/pkg/protocol/alert/alert.go b/pkg/protocol/alert/alert.go index 91e9f4d60..0a9e0a215 100644 --- a/pkg/protocol/alert/alert.go +++ b/pkg/protocol/alert/alert.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/pion/dtls/v2/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol" ) var errBufferTooSmall = &protocol.TemporaryError{Err: errors.New("buffer is too small")} //nolint:goerr113 diff --git a/pkg/protocol/extension/errors.go b/pkg/protocol/extension/errors.go index 39431206f..6b4c9229b 100644 --- a/pkg/protocol/extension/errors.go +++ b/pkg/protocol/extension/errors.go @@ -6,7 +6,7 @@ package extension import ( "errors" - "github.com/pion/dtls/v2/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol" ) var ( diff --git a/pkg/protocol/extension/supported_elliptic_curves.go b/pkg/protocol/extension/supported_elliptic_curves.go index dd9b54f0d..e83b5ccb8 100644 --- a/pkg/protocol/extension/supported_elliptic_curves.go +++ b/pkg/protocol/extension/supported_elliptic_curves.go @@ -6,7 +6,7 @@ package extension import ( "encoding/binary" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" ) const ( diff --git a/pkg/protocol/extension/supported_elliptic_curves_test.go b/pkg/protocol/extension/supported_elliptic_curves_test.go index dc6c6c502..620246a81 100644 --- a/pkg/protocol/extension/supported_elliptic_curves_test.go +++ b/pkg/protocol/extension/supported_elliptic_curves_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" ) func TestExtensionSupportedGroups(t *testing.T) { diff --git a/pkg/protocol/extension/supported_point_formats.go b/pkg/protocol/extension/supported_point_formats.go index 5ed0f347f..ec877aff2 100644 --- a/pkg/protocol/extension/supported_point_formats.go +++ b/pkg/protocol/extension/supported_point_formats.go @@ -6,7 +6,7 @@ package extension import ( "encoding/binary" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" ) const ( diff --git a/pkg/protocol/extension/supported_point_formats_test.go b/pkg/protocol/extension/supported_point_formats_test.go index 81862679a..eecbd5c82 100644 --- a/pkg/protocol/extension/supported_point_formats_test.go +++ b/pkg/protocol/extension/supported_point_formats_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" ) func TestExtensionSupportedPointFormats(t *testing.T) { diff --git a/pkg/protocol/extension/supported_signature_algorithms.go b/pkg/protocol/extension/supported_signature_algorithms.go index 2ff4b90b6..396b9ae38 100644 --- a/pkg/protocol/extension/supported_signature_algorithms.go +++ b/pkg/protocol/extension/supported_signature_algorithms.go @@ -6,9 +6,9 @@ package extension import ( "encoding/binary" - "github.com/pion/dtls/v2/pkg/crypto/hash" - "github.com/pion/dtls/v2/pkg/crypto/signature" - "github.com/pion/dtls/v2/pkg/crypto/signaturehash" + "github.com/pion/dtls/v3/pkg/crypto/hash" + "github.com/pion/dtls/v3/pkg/crypto/signature" + "github.com/pion/dtls/v3/pkg/crypto/signaturehash" ) const ( diff --git a/pkg/protocol/extension/supported_signature_algorithms_test.go b/pkg/protocol/extension/supported_signature_algorithms_test.go index 16fce4793..80b5692e3 100644 --- a/pkg/protocol/extension/supported_signature_algorithms_test.go +++ b/pkg/protocol/extension/supported_signature_algorithms_test.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" - "github.com/pion/dtls/v2/pkg/crypto/hash" - "github.com/pion/dtls/v2/pkg/crypto/signature" - "github.com/pion/dtls/v2/pkg/crypto/signaturehash" + "github.com/pion/dtls/v3/pkg/crypto/hash" + "github.com/pion/dtls/v3/pkg/crypto/signature" + "github.com/pion/dtls/v3/pkg/crypto/signaturehash" ) func TestExtensionSupportedSignatureAlgorithms(t *testing.T) { diff --git a/pkg/protocol/handshake/errors.go b/pkg/protocol/handshake/errors.go index 1354300c4..4f007198f 100644 --- a/pkg/protocol/handshake/errors.go +++ b/pkg/protocol/handshake/errors.go @@ -6,7 +6,7 @@ package handshake import ( "errors" - "github.com/pion/dtls/v2/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol" ) // Typed errors diff --git a/pkg/protocol/handshake/handshake.go b/pkg/protocol/handshake/handshake.go index b1f682bf5..6f0eb9c71 100644 --- a/pkg/protocol/handshake/handshake.go +++ b/pkg/protocol/handshake/handshake.go @@ -5,9 +5,9 @@ package handshake import ( - "github.com/pion/dtls/v2/internal/ciphersuite/types" - "github.com/pion/dtls/v2/internal/util" - "github.com/pion/dtls/v2/pkg/protocol" + "github.com/pion/dtls/v3/internal/ciphersuite/types" + "github.com/pion/dtls/v3/internal/util" + "github.com/pion/dtls/v3/pkg/protocol" ) // Type is the unique identifier for each handshake message diff --git a/pkg/protocol/handshake/header.go b/pkg/protocol/handshake/header.go index 4f9a96287..619fd2bdb 100644 --- a/pkg/protocol/handshake/header.go +++ b/pkg/protocol/handshake/header.go @@ -6,7 +6,7 @@ package handshake import ( "encoding/binary" - "github.com/pion/dtls/v2/internal/util" + "github.com/pion/dtls/v3/internal/util" ) // HeaderLength msg_len for Handshake messages assumes an extra diff --git a/pkg/protocol/handshake/message_certificate.go b/pkg/protocol/handshake/message_certificate.go index d5c861d90..54b0bfddb 100644 --- a/pkg/protocol/handshake/message_certificate.go +++ b/pkg/protocol/handshake/message_certificate.go @@ -4,7 +4,7 @@ package handshake import ( - "github.com/pion/dtls/v2/internal/util" + "github.com/pion/dtls/v3/internal/util" ) // MessageCertificate is a DTLS Handshake Message diff --git a/pkg/protocol/handshake/message_certificate_request.go b/pkg/protocol/handshake/message_certificate_request.go index 11a44d440..5c3ac63c5 100644 --- a/pkg/protocol/handshake/message_certificate_request.go +++ b/pkg/protocol/handshake/message_certificate_request.go @@ -6,10 +6,10 @@ package handshake import ( "encoding/binary" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" - "github.com/pion/dtls/v2/pkg/crypto/hash" - "github.com/pion/dtls/v2/pkg/crypto/signature" - "github.com/pion/dtls/v2/pkg/crypto/signaturehash" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/hash" + "github.com/pion/dtls/v3/pkg/crypto/signature" + "github.com/pion/dtls/v3/pkg/crypto/signaturehash" ) /* diff --git a/pkg/protocol/handshake/message_certificate_request_test.go b/pkg/protocol/handshake/message_certificate_request_test.go index 99b360f80..78bcb5b41 100644 --- a/pkg/protocol/handshake/message_certificate_request_test.go +++ b/pkg/protocol/handshake/message_certificate_request_test.go @@ -8,10 +8,10 @@ import ( "reflect" "testing" - "github.com/pion/dtls/v2/pkg/crypto/clientcertificate" - "github.com/pion/dtls/v2/pkg/crypto/hash" - "github.com/pion/dtls/v2/pkg/crypto/signature" - "github.com/pion/dtls/v2/pkg/crypto/signaturehash" + "github.com/pion/dtls/v3/pkg/crypto/clientcertificate" + "github.com/pion/dtls/v3/pkg/crypto/hash" + "github.com/pion/dtls/v3/pkg/crypto/signature" + "github.com/pion/dtls/v3/pkg/crypto/signaturehash" ) func TestHandshakeMessageCertificateRequest(t *testing.T) { diff --git a/pkg/protocol/handshake/message_certificate_verify.go b/pkg/protocol/handshake/message_certificate_verify.go index 9e02a9c11..9d09b31ca 100644 --- a/pkg/protocol/handshake/message_certificate_verify.go +++ b/pkg/protocol/handshake/message_certificate_verify.go @@ -6,8 +6,8 @@ package handshake import ( "encoding/binary" - "github.com/pion/dtls/v2/pkg/crypto/hash" - "github.com/pion/dtls/v2/pkg/crypto/signature" + "github.com/pion/dtls/v3/pkg/crypto/hash" + "github.com/pion/dtls/v3/pkg/crypto/signature" ) // MessageCertificateVerify provide explicit verification of a diff --git a/pkg/protocol/handshake/message_certificate_verify_test.go b/pkg/protocol/handshake/message_certificate_verify_test.go index ea9cdce7c..3144e5c78 100644 --- a/pkg/protocol/handshake/message_certificate_verify_test.go +++ b/pkg/protocol/handshake/message_certificate_verify_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/pion/dtls/v2/pkg/crypto/hash" - "github.com/pion/dtls/v2/pkg/crypto/signature" + "github.com/pion/dtls/v3/pkg/crypto/hash" + "github.com/pion/dtls/v3/pkg/crypto/signature" ) func TestHandshakeMessageCertificateVerify(t *testing.T) { diff --git a/pkg/protocol/handshake/message_client_hello.go b/pkg/protocol/handshake/message_client_hello.go index bea6dd969..c651718e5 100644 --- a/pkg/protocol/handshake/message_client_hello.go +++ b/pkg/protocol/handshake/message_client_hello.go @@ -6,8 +6,8 @@ package handshake import ( "encoding/binary" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/extension" ) /* diff --git a/pkg/protocol/handshake/message_client_hello_test.go b/pkg/protocol/handshake/message_client_hello_test.go index eeb73b81e..d46567691 100644 --- a/pkg/protocol/handshake/message_client_hello_test.go +++ b/pkg/protocol/handshake/message_client_hello_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/extension" ) func TestHandshakeMessageClientHello(t *testing.T) { diff --git a/pkg/protocol/handshake/message_client_key_exchange.go b/pkg/protocol/handshake/message_client_key_exchange.go index 2abcd5bf7..626361c6c 100644 --- a/pkg/protocol/handshake/message_client_key_exchange.go +++ b/pkg/protocol/handshake/message_client_key_exchange.go @@ -6,7 +6,7 @@ package handshake import ( "encoding/binary" - "github.com/pion/dtls/v2/internal/ciphersuite/types" + "github.com/pion/dtls/v3/internal/ciphersuite/types" ) // MessageClientKeyExchange is a DTLS Handshake Message diff --git a/pkg/protocol/handshake/message_client_key_exchange_test.go b/pkg/protocol/handshake/message_client_key_exchange_test.go index 88f31af8b..c7d569542 100644 --- a/pkg/protocol/handshake/message_client_key_exchange_test.go +++ b/pkg/protocol/handshake/message_client_key_exchange_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "github.com/pion/dtls/v2/internal/ciphersuite/types" + "github.com/pion/dtls/v3/internal/ciphersuite/types" ) func TestHandshakeMessageClientKeyExchange(t *testing.T) { diff --git a/pkg/protocol/handshake/message_hello_verify_request.go b/pkg/protocol/handshake/message_hello_verify_request.go index 398e59cc3..98960400c 100644 --- a/pkg/protocol/handshake/message_hello_verify_request.go +++ b/pkg/protocol/handshake/message_hello_verify_request.go @@ -4,7 +4,7 @@ package handshake import ( - "github.com/pion/dtls/v2/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol" ) // MessageHelloVerifyRequest is as follows: diff --git a/pkg/protocol/handshake/message_hello_verify_request_test.go b/pkg/protocol/handshake/message_hello_verify_request_test.go index 3513fc8ee..82252566e 100644 --- a/pkg/protocol/handshake/message_hello_verify_request_test.go +++ b/pkg/protocol/handshake/message_hello_verify_request_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "github.com/pion/dtls/v2/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol" ) func TestHandshakeMessageHelloVerifyRequest(t *testing.T) { diff --git a/pkg/protocol/handshake/message_server_hello.go b/pkg/protocol/handshake/message_server_hello.go index caf186da8..a1e86e1b2 100644 --- a/pkg/protocol/handshake/message_server_hello.go +++ b/pkg/protocol/handshake/message_server_hello.go @@ -6,8 +6,8 @@ package handshake import ( "encoding/binary" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/extension" ) // MessageServerHello is sent in response to a ClientHello diff --git a/pkg/protocol/handshake/message_server_hello_test.go b/pkg/protocol/handshake/message_server_hello_test.go index 14b713fcd..c4d6683a5 100644 --- a/pkg/protocol/handshake/message_server_hello_test.go +++ b/pkg/protocol/handshake/message_server_hello_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/extension" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/extension" ) func TestHandshakeMessageServerHello(t *testing.T) { diff --git a/pkg/protocol/handshake/message_server_key_exchange.go b/pkg/protocol/handshake/message_server_key_exchange.go index 82abbe0d4..1edac45f9 100644 --- a/pkg/protocol/handshake/message_server_key_exchange.go +++ b/pkg/protocol/handshake/message_server_key_exchange.go @@ -6,10 +6,10 @@ package handshake import ( "encoding/binary" - "github.com/pion/dtls/v2/internal/ciphersuite/types" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/crypto/hash" - "github.com/pion/dtls/v2/pkg/crypto/signature" + "github.com/pion/dtls/v3/internal/ciphersuite/types" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/hash" + "github.com/pion/dtls/v3/pkg/crypto/signature" ) // MessageServerKeyExchange supports ECDH and PSK diff --git a/pkg/protocol/handshake/message_server_key_exchange_test.go b/pkg/protocol/handshake/message_server_key_exchange_test.go index 7e960ce03..fc4573cf3 100644 --- a/pkg/protocol/handshake/message_server_key_exchange_test.go +++ b/pkg/protocol/handshake/message_server_key_exchange_test.go @@ -7,10 +7,10 @@ import ( "reflect" "testing" - "github.com/pion/dtls/v2/internal/ciphersuite/types" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/crypto/hash" - "github.com/pion/dtls/v2/pkg/crypto/signature" + "github.com/pion/dtls/v3/internal/ciphersuite/types" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/hash" + "github.com/pion/dtls/v3/pkg/crypto/signature" ) func TestHandshakeMessageServerKeyExchange(t *testing.T) { diff --git a/pkg/protocol/recordlayer/errors.go b/pkg/protocol/recordlayer/errors.go index 1c1898844..ba2b396b8 100644 --- a/pkg/protocol/recordlayer/errors.go +++ b/pkg/protocol/recordlayer/errors.go @@ -7,7 +7,7 @@ package recordlayer import ( "errors" - "github.com/pion/dtls/v2/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol" ) var ( diff --git a/pkg/protocol/recordlayer/header.go b/pkg/protocol/recordlayer/header.go index 66a1be810..0899d5a22 100644 --- a/pkg/protocol/recordlayer/header.go +++ b/pkg/protocol/recordlayer/header.go @@ -6,8 +6,8 @@ package recordlayer import ( "encoding/binary" - "github.com/pion/dtls/v2/internal/util" - "github.com/pion/dtls/v2/pkg/protocol" + "github.com/pion/dtls/v3/internal/util" + "github.com/pion/dtls/v3/pkg/protocol" ) // Header implements a TLS RecordLayer header diff --git a/pkg/protocol/recordlayer/inner_plaintext.go b/pkg/protocol/recordlayer/inner_plaintext.go index bbc94dd80..296475a6c 100644 --- a/pkg/protocol/recordlayer/inner_plaintext.go +++ b/pkg/protocol/recordlayer/inner_plaintext.go @@ -4,7 +4,7 @@ package recordlayer import ( - "github.com/pion/dtls/v2/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol" "golang.org/x/crypto/cryptobyte" ) diff --git a/pkg/protocol/recordlayer/recordlayer.go b/pkg/protocol/recordlayer/recordlayer.go index 4acacf074..61e25a563 100644 --- a/pkg/protocol/recordlayer/recordlayer.go +++ b/pkg/protocol/recordlayer/recordlayer.go @@ -6,9 +6,9 @@ package recordlayer import ( "encoding/binary" - "github.com/pion/dtls/v2/pkg/protocol" - "github.com/pion/dtls/v2/pkg/protocol/alert" - "github.com/pion/dtls/v2/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol/alert" + "github.com/pion/dtls/v3/pkg/protocol/handshake" ) // DTLS fixed size record layer header when Connection IDs are not in-use. diff --git a/pkg/protocol/recordlayer/recordlayer_test.go b/pkg/protocol/recordlayer/recordlayer_test.go index 760a73040..c568c9147 100644 --- a/pkg/protocol/recordlayer/recordlayer_test.go +++ b/pkg/protocol/recordlayer/recordlayer_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "github.com/pion/dtls/v2/pkg/protocol" + "github.com/pion/dtls/v3/pkg/protocol" ) func TestUDPDecode(t *testing.T) { diff --git a/resume_test.go b/resume_test.go index 00b291788..fa4ca0a4c 100644 --- a/resume_test.go +++ b/resume_test.go @@ -13,8 +13,8 @@ import ( "testing" "time" - "github.com/pion/dtls/v2/pkg/crypto/selfsign" - dtlsnet "github.com/pion/dtls/v2/pkg/net" + "github.com/pion/dtls/v3/pkg/crypto/selfsign" + dtlsnet "github.com/pion/dtls/v3/pkg/net" "github.com/pion/transport/v3/test" ) diff --git a/srtp_protection_profile.go b/srtp_protection_profile.go index 8b7e471f3..bc242095b 100644 --- a/srtp_protection_profile.go +++ b/srtp_protection_profile.go @@ -3,7 +3,7 @@ package dtls -import "github.com/pion/dtls/v2/pkg/protocol/extension" +import "github.com/pion/dtls/v3/pkg/protocol/extension" // SRTPProtectionProfile defines the parameters and options that are in effect for the SRTP processing // https://tools.ietf.org/html/rfc5764#section-4.1.2 diff --git a/state.go b/state.go index 178d937ea..27b1ebb31 100644 --- a/state.go +++ b/state.go @@ -8,10 +8,10 @@ import ( "encoding/gob" "sync/atomic" - "github.com/pion/dtls/v2/pkg/crypto/elliptic" - "github.com/pion/dtls/v2/pkg/crypto/prf" - "github.com/pion/dtls/v2/pkg/crypto/signaturehash" - "github.com/pion/dtls/v2/pkg/protocol/handshake" + "github.com/pion/dtls/v3/pkg/crypto/elliptic" + "github.com/pion/dtls/v3/pkg/crypto/prf" + "github.com/pion/dtls/v3/pkg/crypto/signaturehash" + "github.com/pion/dtls/v3/pkg/protocol/handshake" "github.com/pion/transport/v3/replaydetector" )