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

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

Issue 2453113002: Fix object-lifetime issues in async GetProof callpaths (Closed)
Patch Set: Updated patchset dependency Created 4 years, 2 months 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 76af4c51419714b4df4f123122727c475af938bc..620bdc2493f810c91a9c5db16a0240a9fc1e1cc5 100644
--- a/net/quic/core/crypto/quic_crypto_server_config.h
+++ b/net/quic/core/crypto/quic_crypto_server_config.h
@@ -281,7 +281,7 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
const IPAddress& server_ip,
QuicVersion version,
const QuicClock* clock,
- QuicCryptoProof* crypto_proof,
+ scoped_refptr<QuicCryptoProof> crypto_proof,
std::unique_ptr<ValidateClientHelloResultCallback> done_cb) const;
// ProcessClientHello processes |client_hello| and decides whether to accept
@@ -327,8 +327,8 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
const QuicClock* clock,
QuicRandom* rand,
QuicCompressedCertsCache* compressed_certs_cache,
- QuicCryptoNegotiatedParameters* params,
- QuicCryptoProof* crypto_proof,
+ scoped_refptr<QuicCryptoNegotiatedParameters> params,
+ scoped_refptr<QuicCryptoProof> crypto_proof,
QuicByteCount total_framing_overhead,
QuicByteCount chlo_packet_size,
std::unique_ptr<ProcessClientHelloResultCallback> done_cb) const;
@@ -550,7 +550,7 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
QuicVersion version,
scoped_refptr<Config> requested_config,
scoped_refptr<Config> primary_config,
- QuicCryptoProof* crypto_proof,
+ scoped_refptr<QuicCryptoProof> crypto_proof,
scoped_refptr<ValidateClientHelloResultCallback::Result>
client_hello_state,
std::unique_ptr<ValidateClientHelloResultCallback> done_cb) const;
@@ -571,7 +571,7 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
QuicVersion version,
scoped_refptr<Config> requested_config,
scoped_refptr<Config> primary_config,
- QuicCryptoProof* crypto_proof,
+ scoped_refptr<QuicCryptoProof> crypto_proof,
std::unique_ptr<ProofSource::Details> proof_source_details,
bool get_proof_failed,
scoped_refptr<ValidateClientHelloResultCallback::Result>
@@ -597,8 +597,8 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
const QuicClock* clock,
QuicRandom* rand,
QuicCompressedCertsCache* compressed_certs_cache,
- QuicCryptoNegotiatedParameters* params,
- QuicCryptoProof* crypto_proof,
+ scoped_refptr<QuicCryptoNegotiatedParameters> params,
+ scoped_refptr<QuicCryptoProof> crypto_proof,
QuicByteCount total_framing_overhead,
QuicByteCount chlo_packet_size,
const scoped_refptr<Config>& requested_config,
@@ -616,7 +616,7 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
QuicConnectionId server_designated_connection_id,
QuicRandom* rand,
QuicCompressedCertsCache* compressed_certs_cache,
- QuicCryptoNegotiatedParameters* params,
+ scoped_refptr<QuicCryptoNegotiatedParameters> params,
const QuicCryptoProof& crypto_proof,
QuicByteCount total_framing_overhead,
QuicByteCount chlo_packet_size,
@@ -846,9 +846,9 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
DISALLOW_COPY_AND_ASSIGN(QuicCryptoServerConfig);
};
-struct NET_EXPORT_PRIVATE QuicCryptoProof {
+struct NET_EXPORT_PRIVATE QuicCryptoProof
+ : public base::RefCounted<QuicCryptoProof> {
QuicCryptoProof();
- ~QuicCryptoProof();
std::string signature;
scoped_refptr<ProofSource::Chain> chain;
@@ -857,6 +857,10 @@ struct NET_EXPORT_PRIVATE QuicCryptoProof {
// request).
scoped_refptr<QuicCryptoServerConfig::Config> config;
std::string primary_scid;
+
+ private:
+ friend class base::RefCounted<QuicCryptoProof>;
+ virtual ~QuicCryptoProof();
};
} // namespace net
« no previous file with comments | « net/quic/core/crypto/quic_crypto_client_config_test.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