diff options
author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 00:03:59 +0000 |
---|---|---|
committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 00:03:59 +0000 |
commit | bd1bbcde834220d63e36980a0d75d0279deb2473 (patch) | |
tree | 374549c6a757da2090df8a03a69ce227b1ab0b95 /net/quic/crypto/chacha20_poly1305_decrypter_test.cc | |
parent | 548e348b0fa7a05d4787a47076d070ace9482505 (diff) | |
download | chromium_src-bd1bbcde834220d63e36980a0d75d0279deb2473.zip chromium_src-bd1bbcde834220d63e36980a0d75d0279deb2473.tar.gz chromium_src-bd1bbcde834220d63e36980a0d75d0279deb2473.tar.bz2 |
Enable the ChaCha20+Poly1305 (kCC12) AEAD algorithm.
Truncate the Poly1305 authenticator to 12 bytes to match the assumption
of QUIC packet encoding code.
Merge internal CL: 63490873
Change the client to favor local preference when negotiating the AEAD
algorithm and key exchange method.
R=agl@chromium.org,rch@chromium.org,rtenneti@chromium.org
Review URL: https://codereview.chromium.org/208933004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic/crypto/chacha20_poly1305_decrypter_test.cc')
-rw-r--r-- | net/quic/crypto/chacha20_poly1305_decrypter_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/quic/crypto/chacha20_poly1305_decrypter_test.cc b/net/quic/crypto/chacha20_poly1305_decrypter_test.cc index 8482e01..1825187 100644 --- a/net/quic/crypto/chacha20_poly1305_decrypter_test.cc +++ b/net/quic/crypto/chacha20_poly1305_decrypter_test.cc @@ -33,7 +33,7 @@ const TestVector test_vectors[] = { "0a1007", "cd7cf67be39c794a", "87e229d4500845a079c0", - "e3e446f7ede9a19b62a4677dabf4e3d24b876bb284753896e1d6", + "e3e446f7ede9a19b62a4677dabf4e3d24b876bb28475", // "3896e1d6" truncated. "86d09974840bded2a5ca" }, // Modify the ciphertext (ChaCha20 encryption output). @@ -41,7 +41,7 @@ const TestVector test_vectors[] = { "0a1007", "cd7cf67be39c794a", "87e229d4500845a079c0", - "f3e446f7ede9a19b62a4677dabf4e3d24b876bb284753896e1d6", + "f3e446f7ede9a19b62a4677dabf4e3d24b876bb28475", // "3896e1d6" truncated. NULL // FAIL }, // Modify the ciphertext (Poly1305 authenticator). @@ -49,7 +49,7 @@ const TestVector test_vectors[] = { "0a1007", "cd7cf67be39c794a", "87e229d4500845a079c0", - "e3e446f7ede9a19b62a4677dabf4e3d24b876bb284753896e1d7", + "e3e446f7ede9a19b62a4677dabf4e3d24b876bb28476", // "3896e1d6" truncated. NULL // FAIL }, // Modify the associated data. @@ -57,7 +57,7 @@ const TestVector test_vectors[] = { "0a1007", "dd7cf67be39c794a", "87e229d4500845a079c0", - "e3e446f7ede9a19b62a4677dabf4e3d24b876bb284753896e1d6", + "e3e446f7ede9a19b62a4677dabf4e3d24b876bb28475", // "3896e1d6" truncated. NULL // FAIL }, { NULL } |