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

Side by Side Diff: net/quic/crypto/crypto_handshake.cc

Issue 454263002: QUIC - clean up changes to keep in sync with internal source tree. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | net/quic/quic_connection.h » ('j') | net/quic/quic_connection.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/crypto/crypto_handshake.h" 5 #include "net/quic/crypto/crypto_handshake.h"
6 6
7 #include "net/quic/crypto/common_cert_set.h" 7 #include "net/quic/crypto/common_cert_set.h"
8 #include "net/quic/crypto/key_exchange.h" 8 #include "net/quic/crypto/key_exchange.h"
9 #include "net/quic/crypto/quic_decrypter.h" 9 #include "net/quic/crypto/quic_decrypter.h"
10 #include "net/quic/crypto/quic_encrypter.h" 10 #include "net/quic/crypto/quic_encrypter.h"
11 11
12 namespace net { 12 namespace net {
13 13
14 QuicCryptoNegotiatedParameters::QuicCryptoNegotiatedParameters() 14 QuicCryptoNegotiatedParameters::QuicCryptoNegotiatedParameters()
15 : key_exchange(0), 15 : key_exchange(0),
16 aead(0), 16 aead(0),
17 x509_ecdsa_supported(false) { 17 x509_ecdsa_supported(false) {
18 } 18 }
19 19
20 QuicCryptoNegotiatedParameters::~QuicCryptoNegotiatedParameters() {} 20 QuicCryptoNegotiatedParameters::~QuicCryptoNegotiatedParameters() {}
21 21
22 CrypterPair::CrypterPair() {} 22 CrypterPair::CrypterPair() {}
23 23
24 CrypterPair::~CrypterPair() {} 24 CrypterPair::~CrypterPair() {}
25 25
26
Ryan Hamilton 2014/08/13 16:23:48 I'd be inclined to remove this. We don't typically
wtc 2014/08/14 01:54:58 Yeah, this blank line was probably added inadverte
ramant (doing other things) 2014/08/14 19:58:58 Done.
ramant (doing other things) 2014/08/14 19:58:58 Will make the change in the internal code base als
26 // static 27 // static
27 const char QuicCryptoConfig::kInitialLabel[] = "QUIC key expansion"; 28 const char QuicCryptoConfig::kInitialLabel[] = "QUIC key expansion";
28 29
29 // static 30 // static
30 const char QuicCryptoConfig::kCETVLabel[] = "QUIC CETV block"; 31 const char QuicCryptoConfig::kCETVLabel[] = "QUIC CETV block";
31 32
32 // static 33 // static
33 const char QuicCryptoConfig::kForwardSecureLabel[] = 34 const char QuicCryptoConfig::kForwardSecureLabel[] =
34 "QUIC forward secure key expansion"; 35 "QUIC forward secure key expansion";
35 36
36 QuicCryptoConfig::QuicCryptoConfig() 37 QuicCryptoConfig::QuicCryptoConfig()
37 : common_cert_sets(CommonCertSets::GetInstanceQUIC()) { 38 : common_cert_sets(CommonCertSets::GetInstanceQUIC()) {
38 } 39 }
39 40
40 QuicCryptoConfig::~QuicCryptoConfig() {} 41 QuicCryptoConfig::~QuicCryptoConfig() {}
41 42
42 } // namespace net 43 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/quic/quic_connection.h » ('j') | net/quic/quic_connection.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698