diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 18:37:44 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 18:37:44 +0000 |
| commit | ed3fc15d1ce8fd21b2e97644d8a102e0e1215199 (patch) | |
| tree | 15d807a22b47ae1c3460e4e33aa7fb4d9a19baf4 /net/net.gyp | |
| parent | 7f201e739dfcd6f7ba16bce97a60dab84547d864 (diff) | |
| download | chromium_src-ed3fc15d1ce8fd21b2e97644d8a102e0e1215199.zip chromium_src-ed3fc15d1ce8fd21b2e97644d8a102e0e1215199.tar.gz chromium_src-ed3fc15d1ce8fd21b2e97644d8a102e0e1215199.tar.bz2 | |
Land Recent QUIC Changes
Remove the kAESH tag (AES CBC mode with HMAC) because we won't support it.
Merge internal change: 43418211
Get client to the point where it can do key agreement.
This small change completes allows the client to perform an anonymous DH
handshake. After this, plumbing the pre-master secret into the KDF and enabling
the encrypter/decrypter should Just Work.
More crypto handshake work.
This change brings back the non-crypto parts of the negotiation, outside of
crypto/.
Merge internal change: 43400046
More work on crypto handshake.
This change:
* Removes the rest of the non-crypto related parameters from crypto/.
* Enables actual key-negotiation on the server.
Next step is to enable the non-crypto parameters to be negotiated again.
Merge internal change: 43175686
Inform the congestion manager if a sent packet has data in it, or only acks. The TCP manager does not could ack-only packets against the congestion window.
Merge internal change: 43304285
R=rtenneti@chromium.org
BUG=
Review URL: https://chromiumcodereview.appspot.com/12559005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index b5b371e..98b9496 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1540,6 +1540,8 @@ 'quic/crypto/null_encrypter_test.cc', 'quic/crypto/p256_key_exchange_test.cc', 'quic/crypto/quic_random_test.cc', + 'quic/test_tools/crypto_test_utils.cc', + 'quic/test_tools/crypto_test_utils.h', 'quic/test_tools/mock_clock.cc', 'quic/test_tools/mock_clock.h', 'quic/test_tools/mock_random.cc', |