Skip to content

Update QUICHE from 81314ecbd to c2ddf95dc #19081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alyssawilk merged 4 commits into from
Nov 23, 2021
Merged

Update QUICHE from 81314ecbd to c2ddf95dc #19081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a15fae
Update QUICHE from 81314ecbd to c2ddf95dc
RyanTheOptimist Nov 22, 2021
9fee0b8
Use QuicClientSessionCache
RyanTheOptimist Nov 22, 2021
10724aa
format
RyanTheOptimist Nov 22, 2021
e1fe1ff
No need to set the flag
RyanTheOptimist Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bazel/external/quiche.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2003,6 +2003,7 @@ envoy_cc_library(
"quiche/quic/core/crypto/curve25519_key_exchange.cc",
"quiche/quic/core/crypto/key_exchange.cc",
"quiche/quic/core/crypto/p256_key_exchange.cc",
"quiche/quic/core/crypto/quic_client_session_cache.cc",
"quiche/quic/core/crypto/quic_compressed_certs_cache.cc",
"quiche/quic/core/crypto/quic_crypto_client_config.cc",
"quiche/quic/core/crypto/quic_crypto_server_config.cc",
Expand All @@ -2023,6 +2024,7 @@ envoy_cc_library(
"quiche/quic/core/crypto/key_exchange.h",
"quiche/quic/core/crypto/p256_key_exchange.h",
"quiche/quic/core/crypto/proof_verifier.h",
"quiche/quic/core/crypto/quic_client_session_cache.h",
"quiche/quic/core/crypto/quic_compressed_certs_cache.h",
"quiche/quic/core/crypto/quic_crypto_client_config.h",
"quiche/quic/core/crypto/quic_crypto_server_config.h",
Expand Down
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,12 +838,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "QUICHE",
project_desc = "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols",
project_url = "https://github.com/google/quiche",
version = "81314ecbd8cfd3c8399fcd1c1e7ca557b41d18de",
sha256 = "61e28bf91daba19f65af53b19fbefd5876b3365835e7c0091ccf0c91dba72ba6",
version = "c2ddf95dc2380e1d7cd5aa8fe9f61b4e01b23e6b",
sha256 = "435dc3c3858d8328c48fb633bc46431aa5aea2a29e0b5f125f743b0b5b5c1513",
urls = ["https://github.com/google/quiche/archive/{version}.tar.gz"],
strip_prefix = "quiche-{version}",
use_category = ["dataplane_core"],
release_date = "2021-11-17",
release_date = "2021-11-22",
cpe = "N/A",
),
com_googlesource_googleurl = dict(
Expand Down
12 changes: 0 additions & 12 deletions source/common/quic/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,6 @@ envoy_cc_library(
],
)

envoy_cc_library(
name = "envoy_quic_session_cache_lib",
srcs = ["envoy_quic_session_cache.cc"],
hdrs = ["envoy_quic_session_cache.h"],
external_deps = ["quiche_quic_platform"],
tags = ["nofips"],
deps = [
"@com_github_google_quiche//:quic_core_crypto_crypto_handshake_lib",
],
)

envoy_cc_library(
name = "spdy_server_push_utils_for_envoy_lib",
srcs = ["spdy_server_push_utils_for_envoy.cc"],
Expand Down Expand Up @@ -173,7 +162,6 @@ envoy_cc_library(
":envoy_quic_connection_helper_lib",
":envoy_quic_proof_verifier_lib",
":envoy_quic_server_session_lib",
":envoy_quic_session_cache_lib",
":envoy_quic_utils_lib",
"//envoy/http:codec_interface",
"//envoy/registry",
Expand Down
5 changes: 3 additions & 2 deletions source/common/quic/client_connection_factory_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#include "source/common/quic/client_connection_factory_impl.h"

#include "source/common/quic/envoy_quic_session_cache.h"
#include "source/common/quic/quic_transport_socket_factory.h"

#include "quiche/quic/core/crypto/quic_client_session_cache.h"

namespace Envoy {
namespace Quic {

Expand Down Expand Up @@ -34,7 +35,7 @@ std::shared_ptr<quic::QuicCryptoClientConfig> PersistentQuicInfoImpl::cryptoConf
client_context_ = context;
client_config_ = std::make_shared<quic::QuicCryptoClientConfig>(
std::make_unique<EnvoyQuicProofVerifier>(getContext(transport_socket_factory_)),
std::make_unique<EnvoyQuicSessionCache>((time_source_)));
std::make_unique<quic::QuicClientSessionCache>());
}
// Return the latest client config.
return client_config_;
Expand Down
171 changes: 0 additions & 171 deletions source/common/quic/envoy_quic_session_cache.cc
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions source/common/quic/envoy_quic_session_cache.h
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions test/common/quic/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,6 @@ envoy_cc_test(
],
)

envoy_cc_test(
name = "envoy_quic_session_cache_test",
srcs = ["envoy_quic_session_cache_test.cc"],
external_deps = ["quiche_quic_platform"],
tags = ["nofips"],
deps = [
"//source/common/quic:envoy_quic_session_cache_lib",
],
)

envoy_cc_test(
name = "envoy_quic_proof_verifier_test",
srcs = ["envoy_quic_proof_verifier_test.cc"],
Expand Down
Loading