X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/ce7001d8ef72928ff966e3c9da1c62ce1d00d2c0..8c5956c14f5834a072e1a9345ae1f356b14164ca:/symm/t/chacha

diff --git a/symm/t/chacha b/symm/t/chacha
index 043397a8..c7715545 100644
--- a/symm/t/chacha
+++ b/symm/t/chacha
@@ -31,12 +31,19 @@ chacha8-core {
 
 xchacha20 {
   ## Unfortunately, XChaCha isn't actually defined anywhere, even though it's
-  ## obvious how to do it.  These test vectors are from
-  ##   https://github.com/DaGenix/rust-crypto/blob/master/src/chacha20.rs
+  ## obvious how to do it.
 
+  ## These test vectors are from
+  ##   https://github.com/DaGenix/rust-crypto/blob/master/src/chacha20.rs
   1b27556473e985d462cd51197a9a46c76009549eac6474f206c4ee0844f68389
   69696ee955b62b73cd62bda875fc73d68219e0036b7a0b37 "" 0 ""
   4febf2fe4b359c508dc5e8b5980c88e38946d8f18f313465c862a08782648248018dacdcb904178853a46dca3a0eaaee747cba97434eaffad58fea8222047e0de6c3a6775106e0331ad714d2f27a55641340a1f1dd9f94532e68cb241cbdd150970d14e05c5b173193fb14f51c41f393835bf7f416a7e0bba81ffb8b13af0e21691d7ecec93b75e6e4183a;
+
+  ## This one's from draft-irtf-cfrg-xchacha-03.
+  808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f
+  404142434445464748494a4b4c4d4e4f5051525354555658 "" 64
+  5468652064686f6c65202870726f6e6f756e6365642022646f6c65222920697320616c736f206b6e6f776e2061732074686520417369617469632077696c6420646f672c2072656420646f672c20616e642077686973746c696e6720646f672e2049742069732061626f7574207468652073697a65206f662061204765726d616e20736865706865726420627574206c6f6f6b73206d6f7265206c696b652061206c6f6e672d6c656767656420666f782e205468697320686967686c7920656c757369766520616e6420736b696c6c6564206a756d70657220697320636c6173736966696564207769746820776f6c7665732c20636f796f7465732c206a61636b616c732c20616e6420666f78657320696e20746865207461786f6e6f6d69632066616d696c792043616e696461652e
+  7d0a2e6b7f7c65a236542630294e063b7ab9b555a5d5149aa21e4ae1e4fbce87ecc8e08a8b5e350abe622b2ffa617b202cfad72032a3037e76ffdcdc4376ee053a190d7e46ca1de04144850381b9cb29f051915386b8a710b8ac4d027b8b050f7cba5854e028d564e453b8a968824173fc16488b8970cac828f11ae53cabd20112f87107df24ee6183d2274fe4c8b1485534ef2c5fbc1ec24bfc3663efaa08bc047d29d25043532db8391a8a3d776bf4372a6955827ccb0cdd4af403a7ce4c63d595c75a43e045f0cce1f29c8b93bd65afc5974922f214a40b7c402cdb91ae73c0b63615cdad0480680f16515a7ace9d39236464328a37743ffc28f4ddb324f4d0f5bbdc270c65b1749a6efff1fbaa09536175ccd29fb9e6057b307320d316838a9c71f70b5b5907a66f7ea49aadc409;
 }
 
 chacha8 {
@@ -229,3 +236,21 @@ chacha20 {
   000000000000000000000002 "" 0 ""
   965e3bc6f9ec7ed9560808f4d229f94b137ff275ca9b3fcbdd59deaad23310ae;
 }
+
+chacha20-poly1305 {
+  ## Test from RFC7539.
+  808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f
+    070000004041424344454647
+    50515253c0c1c2c3c4c5c6c7
+    4c616469657320616e642047656e746c656d656e206f662074686520636c617373206f66202739393a204966204920636f756c64206f6666657220796f75206f6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73637265656e20776f756c642062652069742e
+    d31a8d34648e60db7b86afbc53ef7ec2a4aded51296e08fea9e2b5a736ee62d63dbea45e8ca9671282fafb69da92728b1a71de0a9e060b2905d6a5b67ecd3b3692ddbd7f2d778b8c9803aee328091b58fab324e4fad675945585808b4831d7bc3ff4def08e4b7a9de576d26586cec64b6116
+    1ae10b594f09e26a7e902ecbd0600691;
+
+  ## Test from draft-irtf-cfrg-xchacha-03.
+  808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f
+    404142434445464748494a4b4c4d4e4f5051525354555657
+    50515253c0c1c2c3c4c5c6c7
+    4c616469657320616e642047656e746c656d656e206f662074686520636c617373206f66202739393a204966204920636f756c64206f6666657220796f75206f6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73637265656e20776f756c642062652069742e
+    bd6d179d3e83d43b9576579493c0e939572a1700252bfaccbed2902c21396cbb731c7f1b0b4aa6440bf3a82f4eda7e39ae64c6708c54c216cb96b72e1213b4522f8c9ba40db5d945b11b69b982c1bb9e3f3fac2bc369488f76b2383565d3fff921f9664c97637da9768812f615c68b13b52e
+    c0875924c1c7987947deafd8780acf49;
+}