Merge branch '2.4.x' into 2.5.x

[catacomb] / symm / t / salsa20.local

diff --git a/symm/t/salsa20.local b/symm/t/salsa20.local
index 167430f..b03d2c3 100644 (file)
--- a/symm/t/salsa20.local
+++ b/symm/t/salsa20.local
@@ -59,6 +59,14 @@ salsa20 {
   ## Homemade tests for skipping.
   0f62b5085bae0154a7fa4da0f34699ec3f92e5388bde3184d72a7dd02376c91c
     288ff65dc42b92f9 "" 131025 "" 36de843cccab0390b8b5862f1e4596ae;
+
+  ## Homemade test of IETF-style 12-byte nonces.
+  0102030405060708090a0b0c0d0e0f10c9cacbcccdcecfd0d1d2d3d4d5d6d7d8
+    7172737465666768696a6b6c 706f6e6d 0 ""
+    45254427290f6bc1ff8b7a06aae9d9625990b66a1533c841ef31de22d772287e68c507e1c5991f02664e4cb054f5f6b8b1a0858206489577c0c384ecea67f64a;
+  0102030405060708090a0b0c0d0e0f10
+    7172737465666768696a6b6c 706f6e6d 0 ""
+    27ad2ef81ec852113043feef25120df7f1c83d900a3732b9062ff6fd8f56bbe186556ef6a1a32bebe75eab3391d6701d0ee80510978cb78dab097ab568b6b1c1;
 }
 
 xsalsa20 {
@@ -79,3 +87,15 @@ xsalsa20 {
   be075fc53c81f2d5cf141316ebeb0c7b5228c52a4c62cbd44b66849b64244ffce5ecbaaf33bd751a1ac728d45e6c61296cdc3c01233561f41db66cce314adb310e3be8250c46f06dceea3a7fa1348057e2f6556ad6b1318a024a838f21af1fde048977eb48f59ffd4924ca1c60902e52f0a089bc76897040e082f937763848645e0705
   8e993b9f48681273c29650ba32fc76ce48332ea7164d96a4476fb8c531a1186ac0dfc17c98dce87b4da7f011ec48c97271d2c20f9b928fe2270d6fb863d51738b48eeee314a7cc8ab932164548e526ae90224368517acfeabd6bb3732bc0e9da99832b61ca01b6de56244a9e88d5f9b37973f622a43d14a6599b1f654cb45a74e355a5;
 }
+
+salsa20-naclbox {
+  ## Taken from Daniel J. Bernstein, `Cryptography in NaCl',
+  ## https://cr.yp.to/highspeed/naclcrypto-20090310.pdf
+
+  1b27556473e985d462cd51197a9a46c76009549eac6474f206c4ee0844f68389
+  69696ee955b62b73cd62bda875fc73d68219e0036b7a0b37
+  ""
+  be075fc53c81f2d5cf141316ebeb0c7b5228c52a4c62cbd44b66849b64244ffce5ecbaaf33bd751a1ac728d45e6c61296cdc3c01233561f41db66cce314adb310e3be8250c46f06dceea3a7fa1348057e2f6556ad6b1318a024a838f21af1fde048977eb48f59ffd4924ca1c60902e52f0a089bc76897040e082f937763848645e0705
+  8e993b9f48681273c29650ba32fc76ce48332ea7164d96a4476fb8c531a1186ac0dfc17c98dce87b4da7f011ec48c97271d2c20f9b928fe2270d6fb863d51738b48eeee314a7cc8ab932164548e526ae90224368517acfeabd6bb3732bc0e9da99832b61ca01b6de56244a9e88d5f9b37973f622a43d14a6599b1f654cb45a74e355a5
+  f3ffc7703f9400e52a7dfb4b3d3305d9;
+}