Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(470)

Unified Diff: net/quic/core/crypto/quic_crypto_server_config.h

Issue 2463093003: Landing Recent QUIC changes until Sat Oct 29 14:59:35. (Closed)
Patch Set: add change to quiartc_session_test.cc Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/quic/core/crypto/quic_crypto_server_config.h
diff --git a/net/quic/core/crypto/quic_crypto_server_config.h b/net/quic/core/crypto/quic_crypto_server_config.h
index 620bdc2493f810c91a9c5db16a0240a9fc1e1cc5..afd4afe871f250c2203a1597aaa7320ff5bf65a1 100644
--- a/net/quic/core/crypto/quic_crypto_server_config.h
+++ b/net/quic/core/crypto/quic_crypto_server_config.h
@@ -121,11 +121,11 @@ class NET_EXPORT_PRIVATE ProcessClientHelloResultCallback {
public:
ProcessClientHelloResultCallback();
virtual ~ProcessClientHelloResultCallback();
- virtual void Run(
- QuicErrorCode error,
- const std::string& error_details,
- std::unique_ptr<CryptoHandshakeMessage> message,
- std::unique_ptr<DiversificationNonce> diversification_nonce) = 0;
+ virtual void Run(QuicErrorCode error,
+ const std::string& error_details,
+ std::unique_ptr<CryptoHandshakeMessage> message,
+ std::unique_ptr<DiversificationNonce> diversification_nonce,
+ std::unique_ptr<ProofSource::Details> details) = 0;
private:
DISALLOW_COPY_AND_ASSIGN(ProcessClientHelloResultCallback);
@@ -352,6 +352,7 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
QuicCompressedCertsCache* compressed_certs_cache,
const QuicCryptoNegotiatedParameters& params,
const CachedNetworkParameters* cached_network_params,
+ const QuicTagVector& connection_options,
CryptoHandshakeMessage* out) const;
// BuildServerConfigUpdateMessage invokes |cb| with a SCUP message containing
@@ -375,6 +376,7 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
QuicCompressedCertsCache* compressed_certs_cache,
const QuicCryptoNegotiatedParameters& params,
const CachedNetworkParameters* cached_network_params,
+ const QuicTagVector& connection_options,
std::unique_ptr<BuildServerConfigUpdateMessageResultCallback> cb) const;
// SetEphemeralKeySource installs an object that can cache ephemeral keys for
@@ -586,6 +588,7 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
// Portion of ProcessClientHello which executes after GetProof.
void ProcessClientHelloAfterGetProof(
bool found_error,
+ std::unique_ptr<ProofSource::Details> proof_source_details,
const ValidateClientHelloResultCallback::Result& validate_chlo_result,
bool reject_only,
QuicConnectionId connection_id,
« no previous file with comments | « net/quic/core/crypto/quic_crypto_client_config.cc ('k') | net/quic/core/crypto/quic_crypto_server_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698