X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/b7a5ecfcbac18c56d0b044975f6ed6835dd86ab4..refs/heads/mdw/xdh:/x25519-tests.in

diff --git a/x25519-tests.in b/x25519-tests.in
index b80521d..612812c 100644
--- a/x25519-tests.in
+++ b/x25519-tests.in
@@ -1,51 +1,61 @@
-### Tests for X25519.
-
-x25519 {
-  ## These are from Daniel J. Bernstein, `Cryptography in NaCl', 2009-03-10,
-  ## https://cr.yp.to/highspeed/naclcrypto-20090310.pdf
-
-  ## Make Alice's public key.
-  77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a
-    0900000000000000000000000000000000000000000000000000000000000000
-    8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a;
-
-  ## Make Bob's public key.
-  5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb
-    0900000000000000000000000000000000000000000000000000000000000000
-    de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f;
-
-  ## Make the shared secret using Alice's private key.
-  77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a
-    de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f
-    4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742;
-
-  ## Make the (same) shared secret using Bob's private key.
-  5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb
-    8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a
-    4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742;
-
-  ## These tests are from RFC7748.  I've clamped the public values because
-  ## RFC7748 wants the top bits ignored.
-  a546e36bf0527c9d3b16154b82465edd62144c0ac1fc5a18506a2244ba449ac4
-    e6db6867583030db3594c1a424b15f7c726624ec26b3353b10a903a6d0ab1c4c
-    c3da55379de9c6908e94ea4df28d084f32eccf03491c71f754b4075577a28552;
-  4b66e9d4d1b4673c5ad22691957d6af5c11b6421e0ea01d42ca4169e7918ba0d
-    e5210f12786811d3f4b7959d0538ae2c31dbe7106fc03c3efc4cd549c715a413
-    95cbde9476e8907d7aade45cb4b873f88b595a68799fa152e6f8f7647aac7957;
-}
-
-x25519-mct {
-  ## These tests are from RFC7748.
-
-  0900000000000000000000000000000000000000000000000000000000000000
-    0900000000000000000000000000000000000000000000000000000000000000
-    1 422c8e7a6227d7bca1350b3e2bb7279f7897b87bb6854b783c60e80311ae3079;
-  0900000000000000000000000000000000000000000000000000000000000000
-    0900000000000000000000000000000000000000000000000000000000000000
-    1000 684cf59ba83309552800ef566f2f4d3c1c3887c49360e3875f2eb94d99532c51;
-
-  ## This one takes aaaaages.
-  ##0900000000000000000000000000000000000000000000000000000000000000
-  ##  0900000000000000000000000000000000000000000000000000000000000000
-  ##  1000000 7c3911e0ab2586fd864497297e575e6f3bc601c0883c30df5f4dd2d24f665424;
-}
+### Tests for X25519.						-*-conf-*-
+### Extracted from Catacomb.
+
+###--------------------------------------------------------------------------
+test x25519
+
+## These are from Daniel J. Bernstein, `Cryptography in NaCl', 2009-03-10,
+## https://cr.yp.to/highspeed/naclcrypto-20090310.pdf
+## Make Alice's public key.
+x 77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a
+Y 0900000000000000000000000000000000000000000000000000000000000000
+Z 8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a
+
+## Make Bob's public key.
+x 5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb
+Y 0900000000000000000000000000000000000000000000000000000000000000
+Z de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f
+
+## Make the shared secret using Alice's private key.
+x 77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a
+Y de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f
+Z 4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742
+
+## Make the (same) shared secret using Bob's private key.
+x 5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb
+Y 8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a
+Z 4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742
+
+## These tests are from RFC7748.  I've clamped the public values because
+## RFC7748 wants the top bits ignored.
+x a546e36bf0527c9d3b16154b82465edd62144c0ac1fc5a18506a2244ba449ac4
+Y e6db6867583030db3594c1a424b15f7c726624ec26b3353b10a903a6d0ab1c4c
+Z c3da55379de9c6908e94ea4df28d084f32eccf03491c71f754b4075577a28552
+
+x 4b66e9d4d1b4673c5ad22691957d6af5c11b6421e0ea01d42ca4169e7918ba0d
+Y e5210f12786811d3f4b7959d0538ae2c31dbe7106fc03c3efc4cd549c715a413
+Z 95cbde9476e8907d7aade45cb4b873f88b595a68799fa152e6f8f7647aac7957
+
+###--------------------------------------------------------------------------
+test x25519-mct
+
+## These tests are from RFC7748.
+x 0900000000000000000000000000000000000000000000000000000000000000
+Y 0900000000000000000000000000000000000000000000000000000000000000
+n 1
+Z 422c8e7a6227d7bca1350b3e2bb7279f7897b87bb6854b783c60e80311ae3079
+
+x 422c8e7a6227d7bca1350b3e2bb7279f7897b87bb6854b783c60e80311ae3079
+Y 0900000000000000000000000000000000000000000000000000000000000000
+n 9
+Z 7b96f292a115e83e78560105869c00b0f4fb2cd10e385b8c64bf047b0c0e1113
+
+x 7b96f292a115e83e78560105869c00b0f4fb2cd10e385b8c64bf047b0c0e1113
+Y 15ede295d28b07a10484dab4c591580dea0a9181591f20c364c1b26387200466
+n 90
+Z b1a5a73158904c020866c13939dd7e1aa26852ee1d2609c92e5a8f1debe2150a
+
+x b1a5a73158904c020866c13939dd7e1aa26852ee1d2609c92e5a8f1debe2150a
+Y 4f5d42724afd7c6e46259e753d3f9e186b72c47f692881c0d069c481ddaf3362
+n 900
+Z 684cf59ba83309552800ef566f2f4d3c1c3887c49360e3875f2eb94d99532c51