diff options
| author | mek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 23:58:14 +0000 |
|---|---|---|
| committer | mek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 23:58:14 +0000 |
| commit | 573ebcb35b5e92124a5de20131fbedeab26ebf12 (patch) | |
| tree | fc7f87d7083dff8afb67b6e5a8d5ab5ebfdf6225 /net/quic/crypto/crypto_handshake.cc | |
| parent | 5733b22124b90e9ad8dd5045e9acc173d1545755 (diff) | |
| download | chromium_src-573ebcb35b5e92124a5de20131fbedeab26ebf12.zip chromium_src-573ebcb35b5e92124a5de20131fbedeab26ebf12.tar.gz chromium_src-573ebcb35b5e92124a5de20131fbedeab26ebf12.tar.bz2 | |
Revert 227827 "Land Recent QUIC changes."
Causing problem for Linux ASAN:
http://build.chromium.org/p/chromium.memory/buildstatus?builder=Linux%20ASAN%20Tests%20%281%29&number=19137
> Land Recent QUIC changes.
>
> Addressing comments in Jana's review of cr/52231261.
>
> Merge internal change: 53582401
>
> Add a temporary legacy quic constructor
>
> Merge internal change: 53506960
>
> QUIC: disable P-256 support on the server.
>
> The P-256 key generation is done with OpenSSL, which doesn't use the
> QuicRandom passed to DefaultConfig(). This is causing the generated
> server configs to be non-deterministic and breaking 0-RTT handshakes.
>
> Merge internal change: 53501783
>
> Fix an LOG to use the correct condition in QuicReceivedPacketManager and
> change it to a DFATAL so in the future tests will prevent re-occurrence.
>
> Merge internal change: 53483753
>
> Cleanup: Rename OnIncomingAck to OnPacketAcked, and remove unneeeded
> argument from SentPacketManager::OnIncomingAck.
>
> Merge internal change: 53483155
>
> Fix a bug in QuicConnection/QuicConnectionHelper if the helper buffered
> the write (as is the case in chrome). In this case, the sent packet was
> not accounted for properly.
>
> Merge internal change: 53462749
>
> Refactor to change WritePacket to return a WriteResult struct.
>
> Merge internal change: 53382221
>
> Fixing a bug where the version negotiation packet would get dropped on
> the floor if the socket was write blocked at the time it was sent. The
> packet is now queued.
>
> Merge internal change: 53317846
>
> Create a new QUIC_INVALID_CHANNEL_ID_SIGNATURE error to replace a usage
> of QUIC_INTERNAL_ERROR.
>
> Merge internal change: 53277933
>
> Added a todo to merge internal CL 53267501 when chromium's version of
> OpenSSL has latest AEAD code.
>
> Didn't merge internal change: 53267501
>
> R=rch@chromium.org
>
> Review URL: https://codereview.chromium.org/26385004
TBR=rtenneti@chromium.org
Review URL: https://codereview.chromium.org/26666003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic/crypto/crypto_handshake.cc')
| -rw-r--r-- | net/quic/crypto/crypto_handshake.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/quic/crypto/crypto_handshake.cc b/net/quic/crypto/crypto_handshake.cc index f5c7f4d..395f4ae 100644 --- a/net/quic/crypto/crypto_handshake.cc +++ b/net/quic/crypto/crypto_handshake.cc @@ -752,7 +752,7 @@ QuicErrorCode QuicCryptoClientConfig::FillClientHello( if (!channel_id_signer_->Sign(server_hostname, hkdf_input, &key, &signature)) { *error_details = "Channel ID signature failed"; - return QUIC_INVALID_CHANNEL_ID_SIGNATURE; + return QUIC_INTERNAL_ERROR; } cetv.SetStringPiece(kCIDK, key); |