diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 20:18:55 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 20:18:55 +0000 |
| commit | fe053f9301b7003d0bbe82baf9001d5b95564b9e (patch) | |
| tree | c5356ff0f9fa4754f00d30944f60544edbf20c46 /net/net.gyp | |
| parent | 7252963941dffa25e28168c82ab262ae889ffe1d (diff) | |
| download | chromium_src-fe053f9301b7003d0bbe82baf9001d5b95564b9e.zip chromium_src-fe053f9301b7003d0bbe82baf9001d5b95564b9e.tar.gz chromium_src-fe053f9301b7003d0bbe82baf9001d5b95564b9e.tar.bz2 | |
Land Recent QUIC Changes
QUIC: step 8, server certificate support.
Merge internal change: 44460951
Returning early from framer callbacks on error.
Merge internal change: 44428665
Rename QUIC_VERSION_NOT_SUPPORTED to QUIC_CRYPTO_VERSION_NOT_SUPPORTED.
Merge internal change: 44422561
QUIC: split the server config into its own file.
This change moves QuicCryptoServerConfig into a separate file so that Chromium
need only link it into tests.
Merge internal change: 44397707
QUIC: remove ifs around error_details
They were never needed and clutter up the code.
Merge internal change: 44275147
QUIC: add tests for 0-RTT handshaking using strike-register.
This change fixes a couple of issues and adds a test that performs a 0-RTT
handshake.
Merge internal change: 44272981
R=rch@chromium.org
Review URL: https://codereview.chromium.org/14411004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195897 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 0a6560d..3a78c4d 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -712,6 +712,10 @@ 'quic/crypto/crypto_handshake.cc', 'quic/crypto/crypto_handshake.h', 'quic/crypto/crypto_protocol.h', + 'quic/crypto/crypto_server_config.cc', + 'quic/crypto/crypto_server_config.h', + 'quic/crypto/crypto_server_config_protobuf.cc', + 'quic/crypto/crypto_server_config_protobuf.h', 'quic/crypto/crypto_utils.cc', 'quic/crypto/crypto_utils.h', 'quic/crypto/curve25519_key_exchange.cc', @@ -724,6 +728,7 @@ 'quic/crypto/p256_key_exchange.h', 'quic/crypto/p256_key_exchange_nss.cc', 'quic/crypto/p256_key_exchange_openssl.cc', + 'quic/crypto/proof_source.h', 'quic/crypto/quic_decrypter.cc', 'quic/crypto/quic_decrypter.h', 'quic/crypto/quic_encrypter.cc', @@ -733,6 +738,8 @@ 'quic/crypto/scoped_evp_cipher_ctx.h', 'quic/crypto/strike_register.cc', 'quic/crypto/strike_register.h', + 'quic/crypto/source_address_token.cc', + 'quic/crypto/source_address_token.h', 'quic/quic_bandwidth.cc', 'quic/quic_bandwidth.h', 'quic/quic_blocked_writer_interface.h', @@ -2516,6 +2523,7 @@ 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', + '../crypto/crypto.gyp:crypto', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../build/temp_gyp/googleurl.gyp:googleurl', '../third_party/openssl/openssl.gyp:openssl', @@ -2587,6 +2595,7 @@ 'type': '<(gtest_target_type)', 'dependencies': [ '../base/base.gyp:test_support_base', + '../crypto/crypto.gyp:crypto', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', 'net', |