From e603715949959f51e0b71e02388f18c8dfebf5c8 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 21 Sep 2017 11:34:52 +0700 Subject: [PATCH] make handshake and crypto internal packages --- interface.go | 4 ++-- {crypto => internal/crypto}/AEAD.go | 0 {crypto => internal/crypto}/aesgcm12_aead.go | 0 {crypto => internal/crypto}/aesgcm12_aead_test.go | 0 {crypto => internal/crypto}/aesgcm_aead.go | 0 {crypto => internal/crypto}/aesgcm_aead_test.go | 0 {crypto => internal/crypto}/cert_cache.go | 0 {crypto => internal/crypto}/cert_cache_test.go | 0 {crypto => internal/crypto}/cert_chain.go | 0 {crypto => internal/crypto}/cert_chain_test.go | 0 {crypto => internal/crypto}/cert_compression.go | 0 {crypto => internal/crypto}/cert_compression_test.go | 0 {crypto => internal/crypto}/cert_dict.go | 0 {crypto => internal/crypto}/cert_manager.go | 0 {crypto => internal/crypto}/cert_manager_test.go | 0 {crypto => internal/crypto}/cert_sets.go | 0 {crypto => internal/crypto}/chacha20poly1305_aead.go | 0 {crypto => internal/crypto}/chacha20poly1305_aead_test.go | 0 {crypto => internal/crypto}/crypto_suite_test.go | 0 {crypto => internal/crypto}/curve_25519.go | 0 {crypto => internal/crypto}/curve_25519_test.go | 0 {crypto => internal/crypto}/key_derivation.go | 0 {crypto => internal/crypto}/key_derivation_quic_crypto.go | 0 .../crypto}/key_derivation_quic_crypto_test.go | 0 {crypto => internal/crypto}/key_derivation_test.go | 0 {crypto => internal/crypto}/key_exchange.go | 0 {crypto => internal/crypto}/null_aead.go | 0 {crypto => internal/crypto}/null_aead_fnv128a.go | 0 {crypto => internal/crypto}/null_aead_fnv128a_test.go | 0 {crypto => internal/crypto}/null_aead_fnv64a.go | 0 {crypto => internal/crypto}/null_aead_fnv64a_test.go | 0 {crypto => internal/crypto}/null_aead_test.go | 0 {crypto => internal/crypto}/server_proof.go | 0 {crypto => internal/crypto}/server_proof_test.go | 0 {crypto => internal/crypto}/source_address_token.go | 0 {crypto => internal/crypto}/source_address_token_test.go | 0 internal/flowcontrol/flow_control_manager.go | 2 +- internal/flowcontrol/flow_controller.go | 2 +- .../handshake}/connection_parameters_manager.go | 0 .../handshake}/connection_parameters_manager_test.go | 0 {handshake => internal/handshake}/crypto_setup_client.go | 2 +- {handshake => internal/handshake}/crypto_setup_client_test.go | 2 +- {handshake => internal/handshake}/crypto_setup_server.go | 2 +- {handshake => internal/handshake}/crypto_setup_server_test.go | 2 +- {handshake => internal/handshake}/crypto_setup_tls.go | 2 +- {handshake => internal/handshake}/crypto_setup_tls_test.go | 2 +- {handshake => internal/handshake}/data_test.go | 0 {handshake => internal/handshake}/ephermal_cache.go | 2 +- {handshake => internal/handshake}/ephermal_cache_test.go | 2 +- {handshake => internal/handshake}/handshake_message.go | 0 {handshake => internal/handshake}/handshake_message_test.go | 0 {handshake => internal/handshake}/handshake_suite_test.go | 0 {handshake => internal/handshake}/interface.go | 0 {handshake => internal/handshake}/mint_utils.go | 2 +- {handshake => internal/handshake}/server_config.go | 2 +- {handshake => internal/handshake}/server_config_client.go | 2 +- .../handshake}/server_config_client_test.go | 2 +- {handshake => internal/handshake}/server_config_test.go | 2 +- {handshake => internal/handshake}/stk_generator.go | 2 +- {handshake => internal/handshake}/stk_generator_test.go | 0 {handshake => internal/handshake}/tags.go | 0 internal/mocks/cpm.go | 2 +- internal/wire/public_reset.go | 2 +- internal/wire/public_reset_test.go | 2 +- packet_packer.go | 2 +- packet_packer_test.go | 2 +- packet_unpacker_test.go | 2 +- server.go | 4 ++-- server_test.go | 4 ++-- session.go | 2 +- session_test.go | 4 ++-- streams_map.go | 2 +- 72 files changed, 32 insertions(+), 32 deletions(-) rename {crypto => internal/crypto}/AEAD.go (100%) rename {crypto => internal/crypto}/aesgcm12_aead.go (100%) rename {crypto => internal/crypto}/aesgcm12_aead_test.go (100%) rename {crypto => internal/crypto}/aesgcm_aead.go (100%) rename {crypto => internal/crypto}/aesgcm_aead_test.go (100%) rename {crypto => internal/crypto}/cert_cache.go (100%) rename {crypto => internal/crypto}/cert_cache_test.go (100%) rename {crypto => internal/crypto}/cert_chain.go (100%) rename {crypto => internal/crypto}/cert_chain_test.go (100%) rename {crypto => internal/crypto}/cert_compression.go (100%) rename {crypto => internal/crypto}/cert_compression_test.go (100%) rename {crypto => internal/crypto}/cert_dict.go (100%) rename {crypto => internal/crypto}/cert_manager.go (100%) rename {crypto => internal/crypto}/cert_manager_test.go (100%) rename {crypto => internal/crypto}/cert_sets.go (100%) rename {crypto => internal/crypto}/chacha20poly1305_aead.go (100%) rename {crypto => internal/crypto}/chacha20poly1305_aead_test.go (100%) rename {crypto => internal/crypto}/crypto_suite_test.go (100%) rename {crypto => internal/crypto}/curve_25519.go (100%) rename {crypto => internal/crypto}/curve_25519_test.go (100%) rename {crypto => internal/crypto}/key_derivation.go (100%) rename {crypto => internal/crypto}/key_derivation_quic_crypto.go (100%) rename {crypto => internal/crypto}/key_derivation_quic_crypto_test.go (100%) rename {crypto => internal/crypto}/key_derivation_test.go (100%) rename {crypto => internal/crypto}/key_exchange.go (100%) rename {crypto => internal/crypto}/null_aead.go (100%) rename {crypto => internal/crypto}/null_aead_fnv128a.go (100%) rename {crypto => internal/crypto}/null_aead_fnv128a_test.go (100%) rename {crypto => internal/crypto}/null_aead_fnv64a.go (100%) rename {crypto => internal/crypto}/null_aead_fnv64a_test.go (100%) rename {crypto => internal/crypto}/null_aead_test.go (100%) rename {crypto => internal/crypto}/server_proof.go (100%) rename {crypto => internal/crypto}/server_proof_test.go (100%) rename {crypto => internal/crypto}/source_address_token.go (100%) rename {crypto => internal/crypto}/source_address_token_test.go (100%) rename {handshake => internal/handshake}/connection_parameters_manager.go (100%) rename {handshake => internal/handshake}/connection_parameters_manager_test.go (100%) rename {handshake => internal/handshake}/crypto_setup_client.go (99%) rename {handshake => internal/handshake}/crypto_setup_client_test.go (99%) rename {handshake => internal/handshake}/crypto_setup_server.go (99%) rename {handshake => internal/handshake}/crypto_setup_server_test.go (99%) rename {handshake => internal/handshake}/crypto_setup_tls.go (98%) rename {handshake => internal/handshake}/crypto_setup_tls_test.go (99%) rename {handshake => internal/handshake}/data_test.go (100%) rename {handshake => internal/handshake}/ephermal_cache.go (96%) rename {handshake => internal/handshake}/ephermal_cache_test.go (92%) rename {handshake => internal/handshake}/handshake_message.go (100%) rename {handshake => internal/handshake}/handshake_message_test.go (100%) rename {handshake => internal/handshake}/handshake_suite_test.go (100%) rename {handshake => internal/handshake}/interface.go (100%) rename {handshake => internal/handshake}/mint_utils.go (97%) rename {handshake => internal/handshake}/server_config.go (96%) rename {handshake => internal/handshake}/server_config_client.go (98%) rename {handshake => internal/handshake}/server_config_client_test.go (99%) rename {handshake => internal/handshake}/server_config_test.go (96%) rename {handshake => internal/handshake}/stk_generator.go (98%) rename {handshake => internal/handshake}/stk_generator_test.go (100%) rename {handshake => internal/handshake}/tags.go (100%) diff --git a/interface.go b/interface.go index a09429d3..2903bc73 100644 --- a/interface.go +++ b/interface.go @@ -5,8 +5,8 @@ import ( "io" "net" "time" - - "github.com/lucas-clemente/quic-go/handshake" + + "github.com/lucas-clemente/quic-go/internal/handshake" "github.com/lucas-clemente/quic-go/internal/protocol" ) diff --git a/crypto/AEAD.go b/internal/crypto/AEAD.go similarity index 100% rename from crypto/AEAD.go rename to internal/crypto/AEAD.go diff --git a/crypto/aesgcm12_aead.go b/internal/crypto/aesgcm12_aead.go similarity index 100% rename from crypto/aesgcm12_aead.go rename to internal/crypto/aesgcm12_aead.go diff --git a/crypto/aesgcm12_aead_test.go b/internal/crypto/aesgcm12_aead_test.go similarity index 100% rename from crypto/aesgcm12_aead_test.go rename to internal/crypto/aesgcm12_aead_test.go diff --git a/crypto/aesgcm_aead.go b/internal/crypto/aesgcm_aead.go similarity index 100% rename from crypto/aesgcm_aead.go rename to internal/crypto/aesgcm_aead.go diff --git a/crypto/aesgcm_aead_test.go b/internal/crypto/aesgcm_aead_test.go similarity index 100% rename from crypto/aesgcm_aead_test.go rename to internal/crypto/aesgcm_aead_test.go diff --git a/crypto/cert_cache.go b/internal/crypto/cert_cache.go similarity index 100% rename from crypto/cert_cache.go rename to internal/crypto/cert_cache.go diff --git a/crypto/cert_cache_test.go b/internal/crypto/cert_cache_test.go similarity index 100% rename from crypto/cert_cache_test.go rename to internal/crypto/cert_cache_test.go diff --git a/crypto/cert_chain.go b/internal/crypto/cert_chain.go similarity index 100% rename from crypto/cert_chain.go rename to internal/crypto/cert_chain.go diff --git a/crypto/cert_chain_test.go b/internal/crypto/cert_chain_test.go similarity index 100% rename from crypto/cert_chain_test.go rename to internal/crypto/cert_chain_test.go diff --git a/crypto/cert_compression.go b/internal/crypto/cert_compression.go similarity index 100% rename from crypto/cert_compression.go rename to internal/crypto/cert_compression.go diff --git a/crypto/cert_compression_test.go b/internal/crypto/cert_compression_test.go similarity index 100% rename from crypto/cert_compression_test.go rename to internal/crypto/cert_compression_test.go diff --git a/crypto/cert_dict.go b/internal/crypto/cert_dict.go similarity index 100% rename from crypto/cert_dict.go rename to internal/crypto/cert_dict.go diff --git a/crypto/cert_manager.go b/internal/crypto/cert_manager.go similarity index 100% rename from crypto/cert_manager.go rename to internal/crypto/cert_manager.go diff --git a/crypto/cert_manager_test.go b/internal/crypto/cert_manager_test.go similarity index 100% rename from crypto/cert_manager_test.go rename to internal/crypto/cert_manager_test.go diff --git a/crypto/cert_sets.go b/internal/crypto/cert_sets.go similarity index 100% rename from crypto/cert_sets.go rename to internal/crypto/cert_sets.go diff --git a/crypto/chacha20poly1305_aead.go b/internal/crypto/chacha20poly1305_aead.go similarity index 100% rename from crypto/chacha20poly1305_aead.go rename to internal/crypto/chacha20poly1305_aead.go diff --git a/crypto/chacha20poly1305_aead_test.go b/internal/crypto/chacha20poly1305_aead_test.go similarity index 100% rename from crypto/chacha20poly1305_aead_test.go rename to internal/crypto/chacha20poly1305_aead_test.go diff --git a/crypto/crypto_suite_test.go b/internal/crypto/crypto_suite_test.go similarity index 100% rename from crypto/crypto_suite_test.go rename to internal/crypto/crypto_suite_test.go diff --git a/crypto/curve_25519.go b/internal/crypto/curve_25519.go similarity index 100% rename from crypto/curve_25519.go rename to internal/crypto/curve_25519.go diff --git a/crypto/curve_25519_test.go b/internal/crypto/curve_25519_test.go similarity index 100% rename from crypto/curve_25519_test.go rename to internal/crypto/curve_25519_test.go diff --git a/crypto/key_derivation.go b/internal/crypto/key_derivation.go similarity index 100% rename from crypto/key_derivation.go rename to internal/crypto/key_derivation.go diff --git a/crypto/key_derivation_quic_crypto.go b/internal/crypto/key_derivation_quic_crypto.go similarity index 100% rename from crypto/key_derivation_quic_crypto.go rename to internal/crypto/key_derivation_quic_crypto.go diff --git a/crypto/key_derivation_quic_crypto_test.go b/internal/crypto/key_derivation_quic_crypto_test.go similarity index 100% rename from crypto/key_derivation_quic_crypto_test.go rename to internal/crypto/key_derivation_quic_crypto_test.go diff --git a/crypto/key_derivation_test.go b/internal/crypto/key_derivation_test.go similarity index 100% rename from crypto/key_derivation_test.go rename to internal/crypto/key_derivation_test.go diff --git a/crypto/key_exchange.go b/internal/crypto/key_exchange.go similarity index 100% rename from crypto/key_exchange.go rename to internal/crypto/key_exchange.go diff --git a/crypto/null_aead.go b/internal/crypto/null_aead.go similarity index 100% rename from crypto/null_aead.go rename to internal/crypto/null_aead.go diff --git a/crypto/null_aead_fnv128a.go b/internal/crypto/null_aead_fnv128a.go similarity index 100% rename from crypto/null_aead_fnv128a.go rename to internal/crypto/null_aead_fnv128a.go diff --git a/crypto/null_aead_fnv128a_test.go b/internal/crypto/null_aead_fnv128a_test.go similarity index 100% rename from crypto/null_aead_fnv128a_test.go rename to internal/crypto/null_aead_fnv128a_test.go diff --git a/crypto/null_aead_fnv64a.go b/internal/crypto/null_aead_fnv64a.go similarity index 100% rename from crypto/null_aead_fnv64a.go rename to internal/crypto/null_aead_fnv64a.go diff --git a/crypto/null_aead_fnv64a_test.go b/internal/crypto/null_aead_fnv64a_test.go similarity index 100% rename from crypto/null_aead_fnv64a_test.go rename to internal/crypto/null_aead_fnv64a_test.go diff --git a/crypto/null_aead_test.go b/internal/crypto/null_aead_test.go similarity index 100% rename from crypto/null_aead_test.go rename to internal/crypto/null_aead_test.go diff --git a/crypto/server_proof.go b/internal/crypto/server_proof.go similarity index 100% rename from crypto/server_proof.go rename to internal/crypto/server_proof.go diff --git a/crypto/server_proof_test.go b/internal/crypto/server_proof_test.go similarity index 100% rename from crypto/server_proof_test.go rename to internal/crypto/server_proof_test.go diff --git a/crypto/source_address_token.go b/internal/crypto/source_address_token.go similarity index 100% rename from crypto/source_address_token.go rename to internal/crypto/source_address_token.go diff --git a/crypto/source_address_token_test.go b/internal/crypto/source_address_token_test.go similarity index 100% rename from crypto/source_address_token_test.go rename to internal/crypto/source_address_token_test.go diff --git a/internal/flowcontrol/flow_control_manager.go b/internal/flowcontrol/flow_control_manager.go index f11c75cf..f974a849 100644 --- a/internal/flowcontrol/flow_control_manager.go +++ b/internal/flowcontrol/flow_control_manager.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/lucas-clemente/quic-go/congestion" - "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/handshake" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/qerr" diff --git a/internal/flowcontrol/flow_controller.go b/internal/flowcontrol/flow_controller.go index e940f79a..00c0b4f3 100644 --- a/internal/flowcontrol/flow_controller.go +++ b/internal/flowcontrol/flow_controller.go @@ -5,7 +5,7 @@ import ( "time" "github.com/lucas-clemente/quic-go/congestion" - "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/handshake" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/utils" ) diff --git a/handshake/connection_parameters_manager.go b/internal/handshake/connection_parameters_manager.go similarity index 100% rename from handshake/connection_parameters_manager.go rename to internal/handshake/connection_parameters_manager.go diff --git a/handshake/connection_parameters_manager_test.go b/internal/handshake/connection_parameters_manager_test.go similarity index 100% rename from handshake/connection_parameters_manager_test.go rename to internal/handshake/connection_parameters_manager_test.go diff --git a/handshake/crypto_setup_client.go b/internal/handshake/crypto_setup_client.go similarity index 99% rename from handshake/crypto_setup_client.go rename to internal/handshake/crypto_setup_client.go index 007c3061..ecb404a4 100644 --- a/handshake/crypto_setup_client.go +++ b/internal/handshake/crypto_setup_client.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/qerr" diff --git a/handshake/crypto_setup_client_test.go b/internal/handshake/crypto_setup_client_test.go similarity index 99% rename from handshake/crypto_setup_client_test.go rename to internal/handshake/crypto_setup_client_test.go index bfca112f..e92bc1a3 100644 --- a/handshake/crypto_setup_client_test.go +++ b/internal/handshake/crypto_setup_client_test.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/qerr" diff --git a/handshake/crypto_setup_server.go b/internal/handshake/crypto_setup_server.go similarity index 99% rename from handshake/crypto_setup_server.go rename to internal/handshake/crypto_setup_server.go index 200cefe8..8093bdd9 100644 --- a/handshake/crypto_setup_server.go +++ b/internal/handshake/crypto_setup_server.go @@ -9,7 +9,7 @@ import ( "net" "sync" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/qerr" diff --git a/handshake/crypto_setup_server_test.go b/internal/handshake/crypto_setup_server_test.go similarity index 99% rename from handshake/crypto_setup_server_test.go rename to internal/handshake/crypto_setup_server_test.go index a3f1661a..3c5b72aa 100644 --- a/handshake/crypto_setup_server_test.go +++ b/internal/handshake/crypto_setup_server_test.go @@ -6,7 +6,7 @@ import ( "errors" "net" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/qerr" diff --git a/handshake/crypto_setup_tls.go b/internal/handshake/crypto_setup_tls.go similarity index 98% rename from handshake/crypto_setup_tls.go rename to internal/handshake/crypto_setup_tls.go index f6598142..1d940891 100644 --- a/handshake/crypto_setup_tls.go +++ b/internal/handshake/crypto_setup_tls.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/bifurcation/mint" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" "github.com/lucas-clemente/quic-go/internal/protocol" ) diff --git a/handshake/crypto_setup_tls_test.go b/internal/handshake/crypto_setup_tls_test.go similarity index 99% rename from handshake/crypto_setup_tls_test.go rename to internal/handshake/crypto_setup_tls_test.go index e234bcdb..1d90954e 100644 --- a/handshake/crypto_setup_tls_test.go +++ b/internal/handshake/crypto_setup_tls_test.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/bifurcation/mint" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/testdata" diff --git a/handshake/data_test.go b/internal/handshake/data_test.go similarity index 100% rename from handshake/data_test.go rename to internal/handshake/data_test.go diff --git a/handshake/ephermal_cache.go b/internal/handshake/ephermal_cache.go similarity index 96% rename from handshake/ephermal_cache.go rename to internal/handshake/ephermal_cache.go index a996c3ed..3bccbef0 100644 --- a/handshake/ephermal_cache.go +++ b/internal/handshake/ephermal_cache.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/utils" ) diff --git a/handshake/ephermal_cache_test.go b/internal/handshake/ephermal_cache_test.go similarity index 92% rename from handshake/ephermal_cache_test.go rename to internal/handshake/ephermal_cache_test.go index 63ed90f9..88943b84 100644 --- a/handshake/ephermal_cache_test.go +++ b/internal/handshake/ephermal_cache_test.go @@ -3,7 +3,7 @@ package handshake import ( "time" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" "github.com/lucas-clemente/quic-go/internal/protocol" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/handshake/handshake_message.go b/internal/handshake/handshake_message.go similarity index 100% rename from handshake/handshake_message.go rename to internal/handshake/handshake_message.go diff --git a/handshake/handshake_message_test.go b/internal/handshake/handshake_message_test.go similarity index 100% rename from handshake/handshake_message_test.go rename to internal/handshake/handshake_message_test.go diff --git a/handshake/handshake_suite_test.go b/internal/handshake/handshake_suite_test.go similarity index 100% rename from handshake/handshake_suite_test.go rename to internal/handshake/handshake_suite_test.go diff --git a/handshake/interface.go b/internal/handshake/interface.go similarity index 100% rename from handshake/interface.go rename to internal/handshake/interface.go diff --git a/handshake/mint_utils.go b/internal/handshake/mint_utils.go similarity index 97% rename from handshake/mint_utils.go rename to internal/handshake/mint_utils.go index 6342fb36..f35b643b 100644 --- a/handshake/mint_utils.go +++ b/internal/handshake/mint_utils.go @@ -9,7 +9,7 @@ import ( "time" "github.com/bifurcation/mint" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" "github.com/lucas-clemente/quic-go/internal/protocol" ) diff --git a/handshake/server_config.go b/internal/handshake/server_config.go similarity index 96% rename from handshake/server_config.go rename to internal/handshake/server_config.go index fce66efd..ccbc1bba 100644 --- a/handshake/server_config.go +++ b/internal/handshake/server_config.go @@ -4,7 +4,7 @@ import ( "bytes" "crypto/rand" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" ) // ServerConfig is a server config diff --git a/handshake/server_config_client.go b/internal/handshake/server_config_client.go similarity index 98% rename from handshake/server_config_client.go rename to internal/handshake/server_config_client.go index 42014195..eb042f6f 100644 --- a/handshake/server_config_client.go +++ b/internal/handshake/server_config_client.go @@ -7,7 +7,7 @@ import ( "math" "time" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/qerr" ) diff --git a/handshake/server_config_client_test.go b/internal/handshake/server_config_client_test.go similarity index 99% rename from handshake/server_config_client_test.go rename to internal/handshake/server_config_client_test.go index 509c6bba..b94c8016 100644 --- a/handshake/server_config_client_test.go +++ b/internal/handshake/server_config_client_test.go @@ -4,7 +4,7 @@ import ( "bytes" "time" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/handshake/server_config_test.go b/internal/handshake/server_config_test.go similarity index 96% rename from handshake/server_config_test.go rename to internal/handshake/server_config_test.go index 508e8a6d..2147a8da 100644 --- a/handshake/server_config_test.go +++ b/internal/handshake/server_config_test.go @@ -3,7 +3,7 @@ package handshake import ( "bytes" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/handshake/stk_generator.go b/internal/handshake/stk_generator.go similarity index 98% rename from handshake/stk_generator.go rename to internal/handshake/stk_generator.go index 3a463a11..2b84268c 100644 --- a/handshake/stk_generator.go +++ b/internal/handshake/stk_generator.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" ) const ( diff --git a/handshake/stk_generator_test.go b/internal/handshake/stk_generator_test.go similarity index 100% rename from handshake/stk_generator_test.go rename to internal/handshake/stk_generator_test.go diff --git a/handshake/tags.go b/internal/handshake/tags.go similarity index 100% rename from handshake/tags.go rename to internal/handshake/tags.go diff --git a/internal/mocks/cpm.go b/internal/mocks/cpm.go index 4abe665d..4ef87ef4 100644 --- a/internal/mocks/cpm.go +++ b/internal/mocks/cpm.go @@ -7,7 +7,7 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - handshake "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/handshake" protocol "github.com/lucas-clemente/quic-go/internal/protocol" ) diff --git a/internal/wire/public_reset.go b/internal/wire/public_reset.go index e7a5f0b4..4ee1d2c7 100644 --- a/internal/wire/public_reset.go +++ b/internal/wire/public_reset.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "errors" - "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/handshake" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/utils" ) diff --git a/internal/wire/public_reset_test.go b/internal/wire/public_reset_test.go index fcd2f1bf..823a1ad5 100644 --- a/internal/wire/public_reset_test.go +++ b/internal/wire/public_reset_test.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/handshake" "github.com/lucas-clemente/quic-go/internal/protocol" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/packet_packer.go b/packet_packer.go index 3b7fa360..89a99a6f 100644 --- a/packet_packer.go +++ b/packet_packer.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/lucas-clemente/quic-go/ackhandler" - "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/handshake" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/wire" ) diff --git a/packet_packer_test.go b/packet_packer_test.go index 47e1b35a..9f7c2a9a 100644 --- a/packet_packer_test.go +++ b/packet_packer_test.go @@ -5,7 +5,7 @@ import ( "math" "github.com/lucas-clemente/quic-go/ackhandler" - "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/handshake" "github.com/lucas-clemente/quic-go/internal/mocks" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/wire" diff --git a/packet_unpacker_test.go b/packet_unpacker_test.go index 418ab922..f51bae2c 100644 --- a/packet_unpacker_test.go +++ b/packet_unpacker_test.go @@ -3,7 +3,7 @@ package quic import ( "bytes" - "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/crypto" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/qerr" diff --git a/server.go b/server.go index 6b8aeff1..b91aac74 100644 --- a/server.go +++ b/server.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/lucas-clemente/quic-go/crypto" - "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/crypto" + "github.com/lucas-clemente/quic-go/internal/handshake" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/internal/wire" diff --git a/server_test.go b/server_test.go index 94d5c3e4..9b5d4f39 100644 --- a/server_test.go +++ b/server_test.go @@ -9,8 +9,8 @@ import ( "reflect" "time" - "github.com/lucas-clemente/quic-go/crypto" - "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/crypto" + "github.com/lucas-clemente/quic-go/internal/handshake" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/internal/wire" diff --git a/session.go b/session.go index 4dfa0c95..5dece877 100644 --- a/session.go +++ b/session.go @@ -11,8 +11,8 @@ import ( "github.com/lucas-clemente/quic-go/ackhandler" "github.com/lucas-clemente/quic-go/congestion" - "github.com/lucas-clemente/quic-go/handshake" "github.com/lucas-clemente/quic-go/internal/flowcontrol" + "github.com/lucas-clemente/quic-go/internal/handshake" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/internal/wire" diff --git a/session_test.go b/session_test.go index 447a77a4..190eee26 100644 --- a/session_test.go +++ b/session_test.go @@ -15,8 +15,8 @@ import ( . "github.com/onsi/gomega" "github.com/lucas-clemente/quic-go/ackhandler" - "github.com/lucas-clemente/quic-go/crypto" - "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/crypto" + "github.com/lucas-clemente/quic-go/internal/handshake" "github.com/lucas-clemente/quic-go/internal/mocks" "github.com/lucas-clemente/quic-go/internal/mocks/mocks_fc" "github.com/lucas-clemente/quic-go/internal/protocol" diff --git a/streams_map.go b/streams_map.go index 6b0eba8d..4638e8ce 100644 --- a/streams_map.go +++ b/streams_map.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/handshake" "github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/qerr" )