diff --git a/crypto/poly1305/poly1305.c b/crypto/poly1305/poly1305.c
index eec4d67f0c66f65eebe69c8c26212d7825545011..ab4fa83c24731e51aca7c67294b0bf2624547004 100644
--- a/crypto/poly1305/poly1305.c
+++ b/crypto/poly1305/poly1305.c
@@ -12,25 +12,7 @@
 #include <openssl/crypto.h>
 
 #include "internal/poly1305.h"
-
-typedef void (*poly1305_blocks_f) (void *ctx, const unsigned char *inp,
-                                   size_t len, unsigned int padbit);
-typedef void (*poly1305_emit_f) (void *ctx, unsigned char mac[16],
-                                 const unsigned int nonce[4]);
-
-struct poly1305_context {
-    double opaque[24];  /* large enough to hold internal state, declared
-                         * 'double' to ensure at least 64-bit invariant
-                         * alignment across all platforms and
-                         * configurations */
-    unsigned int nonce[4];
-    unsigned char data[POLY1305_BLOCK_SIZE];
-    size_t num;
-    struct {
-        poly1305_blocks_f blocks;
-        poly1305_emit_f emit;
-    } func;
-};
+#include "poly1305_local.h"
 
 size_t Poly1305_ctx_size ()
 {
@@ -548,490 +530,3 @@ void Poly1305_Final(POLY1305 *ctx, unsigned char mac[16])
     /* zero out the state */
     OPENSSL_cleanse(ctx, sizeof(*ctx));
 }
-
-#ifdef SELFTEST
-#include <stdio.h>
-
-struct poly1305_test {
-    const char *inputhex;
-    const char *keyhex;
-    const char *outhex;
-};
-
-static const struct poly1305_test poly1305_tests[] = {
-    /*
-     * RFC7539
-     */
-    {
-     "43727970746f6772617068696320466f72756d2052657365617263682047726f"
-     "7570",
-     "85d6be7857556d337f4452fe42d506a8""0103808afb0db2fd4abff6af4149f51b",
-     "a8061dc1305136c6c22b8baf0c0127a9"
-    },
-    /*
-     * test vectors from "The Poly1305-AES message-authentication code"
-     */
-    {
-     "f3f6",
-     "851fc40c3467ac0be05cc20404f3f700""580b3b0f9447bb1e69d095b5928b6dbc",
-     "f4c633c3044fc145f84f335cb81953de"
-    },
-    {
-     "",
-     "a0f3080000f46400d0c7e9076c834403""dd3fab2251f11ac759f0887129cc2ee7",
-     "dd3fab2251f11ac759f0887129cc2ee7"
-    },
-    {
-     "663cea190ffb83d89593f3f476b6bc24d7e679107ea26adb8caf6652d0656136",
-     "48443d0bb0d21109c89a100b5ce2c208""83149c69b561dd88298a1798b10716ef",
-     "0ee1c16bb73f0f4fd19881753c01cdbe"
-    },
-    {
-     "ab0812724a7f1e342742cbed374d94d136c6b8795d45b3819830f2c04491faf0"
-     "990c62e48b8018b2c3e4a0fa3134cb67fa83e158c994d961c4cb21095c1bf9",
-     "12976a08c4426d0ce8a82407c4f48207""80f8c20aa71202d1e29179cbcb555a57",
-     "5154ad0d2cb26e01274fc51148491f1b"
-    },
-    /*
-     * self-generated vectors exercise "significant" lengths, such that
-     * are handled by different code paths
-     */
-    {
-     "ab0812724a7f1e342742cbed374d94d136c6b8795d45b3819830f2c04491faf0"
-     "990c62e48b8018b2c3e4a0fa3134cb67fa83e158c994d961c4cb21095c1bf9af",
-     "12976a08c4426d0ce8a82407c4f48207""80f8c20aa71202d1e29179cbcb555a57",
-     "812059a5da198637cac7c4a631bee466"
-    },
-    {
-     "ab0812724a7f1e342742cbed374d94d136c6b8795d45b3819830f2c04491faf0"
-     "990c62e48b8018b2c3e4a0fa3134cb67",
-     "12976a08c4426d0ce8a82407c4f48207""80f8c20aa71202d1e29179cbcb555a57",
-     "5b88d7f6228b11e2e28579a5c0c1f761"
-    },
-    {
-     "ab0812724a7f1e342742cbed374d94d136c6b8795d45b3819830f2c04491faf0"
-     "990c62e48b8018b2c3e4a0fa3134cb67fa83e158c994d961c4cb21095c1bf9af"
-     "663cea190ffb83d89593f3f476b6bc24d7e679107ea26adb8caf6652d0656136",
-     "12976a08c4426d0ce8a82407c4f48207""80f8c20aa71202d1e29179cbcb555a57",
-     "bbb613b2b6d753ba07395b916aaece15"
-    },
-    {
-     "ab0812724a7f1e342742cbed374d94d136c6b8795d45b3819830f2c04491faf0"
-     "990c62e48b8018b2c3e4a0fa3134cb67fa83e158c994d961c4cb21095c1bf9af"
-     "48443d0bb0d21109c89a100b5ce2c20883149c69b561dd88298a1798b10716ef"
-     "663cea190ffb83d89593f3f476b6bc24",
-     "12976a08c4426d0ce8a82407c4f48207""80f8c20aa71202d1e29179cbcb555a57",
-     "c794d7057d1778c4bbee0a39b3d97342"
-    },
-    {
-     "ab0812724a7f1e342742cbed374d94d136c6b8795d45b3819830f2c04491faf0"
-     "990c62e48b8018b2c3e4a0fa3134cb67fa83e158c994d961c4cb21095c1bf9af"
-     "48443d0bb0d21109c89a100b5ce2c20883149c69b561dd88298a1798b10716ef"
-     "663cea190ffb83d89593f3f476b6bc24d7e679107ea26adb8caf6652d0656136",
-     "12976a08c4426d0ce8a82407c4f48207""80f8c20aa71202d1e29179cbcb555a57",
-     "ffbcb9b371423152d7fca5ad042fbaa9"
-    },
-    {
-     "ab0812724a7f1e342742cbed374d94d136c6b8795d45b3819830f2c04491faf0"
-     "990c62e48b8018b2c3e4a0fa3134cb67fa83e158c994d961c4cb21095c1bf9af"
-     "48443d0bb0d21109c89a100b5ce2c20883149c69b561dd88298a1798b10716ef"
-     "663cea190ffb83d89593f3f476b6bc24d7e679107ea26adb8caf6652d0656136"
-     "812059a5da198637cac7c4a631bee466",
-     "12976a08c4426d0ce8a82407c4f48207""80f8c20aa71202d1e29179cbcb555a57",
-     "069ed6b8ef0f207b3e243bb1019fe632"
-    },
-    {
-     "ab0812724a7f1e342742cbed374d94d136c6b8795d45b3819830f2c04491faf0"
-     "990c62e48b8018b2c3e4a0fa3134cb67fa83e158c994d961c4cb21095c1bf9af"
-     "48443d0bb0d21109c89a100b5ce2c20883149c69b561dd88298a1798b10716ef"
-     "663cea190ffb83d89593f3f476b6bc24d7e679107ea26adb8caf6652d0656136"
-     "812059a5da198637cac7c4a631bee4665b88d7f6228b11e2e28579a5c0c1f761",
-     "12976a08c4426d0ce8a82407c4f48207""80f8c20aa71202d1e29179cbcb555a57",
-     "cca339d9a45fa2368c2c68b3a4179133"
-    },
-    {
-     "ab0812724a7f1e342742cbed374d94d136c6b8795d45b3819830f2c04491faf0"
-     "990c62e48b8018b2c3e4a0fa3134cb67fa83e158c994d961c4cb21095c1bf9af"
-     "48443d0bb0d21109c89a100b5ce2c20883149c69b561dd88298a1798b10716ef"
-     "663cea190ffb83d89593f3f476b6bc24d7e679107ea26adb8caf6652d0656136"
-     "812059a5da198637cac7c4a631bee4665b88d7f6228b11e2e28579a5c0c1f761"
-     "ab0812724a7f1e342742cbed374d94d136c6b8795d45b3819830f2c04491faf0"
-     "990c62e48b8018b2c3e4a0fa3134cb67fa83e158c994d961c4cb21095c1bf9af"
-     "48443d0bb0d21109c89a100b5ce2c20883149c69b561dd88298a1798b10716ef"
-     "663cea190ffb83d89593f3f476b6bc24d7e679107ea26adb8caf6652d0656136",
-     "12976a08c4426d0ce8a82407c4f48207""80f8c20aa71202d1e29179cbcb555a57",
-     "53f6e828a2f0fe0ee815bf0bd5841a34"
-    },
-    {
-     "ab0812724a7f1e342742cbed374d94d136c6b8795d45b3819830f2c04491faf0"
-     "990c62e48b8018b2c3e4a0fa3134cb67fa83e158c994d961c4cb21095c1bf9af"
-     "48443d0bb0d21109c89a100b5ce2c20883149c69b561dd88298a1798b10716ef"
-     "663cea190ffb83d89593f3f476b6bc24d7e679107ea26adb8caf6652d0656136"
-     "812059a5da198637cac7c4a631bee4665b88d7f6228b11e2e28579a5c0c1f761"
-     "ab0812724a7f1e342742cbed374d94d136c6b8795d45b3819830f2c04491faf0"
-     "990c62e48b8018b2c3e4a0fa3134cb67fa83e158c994d961c4cb21095c1bf9af"
-     "48443d0bb0d21109c89a100b5ce2c20883149c69b561dd88298a1798b10716ef"
-     "663cea190ffb83d89593f3f476b6bc24d7e679107ea26adb8caf6652d0656136"
-     "812059a5da198637cac7c4a631bee4665b88d7f6228b11e2e28579a5c0c1f761",
-     "12976a08c4426d0ce8a82407c4f48207""80f8c20aa71202d1e29179cbcb555a57",
-     "b846d44e9bbd53cedffbfbb6b7fa4933"
-    },
-    /*
-     * 4th power of the key spills to 131th bit in SIMD key setup
-     */
-    {
-     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-     "ad628107e8351d0f2c231a05dc4a4106""00000000000000000000000000000000",
-     "07145a4c02fe5fa32036de68fabe9066"
-    },
-    {
-    /*
-     * poly1305_ieee754.c failed this in final stage
-     */
-     "842364e156336c0998b933a6237726180d9e3fdcbde4cd5d17080fc3beb49614"
-     "d7122c037463ff104d73f19c12704628d417c4c54a3fe30d3c3d7714382d43b0"
-     "382a50a5dee54be844b076e8df88201a1cd43b90eb21643fa96f39b518aa8340"
-     "c942ff3c31baf7c9bdbf0f31ae3fa096bf8c63030609829fe72e179824890bc8"
-     "e08c315c1cce2a83144dbbff09f74e3efc770b54d0984a8f19b14719e6363564"
-     "1d6b1eedf63efbf080e1783d32445412114c20de0b837a0dfa33d6b82825fff4"
-     "4c9a70ea54ce47f07df698e6b03323b53079364a5fc3e9dd034392bdde86dccd"
-     "da94321c5e44060489336cb65bf3989c36f7282c2f5d2b882c171e74",
-     "95d5c005503e510d8cd0aa072c4a4d06""6eabc52d11653df47fbf63ab198bcc26",
-     "f248312e578d9d58f8b7bb4d19105431"
-    },
-    /*
-     * AVX2 in poly1305-x86.pl failed this with 176+32 split
-     */
-    {
-    "248ac31085b6c2adaaa38259a0d7192c5c35d1bb4ef39ad94c38d1c82479e2dd"
-    "2159a077024b0589bc8a20101b506f0a1ad0bbab76e83a83f1b94be6beae74e8"
-    "74cab692c5963a75436b776121ec9f62399a3e66b2d22707dae81933b6277f3c"
-    "8516bcbe26dbbd86f373103d7cf4cad1888c952118fbfbd0d7b4bedc4ae4936a"
-    "ff91157e7aa47c54442ea78d6ac251d324a0fbe49d89cc3521b66d16e9c66a37"
-    "09894e4eb0a4eedc4ae19468e66b81f2"
-    "71351b1d921ea551047abcc6b87a901fde7db79fa1818c11336dbc07244a40eb",
-    "000102030405060708090a0b0c0d0e0f""00000000000000000000000000000000",
-    "bc939bc5281480fa99c6d68c258ec42f"
-    },
-    /*
-     * test vectors from Google
-     */
-    {
-     "",
-     "c8afaac331ee372cd6082de134943b17""4710130e9f6fea8d72293850a667d86c",
-     "4710130e9f6fea8d72293850a667d86c",
-    },
-    {
-     "48656c6c6f20776f726c6421",
-     "746869732069732033322d6279746520""6b657920666f7220506f6c7931333035",
-     "a6f745008f81c916a20dcc74eef2b2f0"
-    },
-    {
-     "0000000000000000000000000000000000000000000000000000000000000000",
-     "746869732069732033322d6279746520""6b657920666f7220506f6c7931333035",
-     "49ec78090e481ec6c26b33b91ccc0307"
-    },
-    {
-     "89dab80b7717c1db5db437860a3f70218e93e1b8f461fb677f16f35f6f87e2a9"
-     "1c99bc3a47ace47640cc95c345be5ecca5a3523c35cc01893af0b64a62033427"
-     "0372ec12482d1b1e363561698a578b359803495bb4e2ef1930b17a5190b580f1"
-     "41300df30adbeca28f6427a8bc1a999fd51c554a017d095d8c3e3127daf9f595",
-     "2d773be37adb1e4d683bf0075e79c4ee""037918535a7f99ccb7040fb5f5f43aea",
-     "c85d15ed44c378d6b00e23064c7bcd51"
-    },
-    {
-     "000000000000000b1703030200000000"
-     "06db1f1f368d696a810a349c0c714c9a5e7850c2407d721acded95e018d7a852"
-     "66a6e1289cdb4aeb18da5ac8a2b0026d24a59ad485227f3eaedbb2e7e35e1c66"
-     "cd60f9abf716dcc9ac42682dd7dab287a7024c4eefc321cc0574e16793e37cec"
-     "03c5bda42b54c114a80b57af26416c7be742005e20855c73e21dc8e2edc9d435"
-     "cb6f6059280011c270b71570051c1c9b3052126620bc1e2730fa066c7a509d53"
-     "c60e5ae1b40aa6e39e49669228c90eecb4a50db32a50bc49e90b4f4b359a1dfd"
-     "11749cd3867fcf2fb7bb6cd4738f6a4ad6f7ca5058f7618845af9f020f6c3b96"
-     "7b8f4cd4a91e2813b507ae66f2d35c18284f7292186062e10fd5510d18775351"
-     "ef334e7634ab4743f5b68f49adcab384d3fd75f7390f4006ef2a295c8c7a076a"
-     "d54546cd25d2107fbe1436c840924aaebe5b370893cd63d1325b8616fc481088"
-     "6bc152c53221b6df373119393255ee72bcaa880174f1717f9184fa91646f17a2"
-     "4ac55d16bfddca9581a92eda479201f0edbf633600d6066d1ab36d5d2415d713"
-     "51bbcd608a25108d25641992c1f26c531cf9f90203bc4cc19f5927d834b0a471"
-     "16d3884bbb164b8ec883d1ac832e56b3918a98601a08d171881541d594db399c"
-     "6ae6151221745aec814c45b0b05b565436fd6f137aa10a0c0b643761dbd6f9a9"
-     "dcb99b1a6e690854ce0769cde39761d82fcdec15f0d92d7d8e94ade8eb83fbe0",
-     "99e5822dd4173c995e3dae0ddefb9774""3fde3b080134b39f76e9bf8d0e88d546",
-     "2637408fe13086ea73f971e3425e2820"
-    },
-    /*
-     * test vectors from Hanno Böck
-     */
-    {
-     "cccccccccccccccccccccccccccccccccccccccccccccccccc80cccccccccccc"
-     "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccecccccc"
-     "ccccccccccccccccccccccccccccccc5cccccccccccccccccccccccccccccccc"
-     "cccccccccce3cccccccccccccccccccccccccccccccccccccccccccccccccccc"
-     "ccccccccaccccccccccccccccccccce6cccccccccc000000afcccccccccccccc"
-     "ccccfffffff50000000000000000000000000000000000000000000000000000"
-     "00ffffffe7000000000000000000000000000000000000000000000000000000"
-     "0000000000000000000000000000000000000000000000000000719205a8521d"
-     "fc",
-     "7f1b0264000000000000000000000000""0000000000000000cccccccccccccccc",
-     "8559b876eceed66eb37798c0457baff9"
-    },
-    {
-     "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000000"
-     "00000000800264",
-     "e0001600000000000000000000000000""0000aaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-     "00bd1258978e205444c9aaaa82006fed"
-    },
-    {
-     "02fc",
-     "0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c""0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
-     "06120c0c0c0c0c0c0c0c0c0c0c0c0c0c"
-    },
-    {
-     "7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b"
-     "7b7b7b7b7b7b7a7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b"
-     "7b7b5c7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b"
-     "7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b6e7b007b7b7b7b7b7b7b7b7b"
-     "7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7a7b7b7b7b7b7b7b7b7b7b7b7b"
-     "7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b5c7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b"
-     "7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b"
-     "7b6e7b001300000000b300000000000000000000000000000000000000000000"
-     "f20000000000000000000000000000000000002000efff000900000000000000"
-     "0000000000100000000009000000640000000000000000000000001300000000"
-     "b300000000000000000000000000000000000000000000f20000000000000000"
-     "000000000000000000002000efff00090000000000000000007a000010000000"
-     "000900000064000000000000000000000000000000000000000000000000fc",
-     "00ff0000000000000000000000000000""00000000001e00000000000000007b7b",
-     "33205bbf9e9f8f7212ab9e2ab9b7e4a5"
-    },
-    {
-     "7777777777777777777777777777777777777777777777777777777777777777"
-     "7777777777777777777777777777777777777777777777777777777777777777"
-     "777777777777777777777777ffffffe9e9acacacacacacacacacacac0000acac"
-     "ec0100acacac2caca2acacacacacacacacacacac64f2",
-     "0000007f0000007f0100002000000000""0000cf77777777777777777777777777",
-     "02ee7c8c546ddeb1a467e4c3981158b9"
-    },
-    /*
-     * test vectors from Andrew Moon
-     */
-    {   /* nacl */
-     "8e993b9f48681273c29650ba32fc76ce48332ea7164d96a4476fb8c531a1186a"
-     "c0dfc17c98dce87b4da7f011ec48c97271d2c20f9b928fe2270d6fb863d51738"
-     "b48eeee314a7cc8ab932164548e526ae90224368517acfeabd6bb3732bc0e9da"
-     "99832b61ca01b6de56244a9e88d5f9b37973f622a43d14a6599b1f654cb45a74"
-     "e355a5",
-     "eea6a7251c1e72916d11c2cb214d3c25""2539121d8e234e652d651fa4c8cff880",
-     "f3ffc7703f9400e52a7dfb4b3d3305d9"
-    },
-    {   /* wrap 2^130-5 */
-     "ffffffffffffffffffffffffffffffff",
-     "02000000000000000000000000000000""00000000000000000000000000000000",
-     "03000000000000000000000000000000"
-    },
-    {   /* wrap 2^128 */
-     "02000000000000000000000000000000",
-     "02000000000000000000000000000000""ffffffffffffffffffffffffffffffff",
-     "03000000000000000000000000000000"
-    },
-    {   /* limb carry */
-     "fffffffffffffffffffffffffffffffff0ffffffffffffffffffffffffffffff"
-     "11000000000000000000000000000000",
-     "01000000000000000000000000000000""00000000000000000000000000000000",
-     "05000000000000000000000000000000"
-    },
-    {   /* 2^130-5 */
-     "fffffffffffffffffffffffffffffffffbfefefefefefefefefefefefefefefe"
-     "01010101010101010101010101010101",
-     "01000000000000000000000000000000""00000000000000000000000000000000",
-     "00000000000000000000000000000000"
-    },
-    {   /* 2^130-6 */
-     "fdffffffffffffffffffffffffffffff",
-     "02000000000000000000000000000000""00000000000000000000000000000000",
-     "faffffffffffffffffffffffffffffff"
-    },
-    {   /* 5*H+L reduction intermediate */
-     "e33594d7505e43b900000000000000003394d7505e4379cd0100000000000000"
-     "0000000000000000000000000000000001000000000000000000000000000000",
-     "01000000000000000400000000000000""00000000000000000000000000000000",
-     "14000000000000005500000000000000"
-    },
-    {   /* 5*H+L reduction final */
-     "e33594d7505e43b900000000000000003394d7505e4379cd0100000000000000"
-     "00000000000000000000000000000000",
-     "01000000000000000400000000000000""00000000000000000000000000000000",
-     "13000000000000000000000000000000"
-    }
-};
-
-static unsigned char hex_digit(char h)
-{
-    int i = OPENSSL_hexchar2int(h);
-
-    if (i < 0)
-        abort();
-    return i;
-}
-
-static void hex_decode(unsigned char *out, const char *hex)
-{
-    size_t j = 0;
-
-    while (*hex != 0) {
-        unsigned char v = hex_digit(*hex++);
-        v <<= 4;
-        v |= hex_digit(*hex++);
-        out[j++] = v;
-    }
-}
-
-static void hexdump(unsigned char *a, size_t len)
-{
-    size_t i;
-
-    for (i = 0; i < len; i++)
-        printf("%02x", a[i]);
-}
-
-int main()
-{
-    static const unsigned num_tests =
-        sizeof(poly1305_tests) / sizeof(struct poly1305_test);
-    unsigned i;
-    unsigned char key[32], out[16], expected[16];
-    POLY1305 poly1305;
-
-    for (i = 0; i < num_tests; i++) {
-        const struct poly1305_test *test = &poly1305_tests[i];
-        unsigned char *in;
-        size_t inlen = strlen(test->inputhex);
-
-        if (strlen(test->keyhex) != sizeof(key) * 2 ||
-            strlen(test->outhex) != sizeof(out) * 2 || (inlen & 1) == 1)
-            return 1;
-
-        inlen /= 2;
-
-        hex_decode(key, test->keyhex);
-        hex_decode(expected, test->outhex);
-
-        in = malloc(inlen);
-
-        hex_decode(in, test->inputhex);
-
-        Poly1305_Init(&poly1305, key);
-        Poly1305_Update(&poly1305, in, inlen);
-        Poly1305_Final(&poly1305, out);
-
-        if (memcmp(out, expected, sizeof(expected)) != 0) {
-            printf("Poly1305 test #%d failed.\n", i);
-            printf("got:      ");
-            hexdump(out, sizeof(out));
-            printf("\nexpected: ");
-            hexdump(expected, sizeof(expected));
-            printf("\n");
-            return 1;
-        }
-
-        if (inlen > 16) {
-            Poly1305_Init(&poly1305, key);
-            Poly1305_Update(&poly1305, in, 1);
-            Poly1305_Update(&poly1305, in+1, inlen-1);
-            Poly1305_Final(&poly1305, out);
-
-            if (memcmp(out, expected, sizeof(expected)) != 0) {
-                printf("Poly1305 test #%d/1+(N-1) failed.\n", i);
-                printf("got:      ");
-                hexdump(out, sizeof(out));
-                printf("\nexpected: ");
-                hexdump(expected, sizeof(expected));
-                printf("\n");
-                return 1;
-            }
-        }
-
-        if (inlen > 32) {
-            size_t half = inlen / 2;
-
-            Poly1305_Init(&poly1305, key);
-            Poly1305_Update(&poly1305, in, half);
-            Poly1305_Update(&poly1305, in+half, inlen-half);
-            Poly1305_Final(&poly1305, out);
-
-            if (memcmp(out, expected, sizeof(expected)) != 0) {
-                printf("Poly1305 test #%d/2 failed.\n", i);
-                printf("got:      ");
-                hexdump(out, sizeof(out));
-                printf("\nexpected: ");
-                hexdump(expected, sizeof(expected));
-                printf("\n");
-                return 1;
-            }
-
-            for (half = 16; half < inlen; half += 16) {
-                Poly1305_Init(&poly1305, key);
-                Poly1305_Update(&poly1305, in, half);
-                Poly1305_Update(&poly1305, in+half, inlen-half);
-                Poly1305_Final(&poly1305, out);
-
-                if (memcmp(out, expected, sizeof(expected)) != 0) {
-                    printf("Poly1305 test #%d/%d+%d failed.\n",
-                                           i, half, inlen-half);
-                    printf("got:      ");
-                    hexdump(out, sizeof(out));
-                    printf("\nexpected: ");
-                    hexdump(expected, sizeof(expected));
-                    printf("\n");
-                    return 1;
-                }
-            }
-        }
-
-        free(in);
-    }
-
-    printf("PASS\n");
-
-# ifdef OPENSSL_CPUID_OBJ
-    {
-        unsigned char buf[8192];
-        unsigned long long stopwatch;
-        unsigned long long OPENSSL_rdtsc();
-
-        memset (buf,0x55,sizeof(buf));
-        memset (key,0xAA,sizeof(key));
-
-        Poly1305_Init(&poly1305, key);
-
-        for (i=0;i<100000;i++)
-            Poly1305_Update(&poly1305,buf,sizeof(buf));
-
-        stopwatch = OPENSSL_rdtsc();
-        for (i=0;i<10000;i++)
-            Poly1305_Update(&poly1305,buf,sizeof(buf));
-        stopwatch = OPENSSL_rdtsc() - stopwatch;
-
-        printf("%g\n",stopwatch/(double)(i*sizeof(buf)));
-
-        stopwatch = OPENSSL_rdtsc();
-        for (i=0;i<10000;i++) {
-            Poly1305_Init(&poly1305, key);
-            Poly1305_Update(&poly1305,buf,16);
-            Poly1305_Final(&poly1305,buf);
-        }
-        stopwatch = OPENSSL_rdtsc() - stopwatch;
-
-        printf("%g\n",stopwatch/(double)(i));
-    }
-# endif
-    return 0;
-}
-#endif
diff --git a/crypto/poly1305/poly1305_local.h b/crypto/poly1305/poly1305_local.h
new file mode 100644
index 0000000000000000000000000000000000000000..6d4d9dc5b6216934c7f047d2d9310d81b3c22e80
--- /dev/null
+++ b/crypto/poly1305/poly1305_local.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+typedef void (*poly1305_blocks_f) (void *ctx, const unsigned char *inp,
+                                   size_t len, unsigned int padbit);
+typedef void (*poly1305_emit_f) (void *ctx, unsigned char mac[16],
+                                 const unsigned int nonce[4]);
+
+struct poly1305_context {
+    double opaque[24];  /* large enough to hold internal state, declared
+                         * 'double' to ensure at least 64-bit invariant
+                         * alignment across all platforms and
+                         * configurations */
+    unsigned int nonce[4];
+    unsigned char data[POLY1305_BLOCK_SIZE];
+    size_t num;
+    struct {
+        poly1305_blocks_f blocks;
+        poly1305_emit_f emit;
+    } func;
+};
diff --git a/test/build.info b/test/build.info
index aa9b933e420972268d84ff2169504036c489414b..1c10a83c0939e0caaae98a8fa714e62a11484636 100644
--- a/test/build.info
+++ b/test/build.info
@@ -298,6 +298,20 @@ IF[{- !$disabled{tests} -}]
     INCLUDE[cipher_overhead_test]=.. ../include
     DEPEND[cipher_overhead_test]=../libcrypto ../libssl
   ENDIF
+
+  IF[{- !$disabled{poly1305} -}]
+    PROGRAMS_NO_INST=poly1305_internal_test
+  ENDIF
+
+  SOURCE[poly1305_internal_test]=poly1305_internal_test.c testutil.c
+  IF[{- !$disabled{shared} -}]
+    SOURCE[poly1305_internal_test]= ../crypto/poly1305/poly1305.c \
+        {- $target{poly1305_asm_src} ? "../crypto/poly1305/".$target{poly1305_asm_src} : "" -} \
+        {- $target{cpuid_asm_src} ? "../crypto/".$target{cpuid_asm_src} : "" -} \
+        ../crypto/cryptlib.c
+  ENDIF
+  INCLUDE[poly1305_internal_test]=.. ../include ../crypto/include
+  DEPEND[poly1305_internal_test]=../libcrypto
 ENDIF
 
 {-
diff --git a/test/poly1305_internal_test.c b/test/poly1305_internal_test.c
new file mode 100644
index 0000000000000000000000000000000000000000..e5e7457e214012dab47439010864c5bec2af6dcf
--- /dev/null
+++ b/test/poly1305_internal_test.c
@@ -0,0 +1,1701 @@
+/*
+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+/* Internal tests for the poly1305 module */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "testutil.h"
+#include "internal/poly1305.h"
+#include "../crypto/poly1305/poly1305_local.h"
+#include "e_os.h"
+
+typedef struct {
+    size_t size;
+    const unsigned char data[1024];
+} SIZED_DATA;
+
+typedef struct {
+    SIZED_DATA input;
+    SIZED_DATA key;
+    SIZED_DATA expected;
+} TESTDATA;
+
+typedef struct {
+    const char *test_case_name;
+    int test_num;
+    const TESTDATA *test_data;
+} SIMPLE_FIXTURE;
+
+/**********************************************************************
+ *
+ * Test of poly1305 internal functions
+ *
+ ***/
+
+static SIMPLE_FIXTURE setup_poly1305(const char *const test_case_name)
+{
+    SIMPLE_FIXTURE fixture;
+    fixture.test_case_name = test_case_name;
+    return fixture;
+}
+
+/* TODO : hex decoder / encoder should be implemented in testutil.c */
+static void hexdump(const unsigned char *a, size_t len)
+{
+    size_t i;
+
+    for (i = 0; i < len; i++)
+        fprintf(stderr, "%02x", a[i]);
+}
+
+static int execute_poly1305(SIMPLE_FIXTURE fixture)
+{
+    POLY1305 poly1305;
+    unsigned int i = fixture.test_num;
+    const TESTDATA *test = fixture.test_data;
+    const unsigned char *in = test->input.data;
+    size_t inlen = test->input.size;
+    const unsigned char *key = test->key.data;
+    const unsigned char *expected = test->expected.data;
+    size_t expectedlen = test->expected.size;
+    unsigned char out[16];
+
+    if (expectedlen != sizeof(out))
+        return 0;
+
+    Poly1305_Init(&poly1305, key);
+    Poly1305_Update(&poly1305, in, inlen);
+    Poly1305_Final(&poly1305, out);
+
+    if (memcmp(out, expected, expectedlen) != 0) {
+        fprintf(stderr, "Poly1305 test #%d failed.\n", i);
+        fprintf(stderr, "got:      ");
+        hexdump(out, sizeof(out));
+        fprintf(stderr, "\nexpected: ");
+        hexdump(expected, expectedlen);
+        fprintf(stderr, "\n");
+        return 0;
+    }
+
+    if (inlen > 16) {
+        Poly1305_Init(&poly1305, key);
+        Poly1305_Update(&poly1305, in, 1);
+        Poly1305_Update(&poly1305, in+1, inlen-1);
+        Poly1305_Final(&poly1305, out);
+
+        if (memcmp(out, expected, expectedlen) != 0) {
+            fprintf(stderr, "Poly1305 test #%d/1+(N-1) failed.\n", i);
+            fprintf(stderr, "got:      ");
+            hexdump(out, sizeof(out));
+            fprintf(stderr, "\nexpected: ");
+            hexdump(expected, expectedlen);
+            fprintf(stderr, "\n");
+            return 0;
+        }
+    }
+
+    if (inlen > 32) {
+        size_t half = inlen / 2;
+
+        Poly1305_Init(&poly1305, key);
+        Poly1305_Update(&poly1305, in, half);
+        Poly1305_Update(&poly1305, in+half, inlen-half);
+        Poly1305_Final(&poly1305, out);
+
+        if (memcmp(out, expected, expectedlen) != 0) {
+            fprintf(stderr, "Poly1305 test #%d/2 failed.\n", i);
+            fprintf(stderr, "got:      ");
+            hexdump(out, sizeof(out));
+            fprintf(stderr, "\nexpected: ");
+            hexdump(expected, expectedlen);
+            fprintf(stderr, "\n");
+            return 0;
+        }
+
+        for (half = 16; half < inlen; half += 16) {
+            Poly1305_Init(&poly1305, key);
+            Poly1305_Update(&poly1305, in, half);
+            Poly1305_Update(&poly1305, in+half, inlen-half);
+            Poly1305_Final(&poly1305, out);
+
+            if (memcmp(out, expected, expectedlen) != 0) {
+                fprintf(stderr, "Poly1305 test #%d/%" OSSLzu "+%" OSSLzu " failed.\n",
+                       i, half, inlen-half);
+                fprintf(stderr, "got:      ");
+                hexdump(out, sizeof(out));
+                fprintf(stderr, "\nexpected: ");
+                hexdump(expected, expectedlen);
+                fprintf(stderr, "\n");
+                return 0;
+            }
+        }
+    }
+
+    return 1;
+}
+
+static void teardown_poly1305(SIMPLE_FIXTURE fixture)
+{
+    ERR_print_errors_fp(stderr);
+}
+
+static void benchmark_poly1305()
+{
+# ifdef OPENSSL_CPUID_OBJ
+    POLY1305 poly1305;
+    unsigned char key[32];
+    unsigned char buf[8192];
+    unsigned long long stopwatch;
+    unsigned long long OPENSSL_rdtsc();
+    unsigned int i;
+
+    memset (buf,0x55,sizeof(buf));
+    memset (key,0xAA,sizeof(key));
+
+    Poly1305_Init(&poly1305, key);
+
+    for (i=0;i<100000;i++)
+        Poly1305_Update(&poly1305,buf,sizeof(buf));
+
+    stopwatch = OPENSSL_rdtsc();
+    for (i=0;i<10000;i++)
+        Poly1305_Update(&poly1305,buf,sizeof(buf));
+    stopwatch = OPENSSL_rdtsc() - stopwatch;
+
+    printf("%g\n",stopwatch/(double)(i*sizeof(buf)));
+
+    stopwatch = OPENSSL_rdtsc();
+    for (i=0;i<10000;i++) {
+        Poly1305_Init(&poly1305, key);
+        Poly1305_Update(&poly1305,buf,16);
+        Poly1305_Final(&poly1305,buf);
+    }
+    stopwatch = OPENSSL_rdtsc() - stopwatch;
+
+    printf("%g\n",stopwatch/(double)(i));
+# else
+    fprintf(stderr,
+            "Benchmarking of poly1305 isn't available on this platform\n");
+# endif
+}
+
+/**********************************************************************
+ *
+ * Test driver
+ *
+ ***/
+
+static TESTDATA tests[] = {
+    /*
+     * RFC7539
+     */
+    {
+        {
+            34,
+            {
+                0x43, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72,
+                0x61, 0x70, 0x68, 0x69, 0x63, 0x20, 0x46, 0x6f,
+                0x72, 0x75, 0x6d, 0x20, 0x52, 0x65, 0x73, 0x65,
+                0x61, 0x72, 0x63, 0x68, 0x20, 0x47, 0x72, 0x6f,
+
+                0x75, 0x70
+            }
+        },
+        {
+            32,
+            {
+                0x85, 0xd6, 0xbe, 0x78, 0x57, 0x55, 0x6d, 0x33,
+                0x7f, 0x44, 0x52, 0xfe, 0x42, 0xd5, 0x06, 0xa8,
+                0x01, 0x03, 0x80, 0x8a, 0xfb, 0x0d, 0xb2, 0xfd,
+                0x4a, 0xbf, 0xf6, 0xaf, 0x41, 0x49, 0xf5, 0x1b
+            }
+        },
+        {
+            16,
+            {
+                0xa8, 0x06, 0x1d, 0xc1, 0x30, 0x51, 0x36, 0xc6,
+                0xc2, 0x2b, 0x8b, 0xaf, 0x0c, 0x01, 0x27, 0xa9
+            }
+        }
+    },
+    /*
+     * test vectors from "The Poly1305-AES message-authentication code"
+     */
+    {
+        {
+            2,
+            {
+                0xf3, 0xf6
+            }
+        },
+        {
+            32,
+            {
+                0x85, 0x1f, 0xc4, 0x0c, 0x34, 0x67, 0xac, 0x0b,
+                0xe0, 0x5c, 0xc2, 0x04, 0x04, 0xf3, 0xf7, 0x00,
+                0x58, 0x0b, 0x3b, 0x0f, 0x94, 0x47, 0xbb, 0x1e,
+                0x69, 0xd0, 0x95, 0xb5, 0x92, 0x8b, 0x6d, 0xbc
+            }
+        },
+        {
+            16,
+            {
+                0xf4, 0xc6, 0x33, 0xc3, 0x04, 0x4f, 0xc1, 0x45,
+                0xf8, 0x4f, 0x33, 0x5c, 0xb8, 0x19, 0x53, 0xde
+            }
+        }
+    },
+    {
+        {
+            0,
+            {
+                0
+            }
+        },
+        {
+            32,
+            {
+                0xa0, 0xf3, 0x08, 0x00, 0x00, 0xf4, 0x64, 0x00,
+                0xd0, 0xc7, 0xe9, 0x07, 0x6c, 0x83, 0x44, 0x03,
+                0xdd, 0x3f, 0xab, 0x22, 0x51, 0xf1, 0x1a, 0xc7,
+                0x59, 0xf0, 0x88, 0x71, 0x29, 0xcc, 0x2e, 0xe7
+            }
+        },
+        {
+            16,
+            {
+                0xdd, 0x3f, 0xab, 0x22, 0x51, 0xf1, 0x1a, 0xc7,
+                0x59, 0xf0, 0x88, 0x71, 0x29, 0xcc, 0x2e, 0xe7
+            }
+        }
+    },
+    {
+        {
+            32,
+            {
+                0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
+                0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
+                0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
+                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36
+            }
+        },
+        {
+            32,
+            {
+                0x48, 0x44, 0x3d, 0x0b, 0xb0, 0xd2, 0x11, 0x09,
+                0xc8, 0x9a, 0x10, 0x0b, 0x5c, 0xe2, 0xc2, 0x08,
+                0x83, 0x14, 0x9c, 0x69, 0xb5, 0x61, 0xdd, 0x88,
+                0x29, 0x8a, 0x17, 0x98, 0xb1, 0x07, 0x16, 0xef
+            }
+        },
+        {
+            16,
+            {
+                0x0e, 0xe1, 0xc1, 0x6b, 0xb7, 0x3f, 0x0f, 0x4f,
+                0xd1, 0x98, 0x81, 0x75, 0x3c, 0x01, 0xcd, 0xbe
+            }
+        }
+    },
+    {
+        {
+            63,
+            {
+                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+                0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
+                0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
+                0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
+
+                0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
+                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67,
+                0xfa, 0x83, 0xe1, 0x58, 0xc9, 0x94, 0xd9, 0x61,
+                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9
+            }
+        },
+        {
+            32,
+            {
+                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
+                0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
+            }
+        },
+        {
+            16,
+            {
+                0x51, 0x54, 0xad, 0x0d, 0x2c, 0xb2, 0x6e, 0x01,
+                0x27, 0x4f, 0xc5, 0x11, 0x48, 0x49, 0x1f, 0x1b
+            }
+        },
+    },
+    /*
+     * self-generated vectors exercise "significant" lengths, such that
+     * are handled by different code paths
+     */
+    {
+        {
+            64,
+            {
+                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+                0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
+                0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
+                0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
+
+                0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
+                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67,
+                0xfa, 0x83, 0xe1, 0x58, 0xc9, 0x94, 0xd9, 0x61,
+                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9, 0xaf
+            }
+        },
+        {
+            32,
+            {
+                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
+                0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
+            }
+        },
+        {
+            16,
+            {
+                0x81, 0x20, 0x59, 0xa5, 0xda, 0x19, 0x86, 0x37,
+                0xca, 0xc7, 0xc4, 0xa6, 0x31, 0xbe, 0xe4, 0x66
+            }
+        },
+    },
+    {
+        {
+            48,
+            {
+                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+                0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
+                0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
+                0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
+
+                0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
+                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67
+            }
+        },
+        {
+            32,
+            {
+                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
+                0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
+
+            }
+        },
+        {
+            16,
+            {
+                0x5b, 0x88, 0xd7, 0xf6, 0x22, 0x8b, 0x11, 0xe2,
+                0xe2, 0x85, 0x79, 0xa5, 0xc0, 0xc1, 0xf7, 0x61
+            }
+        },
+    },
+    {
+        {
+            96,
+            {
+                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+                0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
+                0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
+                0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
+
+                0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
+                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67,
+                0xfa, 0x83, 0xe1, 0x58, 0xc9, 0x94, 0xd9, 0x61,
+                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9, 0xaf,
+
+                0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
+                0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
+                0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
+                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36
+            }
+        },
+        {
+            32,
+            {
+                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
+                0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
+            }
+        },
+        {
+            16,
+            {
+                0xbb, 0xb6, 0x13, 0xb2, 0xb6, 0xd7, 0x53, 0xba,
+                0x07, 0x39, 0x5b, 0x91, 0x6a, 0xae, 0xce, 0x15
+            }
+        },
+    },
+    {
+        {
+            112,
+            {
+                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+                0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
+                0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
+                0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
+
+                0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
+                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67,
+                0xfa, 0x83, 0xe1, 0x58, 0xc9, 0x94, 0xd9, 0x61,
+                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9, 0xaf,
+
+                0x48, 0x44, 0x3d, 0x0b, 0xb0, 0xd2, 0x11, 0x09,
+                0xc8, 0x9a, 0x10, 0x0b, 0x5c, 0xe2, 0xc2, 0x08,
+                0x83, 0x14, 0x9c, 0x69, 0xb5, 0x61, 0xdd, 0x88,
+                0x29, 0x8a, 0x17, 0x98, 0xb1, 0x07, 0x16, 0xef,
+
+                0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
+                0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24
+            }
+        },
+        {
+            32,
+            {
+                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
+                0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
+            }
+        },
+        {
+            16,
+            {
+                0xc7, 0x94, 0xd7, 0x05, 0x7d, 0x17, 0x78, 0xc4,
+                0xbb, 0xee, 0x0a, 0x39, 0xb3, 0xd9, 0x73, 0x42
+            }
+        },
+    },
+    {
+        {
+            128,
+            {
+                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+                0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
+                0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
+                0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
+
+                0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
+                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67,
+                0xfa, 0x83, 0xe1, 0x58, 0xc9, 0x94, 0xd9, 0x61,
+                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9, 0xaf,
+
+                0x48, 0x44, 0x3d, 0x0b, 0xb0, 0xd2, 0x11, 0x09,
+                0xc8, 0x9a, 0x10, 0x0b, 0x5c, 0xe2, 0xc2, 0x08,
+                0x83, 0x14, 0x9c, 0x69, 0xb5, 0x61, 0xdd, 0x88,
+                0x29, 0x8a, 0x17, 0x98, 0xb1, 0x07, 0x16, 0xef,
+
+                0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
+                0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
+                0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
+                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36
+            }
+        },
+        {
+            32,
+            {
+                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
+                0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
+            }
+        },
+        {
+            16,
+            {
+                0xff, 0xbc, 0xb9, 0xb3, 0x71, 0x42, 0x31, 0x52,
+                0xd7, 0xfc, 0xa5, 0xad, 0x04, 0x2f, 0xba, 0xa9
+            }
+        },
+    },
+    {
+        {
+            144,
+            {
+                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+                0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
+                0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
+                0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
+
+                0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
+                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67,
+                0xfa, 0x83, 0xe1, 0x58, 0xc9, 0x94, 0xd9, 0x61,
+                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9, 0xaf,
+
+                0x48, 0x44, 0x3d, 0x0b, 0xb0, 0xd2, 0x11, 0x09,
+                0xc8, 0x9a, 0x10, 0x0b, 0x5c, 0xe2, 0xc2, 0x08,
+                0x83, 0x14, 0x9c, 0x69, 0xb5, 0x61, 0xdd, 0x88,
+                0x29, 0x8a, 0x17, 0x98, 0xb1, 0x07, 0x16, 0xef,
+
+                0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
+                0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
+                0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
+                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36,
+
+                0x81, 0x20, 0x59, 0xa5, 0xda, 0x19, 0x86, 0x37,
+                0xca, 0xc7, 0xc4, 0xa6, 0x31, 0xbe, 0xe4, 0x66
+            }
+        },
+        {
+            32,
+            {
+                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
+                0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
+            }
+        },
+        {
+            16,
+            {
+                0x06, 0x9e, 0xd6, 0xb8, 0xef, 0x0f, 0x20, 0x7b,
+                0x3e, 0x24, 0x3b, 0xb1, 0x01, 0x9f, 0xe6, 0x32
+            }
+        },
+    },
+    {
+        {
+            160,
+            {
+                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+                0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
+                0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
+                0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
+
+                0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
+                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67,
+                0xfa, 0x83, 0xe1, 0x58, 0xc9, 0x94, 0xd9, 0x61,
+                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9, 0xaf,
+
+                0x48, 0x44, 0x3d, 0x0b, 0xb0, 0xd2, 0x11, 0x09,
+                0xc8, 0x9a, 0x10, 0x0b, 0x5c, 0xe2, 0xc2, 0x08,
+                0x83, 0x14, 0x9c, 0x69, 0xb5, 0x61, 0xdd, 0x88,
+                0x29, 0x8a, 0x17, 0x98, 0xb1, 0x07, 0x16, 0xef,
+
+                0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
+                0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
+                0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
+                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36,
+
+                0x81, 0x20, 0x59, 0xa5, 0xda, 0x19, 0x86, 0x37,
+                0xca, 0xc7, 0xc4, 0xa6, 0x31, 0xbe, 0xe4, 0x66,
+                0x5b, 0x88, 0xd7, 0xf6, 0x22, 0x8b, 0x11, 0xe2,
+                0xe2, 0x85, 0x79, 0xa5, 0xc0, 0xc1, 0xf7, 0x61
+            }
+        },
+        {
+            32,
+            {
+                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
+                0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
+            }
+        },
+        {
+            16,
+            {
+                0xcc, 0xa3, 0x39, 0xd9, 0xa4, 0x5f, 0xa2, 0x36,
+                0x8c, 0x2c, 0x68, 0xb3, 0xa4, 0x17, 0x91, 0x33
+            }
+        },
+    },
+    {
+        {
+            288,
+            {
+                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+                0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
+                0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
+                0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
+
+                0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
+                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67,
+                0xfa, 0x83, 0xe1, 0x58, 0xc9, 0x94, 0xd9, 0x61,
+                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9, 0xaf,
+
+                0x48, 0x44, 0x3d, 0x0b, 0xb0, 0xd2, 0x11, 0x09,
+                0xc8, 0x9a, 0x10, 0x0b, 0x5c, 0xe2, 0xc2, 0x08,
+                0x83, 0x14, 0x9c, 0x69, 0xb5, 0x61, 0xdd, 0x88,
+                0x29, 0x8a, 0x17, 0x98, 0xb1, 0x07, 0x16, 0xef,
+
+                0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
+                0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
+                0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
+                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36,
+
+                0x81, 0x20, 0x59, 0xa5, 0xda, 0x19, 0x86, 0x37,
+                0xca, 0xc7, 0xc4, 0xa6, 0x31, 0xbe, 0xe4, 0x66,
+                0x5b, 0x88, 0xd7, 0xf6, 0x22, 0x8b, 0x11, 0xe2,
+                0xe2, 0x85, 0x79, 0xa5, 0xc0, 0xc1, 0xf7, 0x61,
+
+                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+                0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
+                0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
+                0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
+
+                0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
+                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67,
+                0xfa, 0x83, 0xe1, 0x58, 0xc9, 0x94, 0xd9, 0x61,
+                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9, 0xaf,
+
+                0x48, 0x44, 0x3d, 0x0b, 0xb0, 0xd2, 0x11, 0x09,
+                0xc8, 0x9a, 0x10, 0x0b, 0x5c, 0xe2, 0xc2, 0x08,
+                0x83, 0x14, 0x9c, 0x69, 0xb5, 0x61, 0xdd, 0x88,
+                0x29, 0x8a, 0x17, 0x98, 0xb1, 0x07, 0x16, 0xef,
+
+                0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
+                0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
+                0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
+                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36
+            }
+        },
+        {
+            32,
+            {
+                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
+                0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
+            }
+        },
+        {
+            16,
+            {
+                0x53, 0xf6, 0xe8, 0x28, 0xa2, 0xf0, 0xfe, 0x0e,
+                0xe8, 0x15, 0xbf, 0x0b, 0xd5, 0x84, 0x1a, 0x34
+            }
+        },
+    },
+    {
+        {
+            320,
+            {
+                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+                0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
+                0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
+                0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
+
+                0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
+                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67,
+                0xfa, 0x83, 0xe1, 0x58, 0xc9, 0x94, 0xd9, 0x61,
+                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9, 0xaf,
+
+                0x48, 0x44, 0x3d, 0x0b, 0xb0, 0xd2, 0x11, 0x09,
+                0xc8, 0x9a, 0x10, 0x0b, 0x5c, 0xe2, 0xc2, 0x08,
+                0x83, 0x14, 0x9c, 0x69, 0xb5, 0x61, 0xdd, 0x88,
+                0x29, 0x8a, 0x17, 0x98, 0xb1, 0x07, 0x16, 0xef,
+
+                0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
+                0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
+                0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
+                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36,
+
+                0x81, 0x20, 0x59, 0xa5, 0xda, 0x19, 0x86, 0x37,
+                0xca, 0xc7, 0xc4, 0xa6, 0x31, 0xbe, 0xe4, 0x66,
+                0x5b, 0x88, 0xd7, 0xf6, 0x22, 0x8b, 0x11, 0xe2,
+                0xe2, 0x85, 0x79, 0xa5, 0xc0, 0xc1, 0xf7, 0x61,
+
+                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+                0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
+                0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
+                0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
+
+                0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
+                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67,
+                0xfa, 0x83, 0xe1, 0x58, 0xc9, 0x94, 0xd9, 0x61,
+                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9, 0xaf,
+
+                0x48, 0x44, 0x3d, 0x0b, 0xb0, 0xd2, 0x11, 0x09,
+                0xc8, 0x9a, 0x10, 0x0b, 0x5c, 0xe2, 0xc2, 0x08,
+                0x83, 0x14, 0x9c, 0x69, 0xb5, 0x61, 0xdd, 0x88,
+                0x29, 0x8a, 0x17, 0x98, 0xb1, 0x07, 0x16, 0xef,
+
+                0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
+                0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
+                0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
+                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36,
+
+                0x81, 0x20, 0x59, 0xa5, 0xda, 0x19, 0x86, 0x37,
+                0xca, 0xc7, 0xc4, 0xa6, 0x31, 0xbe, 0xe4, 0x66,
+                0x5b, 0x88, 0xd7, 0xf6, 0x22, 0x8b, 0x11, 0xe2,
+                0xe2, 0x85, 0x79, 0xa5, 0xc0, 0xc1, 0xf7, 0x61
+            }
+        },
+        {
+            32,
+            {
+                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
+                0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
+            }
+        },
+        {
+            16,
+            {
+                0xb8, 0x46, 0xd4, 0x4e, 0x9b, 0xbd, 0x53, 0xce,
+                0xdf, 0xfb, 0xfb, 0xb6, 0xb7, 0xfa, 0x49, 0x33
+            }
+        },
+    },
+    /*
+     * 4th power of the key spills to 131th bit in SIMD key setup
+     */
+    {
+        {
+            256,
+            {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            }
+        },
+        {
+            32,
+            {
+                0xad, 0x62, 0x81, 0x07, 0xe8, 0x35, 0x1d, 0x0f,
+                0x2c, 0x23, 0x1a, 0x05, 0xdc, 0x4a, 0x41, 0x06,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+        {
+            16,
+            {
+                0x07, 0x14, 0x5a, 0x4c, 0x02, 0xfe, 0x5f, 0xa3,
+                0x20, 0x36, 0xde, 0x68, 0xfa, 0xbe, 0x90, 0x66
+            }
+        },
+    },
+    /*
+     * poly1305_ieee754.c failed this in final stage
+     */
+    {
+        {
+            252,
+            {
+                0x84, 0x23, 0x64, 0xe1, 0x56, 0x33, 0x6c, 0x09,
+                0x98, 0xb9, 0x33, 0xa6, 0x23, 0x77, 0x26, 0x18,
+                0x0d, 0x9e, 0x3f, 0xdc, 0xbd, 0xe4, 0xcd, 0x5d,
+                0x17, 0x08, 0x0f, 0xc3, 0xbe, 0xb4, 0x96, 0x14,
+
+                0xd7, 0x12, 0x2c, 0x03, 0x74, 0x63, 0xff, 0x10,
+                0x4d, 0x73, 0xf1, 0x9c, 0x12, 0x70, 0x46, 0x28,
+                0xd4, 0x17, 0xc4, 0xc5, 0x4a, 0x3f, 0xe3, 0x0d,
+                0x3c, 0x3d, 0x77, 0x14, 0x38, 0x2d, 0x43, 0xb0,
+
+                0x38, 0x2a, 0x50, 0xa5, 0xde, 0xe5, 0x4b, 0xe8,
+                0x44, 0xb0, 0x76, 0xe8, 0xdf, 0x88, 0x20, 0x1a,
+                0x1c, 0xd4, 0x3b, 0x90, 0xeb, 0x21, 0x64, 0x3f,
+                0xa9, 0x6f, 0x39, 0xb5, 0x18, 0xaa, 0x83, 0x40,
+
+                0xc9, 0x42, 0xff, 0x3c, 0x31, 0xba, 0xf7, 0xc9,
+                0xbd, 0xbf, 0x0f, 0x31, 0xae, 0x3f, 0xa0, 0x96,
+                0xbf, 0x8c, 0x63, 0x03, 0x06, 0x09, 0x82, 0x9f,
+                0xe7, 0x2e, 0x17, 0x98, 0x24, 0x89, 0x0b, 0xc8,
+
+                0xe0, 0x8c, 0x31, 0x5c, 0x1c, 0xce, 0x2a, 0x83,
+                0x14, 0x4d, 0xbb, 0xff, 0x09, 0xf7, 0x4e, 0x3e,
+                0xfc, 0x77, 0x0b, 0x54, 0xd0, 0x98, 0x4a, 0x8f,
+                0x19, 0xb1, 0x47, 0x19, 0xe6, 0x36, 0x35, 0x64,
+
+                0x1d, 0x6b, 0x1e, 0xed, 0xf6, 0x3e, 0xfb, 0xf0,
+                0x80, 0xe1, 0x78, 0x3d, 0x32, 0x44, 0x54, 0x12,
+                0x11, 0x4c, 0x20, 0xde, 0x0b, 0x83, 0x7a, 0x0d,
+                0xfa, 0x33, 0xd6, 0xb8, 0x28, 0x25, 0xff, 0xf4,
+
+                0x4c, 0x9a, 0x70, 0xea, 0x54, 0xce, 0x47, 0xf0,
+                0x7d, 0xf6, 0x98, 0xe6, 0xb0, 0x33, 0x23, 0xb5,
+                0x30, 0x79, 0x36, 0x4a, 0x5f, 0xc3, 0xe9, 0xdd,
+                0x03, 0x43, 0x92, 0xbd, 0xde, 0x86, 0xdc, 0xcd,
+
+                0xda, 0x94, 0x32, 0x1c, 0x5e, 0x44, 0x06, 0x04,
+                0x89, 0x33, 0x6c, 0xb6, 0x5b, 0xf3, 0x98, 0x9c,
+                0x36, 0xf7, 0x28, 0x2c, 0x2f, 0x5d, 0x2b, 0x88,
+                0x2c, 0x17, 0x1e, 0x74
+            }
+        },
+        {
+            32,
+            {
+                0x95, 0xd5, 0xc0, 0x05, 0x50, 0x3e, 0x51, 0x0d,
+                0x8c, 0xd0, 0xaa, 0x07, 0x2c, 0x4a, 0x4d, 0x06,
+                0x6e, 0xab, 0xc5, 0x2d, 0x11, 0x65, 0x3d, 0xf4,
+                0x7f, 0xbf, 0x63, 0xab, 0x19, 0x8b, 0xcc, 0x26
+            }
+        },
+        {
+            16,
+            {
+                0xf2, 0x48, 0x31, 0x2e, 0x57, 0x8d, 0x9d, 0x58,
+                0xf8, 0xb7, 0xbb, 0x4d, 0x19, 0x10, 0x54, 0x31
+            }
+        },
+    },
+    /*
+     * AVX2 in poly1305-x86.pl failed this with 176+32 split
+     */
+    {
+        {
+            208,
+            {
+                0x24, 0x8a, 0xc3, 0x10, 0x85, 0xb6, 0xc2, 0xad,
+                0xaa, 0xa3, 0x82, 0x59, 0xa0, 0xd7, 0x19, 0x2c,
+                0x5c, 0x35, 0xd1, 0xbb, 0x4e, 0xf3, 0x9a, 0xd9,
+                0x4c, 0x38, 0xd1, 0xc8, 0x24, 0x79, 0xe2, 0xdd,
+
+                0x21, 0x59, 0xa0, 0x77, 0x02, 0x4b, 0x05, 0x89,
+                0xbc, 0x8a, 0x20, 0x10, 0x1b, 0x50, 0x6f, 0x0a,
+                0x1a, 0xd0, 0xbb, 0xab, 0x76, 0xe8, 0x3a, 0x83,
+                0xf1, 0xb9, 0x4b, 0xe6, 0xbe, 0xae, 0x74, 0xe8,
+
+                0x74, 0xca, 0xb6, 0x92, 0xc5, 0x96, 0x3a, 0x75,
+                0x43, 0x6b, 0x77, 0x61, 0x21, 0xec, 0x9f, 0x62,
+                0x39, 0x9a, 0x3e, 0x66, 0xb2, 0xd2, 0x27, 0x07,
+                0xda, 0xe8, 0x19, 0x33, 0xb6, 0x27, 0x7f, 0x3c,
+
+                0x85, 0x16, 0xbc, 0xbe, 0x26, 0xdb, 0xbd, 0x86,
+                0xf3, 0x73, 0x10, 0x3d, 0x7c, 0xf4, 0xca, 0xd1,
+                0x88, 0x8c, 0x95, 0x21, 0x18, 0xfb, 0xfb, 0xd0,
+                0xd7, 0xb4, 0xbe, 0xdc, 0x4a, 0xe4, 0x93, 0x6a,
+
+                0xff, 0x91, 0x15, 0x7e, 0x7a, 0xa4, 0x7c, 0x54,
+                0x44, 0x2e, 0xa7, 0x8d, 0x6a, 0xc2, 0x51, 0xd3,
+                0x24, 0xa0, 0xfb, 0xe4, 0x9d, 0x89, 0xcc, 0x35,
+                0x21, 0xb6, 0x6d, 0x16, 0xe9, 0xc6, 0x6a, 0x37,
+
+                0x09, 0x89, 0x4e, 0x4e, 0xb0, 0xa4, 0xee, 0xdc,
+                0x4a, 0xe1, 0x94, 0x68, 0xe6, 0x6b, 0x81, 0xf2,
+
+                0x71, 0x35, 0x1b, 0x1d, 0x92, 0x1e, 0xa5, 0x51,
+                0x04, 0x7a, 0xbc, 0xc6, 0xb8, 0x7a, 0x90, 0x1f,
+                0xde, 0x7d, 0xb7, 0x9f, 0xa1, 0x81, 0x8c, 0x11,
+                0x33, 0x6d, 0xbc, 0x07, 0x24, 0x4a, 0x40, 0xeb
+            }
+        },
+        {
+            32,
+            {
+                0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+        {
+            16,
+            {
+                0xbc, 0x93, 0x9b, 0xc5, 0x28, 0x14, 0x80, 0xfa,
+                0x99, 0xc6, 0xd6, 0x8c, 0x25, 0x8e, 0xc4, 0x2f
+            }
+        },
+    },
+    /*
+     * test vectors from Google
+     */
+    {
+        {
+            0,
+            {
+                0x00,
+            }
+        },
+        {
+            32,
+            {
+                0xc8, 0xaf, 0xaa, 0xc3, 0x31, 0xee, 0x37, 0x2c,
+                0xd6, 0x08, 0x2d, 0xe1, 0x34, 0x94, 0x3b, 0x17,
+                0x47, 0x10, 0x13, 0x0e, 0x9f, 0x6f, 0xea, 0x8d,
+                0x72, 0x29, 0x38, 0x50, 0xa6, 0x67, 0xd8, 0x6c
+            }
+        },
+        {
+            16,
+            {
+                0x47, 0x10, 0x13, 0x0e, 0x9f, 0x6f, 0xea, 0x8d,
+                0x72, 0x29, 0x38, 0x50, 0xa6, 0x67, 0xd8, 0x6c
+            }
+        },
+    },
+    {
+        {
+            12,
+            {
+                0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f,
+                0x72, 0x6c, 0x64, 0x21
+            }
+        },
+        {
+            32,
+            {
+                0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20,
+                0x33, 0x32, 0x2d, 0x62, 0x79, 0x74, 0x65, 0x20,
+                0x6b, 0x65, 0x79, 0x20, 0x66, 0x6f, 0x72, 0x20,
+                0x50, 0x6f, 0x6c, 0x79, 0x31, 0x33, 0x30, 0x35
+            }
+        },
+        {
+            16,
+            {
+                0xa6, 0xf7, 0x45, 0x00, 0x8f, 0x81, 0xc9, 0x16,
+                0xa2, 0x0d, 0xcc, 0x74, 0xee, 0xf2, 0xb2, 0xf0
+            }
+        },
+    },
+    {
+        {
+            32,
+            {
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+        {
+            32,
+            {
+                0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20,
+                0x33, 0x32, 0x2d, 0x62, 0x79, 0x74, 0x65, 0x20,
+                0x6b, 0x65, 0x79, 0x20, 0x66, 0x6f, 0x72, 0x20,
+                0x50, 0x6f, 0x6c, 0x79, 0x31, 0x33, 0x30, 0x35
+            }
+        },
+        {
+            16,
+            {
+                0x49, 0xec, 0x78, 0x09, 0x0e, 0x48, 0x1e, 0xc6,
+                0xc2, 0x6b, 0x33, 0xb9, 0x1c, 0xcc, 0x03, 0x07
+            }
+        },
+    },
+    {
+        {
+            128,
+            {
+                0x89, 0xda, 0xb8, 0x0b, 0x77, 0x17, 0xc1, 0xdb,
+                0x5d, 0xb4, 0x37, 0x86, 0x0a, 0x3f, 0x70, 0x21,
+                0x8e, 0x93, 0xe1, 0xb8, 0xf4, 0x61, 0xfb, 0x67,
+                0x7f, 0x16, 0xf3, 0x5f, 0x6f, 0x87, 0xe2, 0xa9,
+
+                0x1c, 0x99, 0xbc, 0x3a, 0x47, 0xac, 0xe4, 0x76,
+                0x40, 0xcc, 0x95, 0xc3, 0x45, 0xbe, 0x5e, 0xcc,
+                0xa5, 0xa3, 0x52, 0x3c, 0x35, 0xcc, 0x01, 0x89,
+                0x3a, 0xf0, 0xb6, 0x4a, 0x62, 0x03, 0x34, 0x27,
+
+                0x03, 0x72, 0xec, 0x12, 0x48, 0x2d, 0x1b, 0x1e,
+                0x36, 0x35, 0x61, 0x69, 0x8a, 0x57, 0x8b, 0x35,
+                0x98, 0x03, 0x49, 0x5b, 0xb4, 0xe2, 0xef, 0x19,
+                0x30, 0xb1, 0x7a, 0x51, 0x90, 0xb5, 0x80, 0xf1,
+
+                0x41, 0x30, 0x0d, 0xf3, 0x0a, 0xdb, 0xec, 0xa2,
+                0x8f, 0x64, 0x27, 0xa8, 0xbc, 0x1a, 0x99, 0x9f,
+                0xd5, 0x1c, 0x55, 0x4a, 0x01, 0x7d, 0x09, 0x5d,
+                0x8c, 0x3e, 0x31, 0x27, 0xda, 0xf9, 0xf5, 0x95
+            }
+        },
+        {
+            32,
+            {
+                0x2d, 0x77, 0x3b, 0xe3, 0x7a, 0xdb, 0x1e, 0x4d,
+                0x68, 0x3b, 0xf0, 0x07, 0x5e, 0x79, 0xc4, 0xee,
+                0x03, 0x79, 0x18, 0x53, 0x5a, 0x7f, 0x99, 0xcc,
+                0xb7, 0x04, 0x0f, 0xb5, 0xf5, 0xf4, 0x3a, 0xea
+            }
+        },
+        {
+            16,
+            {
+                0xc8, 0x5d, 0x15, 0xed, 0x44, 0xc3, 0x78, 0xd6,
+                0xb0, 0x0e, 0x23, 0x06, 0x4c, 0x7b, 0xcd, 0x51
+            }
+        },
+    },
+    {
+        {
+            528,
+            {
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b,
+                0x17, 0x03, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00,
+
+                0x06, 0xdb, 0x1f, 0x1f, 0x36, 0x8d, 0x69, 0x6a,
+                0x81, 0x0a, 0x34, 0x9c, 0x0c, 0x71, 0x4c, 0x9a,
+                0x5e, 0x78, 0x50, 0xc2, 0x40, 0x7d, 0x72, 0x1a,
+                0xcd, 0xed, 0x95, 0xe0, 0x18, 0xd7, 0xa8, 0x52,
+
+                0x66, 0xa6, 0xe1, 0x28, 0x9c, 0xdb, 0x4a, 0xeb,
+                0x18, 0xda, 0x5a, 0xc8, 0xa2, 0xb0, 0x02, 0x6d,
+                0x24, 0xa5, 0x9a, 0xd4, 0x85, 0x22, 0x7f, 0x3e,
+                0xae, 0xdb, 0xb2, 0xe7, 0xe3, 0x5e, 0x1c, 0x66,
+
+                0xcd, 0x60, 0xf9, 0xab, 0xf7, 0x16, 0xdc, 0xc9,
+                0xac, 0x42, 0x68, 0x2d, 0xd7, 0xda, 0xb2, 0x87,
+                0xa7, 0x02, 0x4c, 0x4e, 0xef, 0xc3, 0x21, 0xcc,
+                0x05, 0x74, 0xe1, 0x67, 0x93, 0xe3, 0x7c, 0xec,
+
+                0x03, 0xc5, 0xbd, 0xa4, 0x2b, 0x54, 0xc1, 0x14,
+                0xa8, 0x0b, 0x57, 0xaf, 0x26, 0x41, 0x6c, 0x7b,
+                0xe7, 0x42, 0x00, 0x5e, 0x20, 0x85, 0x5c, 0x73,
+                0xe2, 0x1d, 0xc8, 0xe2, 0xed, 0xc9, 0xd4, 0x35,
+
+                0xcb, 0x6f, 0x60, 0x59, 0x28, 0x00, 0x11, 0xc2,
+                0x70, 0xb7, 0x15, 0x70, 0x05, 0x1c, 0x1c, 0x9b,
+                0x30, 0x52, 0x12, 0x66, 0x20, 0xbc, 0x1e, 0x27,
+                0x30, 0xfa, 0x06, 0x6c, 0x7a, 0x50, 0x9d, 0x53,
+
+                0xc6, 0x0e, 0x5a, 0xe1, 0xb4, 0x0a, 0xa6, 0xe3,
+                0x9e, 0x49, 0x66, 0x92, 0x28, 0xc9, 0x0e, 0xec,
+                0xb4, 0xa5, 0x0d, 0xb3, 0x2a, 0x50, 0xbc, 0x49,
+                0xe9, 0x0b, 0x4f, 0x4b, 0x35, 0x9a, 0x1d, 0xfd,
+
+                0x11, 0x74, 0x9c, 0xd3, 0x86, 0x7f, 0xcf, 0x2f,
+                0xb7, 0xbb, 0x6c, 0xd4, 0x73, 0x8f, 0x6a, 0x4a,
+                0xd6, 0xf7, 0xca, 0x50, 0x58, 0xf7, 0x61, 0x88,
+                0x45, 0xaf, 0x9f, 0x02, 0x0f, 0x6c, 0x3b, 0x96,
+
+                0x7b, 0x8f, 0x4c, 0xd4, 0xa9, 0x1e, 0x28, 0x13,
+                0xb5, 0x07, 0xae, 0x66, 0xf2, 0xd3, 0x5c, 0x18,
+                0x28, 0x4f, 0x72, 0x92, 0x18, 0x60, 0x62, 0xe1,
+                0x0f, 0xd5, 0x51, 0x0d, 0x18, 0x77, 0x53, 0x51,
+
+                0xef, 0x33, 0x4e, 0x76, 0x34, 0xab, 0x47, 0x43,
+                0xf5, 0xb6, 0x8f, 0x49, 0xad, 0xca, 0xb3, 0x84,
+                0xd3, 0xfd, 0x75, 0xf7, 0x39, 0x0f, 0x40, 0x06,
+                0xef, 0x2a, 0x29, 0x5c, 0x8c, 0x7a, 0x07, 0x6a,
+
+                0xd5, 0x45, 0x46, 0xcd, 0x25, 0xd2, 0x10, 0x7f,
+                0xbe, 0x14, 0x36, 0xc8, 0x40, 0x92, 0x4a, 0xae,
+                0xbe, 0x5b, 0x37, 0x08, 0x93, 0xcd, 0x63, 0xd1,
+                0x32, 0x5b, 0x86, 0x16, 0xfc, 0x48, 0x10, 0x88,
+
+                0x6b, 0xc1, 0x52, 0xc5, 0x32, 0x21, 0xb6, 0xdf,
+                0x37, 0x31, 0x19, 0x39, 0x32, 0x55, 0xee, 0x72,
+                0xbc, 0xaa, 0x88, 0x01, 0x74, 0xf1, 0x71, 0x7f,
+                0x91, 0x84, 0xfa, 0x91, 0x64, 0x6f, 0x17, 0xa2,
+
+                0x4a, 0xc5, 0x5d, 0x16, 0xbf, 0xdd, 0xca, 0x95,
+                0x81, 0xa9, 0x2e, 0xda, 0x47, 0x92, 0x01, 0xf0,
+                0xed, 0xbf, 0x63, 0x36, 0x00, 0xd6, 0x06, 0x6d,
+                0x1a, 0xb3, 0x6d, 0x5d, 0x24, 0x15, 0xd7, 0x13,
+
+                0x51, 0xbb, 0xcd, 0x60, 0x8a, 0x25, 0x10, 0x8d,
+                0x25, 0x64, 0x19, 0x92, 0xc1, 0xf2, 0x6c, 0x53,
+                0x1c, 0xf9, 0xf9, 0x02, 0x03, 0xbc, 0x4c, 0xc1,
+                0x9f, 0x59, 0x27, 0xd8, 0x34, 0xb0, 0xa4, 0x71,
+
+                0x16, 0xd3, 0x88, 0x4b, 0xbb, 0x16, 0x4b, 0x8e,
+                0xc8, 0x83, 0xd1, 0xac, 0x83, 0x2e, 0x56, 0xb3,
+                0x91, 0x8a, 0x98, 0x60, 0x1a, 0x08, 0xd1, 0x71,
+                0x88, 0x15, 0x41, 0xd5, 0x94, 0xdb, 0x39, 0x9c,
+
+                0x6a, 0xe6, 0x15, 0x12, 0x21, 0x74, 0x5a, 0xec,
+                0x81, 0x4c, 0x45, 0xb0, 0xb0, 0x5b, 0x56, 0x54,
+                0x36, 0xfd, 0x6f, 0x13, 0x7a, 0xa1, 0x0a, 0x0c,
+                0x0b, 0x64, 0x37, 0x61, 0xdb, 0xd6, 0xf9, 0xa9,
+
+                0xdc, 0xb9, 0x9b, 0x1a, 0x6e, 0x69, 0x08, 0x54,
+                0xce, 0x07, 0x69, 0xcd, 0xe3, 0x97, 0x61, 0xd8,
+                0x2f, 0xcd, 0xec, 0x15, 0xf0, 0xd9, 0x2d, 0x7d,
+                0x8e, 0x94, 0xad, 0xe8, 0xeb, 0x83, 0xfb, 0xe0
+            }
+        },
+        {
+            32,
+            {
+                0x99, 0xe5, 0x82, 0x2d, 0xd4, 0x17, 0x3c, 0x99,
+                0x5e, 0x3d, 0xae, 0x0d, 0xde, 0xfb, 0x97, 0x74,
+                0x3f, 0xde, 0x3b, 0x08, 0x01, 0x34, 0xb3, 0x9f,
+                0x76, 0xe9, 0xbf, 0x8d, 0x0e, 0x88, 0xd5, 0x46
+            }
+        },
+        {
+            16,
+            {
+                0x26, 0x37, 0x40, 0x8f, 0xe1, 0x30, 0x86, 0xea,
+                0x73, 0xf9, 0x71, 0xe3, 0x42, 0x5e, 0x28, 0x20
+            }
+        },
+    },
+    /*
+     * test vectors from Hanno Böck
+     */
+    {
+        {
+            257,
+            {
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+                0xcc, 0x80, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xce, 0xcc, 0xcc, 0xcc,
+
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xc5,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xe3, 0xcc, 0xcc,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+
+                0xcc, 0xcc, 0xcc, 0xcc, 0xac, 0xcc, 0xcc, 0xcc,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xe6,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x00,
+                0xaf, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+
+                0xcc, 0xcc, 0xff, 0xff, 0xff, 0xf5, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+                0x00, 0xff, 0xff, 0xff, 0xe7, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x71, 0x92, 0x05, 0xa8, 0x52, 0x1d,
+
+                0xfc
+            }
+        },
+        {
+            32,
+            {
+                0x7f, 0x1b, 0x02, 0x64, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc
+            }
+        },
+        {
+            16,
+            {
+                0x85, 0x59, 0xb8, 0x76, 0xec, 0xee, 0xd6, 0x6e,
+                0xb3, 0x77, 0x98, 0xc0, 0x45, 0x7b, 0xaf, 0xf9
+            }
+        },
+    },
+    {
+        {
+            39,
+            {
+                0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+                0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+                0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+                0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+                0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x64
+            }
+        },
+        {
+            32,
+            {
+                0xe0, 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+                0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
+            }
+        },
+        {
+            16,
+            {
+                0x00, 0xbd, 0x12, 0x58, 0x97, 0x8e, 0x20, 0x54,
+                0x44, 0xc9, 0xaa, 0xaa, 0x82, 0x00, 0x6f, 0xed
+            }
+        },
+    },
+    {
+        {
+            2,
+            {
+                0x02, 0xfc
+            }
+        },
+        {
+            32,
+            {
+                0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+                0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+                0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+                0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c
+            }
+        },
+        {
+            16,
+            {
+                0x06, 0x12, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+                0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c
+            }
+        },
+    },
+    {
+        {
+            415,
+            {
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7a, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+
+                0x7b, 0x7b, 0x5c, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x6e, 0x7b, 0x00, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7a, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x5c,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+
+                0x7b, 0x6e, 0x7b, 0x00, 0x13, 0x00, 0x00, 0x00,
+                0x00, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+                0xf2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x20, 0x00, 0xef, 0xff, 0x00,
+                0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
+                0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x64, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00,
+
+                0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x20, 0x00, 0xef, 0xff, 0x00, 0x09,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x7a, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+
+                0x00, 0x09, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc
+            }
+        },
+        {
+            32,
+            {
+                0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b, 0x7b
+            }
+        },
+        {
+            16,
+            {
+                0x33, 0x20, 0x5b, 0xbf, 0x9e, 0x9f, 0x8f, 0x72,
+                0x12, 0xab, 0x9e, 0x2a, 0xb9, 0xb7, 0xe4, 0xa5
+            }
+        },
+    },
+    {
+        {
+            118,
+            {
+                0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
+                0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
+                0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
+                0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
+
+                0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
+                0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
+                0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
+                0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
+
+                0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
+                0x77, 0x77, 0x77, 0x77, 0xff, 0xff, 0xff, 0xe9,
+                0xe9, 0xac, 0xac, 0xac, 0xac, 0xac, 0xac, 0xac,
+                0xac, 0xac, 0xac, 0xac, 0x00, 0x00, 0xac, 0xac,
+
+                0xec, 0x01, 0x00, 0xac, 0xac, 0xac, 0x2c, 0xac,
+                0xa2, 0xac, 0xac, 0xac, 0xac, 0xac, 0xac, 0xac,
+                0xac, 0xac, 0xac, 0xac, 0x64, 0xf2
+            }
+        },
+        {
+            32,
+            {
+                0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x7f,
+                0x01, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0xcf, 0x77, 0x77, 0x77, 0x77, 0x77,
+                0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77
+            }
+        },
+        {
+            16,
+            {
+                0x02, 0xee, 0x7c, 0x8c, 0x54, 0x6d, 0xde, 0xb1,
+                0xa4, 0x67, 0xe4, 0xc3, 0x98, 0x11, 0x58, 0xb9
+            }
+        },
+    },
+    /*
+     * test vectors from Andrew Moon
+     */
+    { /* nacl */
+        {
+            131,
+            {
+                0x8e, 0x99, 0x3b, 0x9f, 0x48, 0x68, 0x12, 0x73,
+                0xc2, 0x96, 0x50, 0xba, 0x32, 0xfc, 0x76, 0xce,
+                0x48, 0x33, 0x2e, 0xa7, 0x16, 0x4d, 0x96, 0xa4,
+                0x47, 0x6f, 0xb8, 0xc5, 0x31, 0xa1, 0x18, 0x6a,
+
+                0xc0, 0xdf, 0xc1, 0x7c, 0x98, 0xdc, 0xe8, 0x7b,
+                0x4d, 0xa7, 0xf0, 0x11, 0xec, 0x48, 0xc9, 0x72,
+                0x71, 0xd2, 0xc2, 0x0f, 0x9b, 0x92, 0x8f, 0xe2,
+                0x27, 0x0d, 0x6f, 0xb8, 0x63, 0xd5, 0x17, 0x38,
+
+                0xb4, 0x8e, 0xee, 0xe3, 0x14, 0xa7, 0xcc, 0x8a,
+                0xb9, 0x32, 0x16, 0x45, 0x48, 0xe5, 0x26, 0xae,
+                0x90, 0x22, 0x43, 0x68, 0x51, 0x7a, 0xcf, 0xea,
+                0xbd, 0x6b, 0xb3, 0x73, 0x2b, 0xc0, 0xe9, 0xda,
+
+                0x99, 0x83, 0x2b, 0x61, 0xca, 0x01, 0xb6, 0xde,
+                0x56, 0x24, 0x4a, 0x9e, 0x88, 0xd5, 0xf9, 0xb3,
+                0x79, 0x73, 0xf6, 0x22, 0xa4, 0x3d, 0x14, 0xa6,
+                0x59, 0x9b, 0x1f, 0x65, 0x4c, 0xb4, 0x5a, 0x74,
+
+                0xe3, 0x55, 0xa5
+            }
+        },
+        {
+            32,
+            {
+                0xee, 0xa6, 0xa7, 0x25, 0x1c, 0x1e, 0x72, 0x91,
+                0x6d, 0x11, 0xc2, 0xcb, 0x21, 0x4d, 0x3c, 0x25,
+                0x25, 0x39, 0x12, 0x1d, 0x8e, 0x23, 0x4e, 0x65,
+                0x2d, 0x65, 0x1f, 0xa4, 0xc8, 0xcf, 0xf8, 0x80
+            }
+        },
+        {
+            16,
+            {
+                0xf3, 0xff, 0xc7, 0x70, 0x3f, 0x94, 0x00, 0xe5,
+                0x2a, 0x7d, 0xfb, 0x4b, 0x3d, 0x33, 0x05, 0xd9
+            }
+        },
+    },
+    { /* wrap 2^130-5 */
+        {
+            16,
+            {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            }
+        },
+        {
+            32,
+            {
+                0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+        {
+            16,
+            {
+                0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+    },
+    { /* wrap 2^128 */
+        {
+            16,
+            {
+                0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+        {
+            32,
+            {
+                0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            }
+        },
+        {
+            16,
+            {
+                0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+    },
+    { /* limb carry */
+        {
+            48,
+            {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+
+                0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+        {
+            32,
+            {
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+        {
+            16,
+            {
+                0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+    },
+    { /* 2^130-5 */
+        {
+            48,
+            {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xfb, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
+                0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
+
+                0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+                0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
+            }
+        },
+        {
+            32,
+            {
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+        {
+            16,
+            {
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+            }
+        },
+    },
+    { /* 2^130-6 */
+        {
+            16,
+            {
+                0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            }
+        },
+        {
+            32,
+            {
+                0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+        {
+            16,
+            {
+                0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            }
+        },
+    },
+    { /* 5*H+L reduction intermediate */
+        {
+            64,
+            {
+                0xe3, 0x35, 0x94, 0xd7, 0x50, 0x5e, 0x43, 0xb9,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x33, 0x94, 0xd7, 0x50, 0x5e, 0x43, 0x79, 0xcd,
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+        {
+            32,
+            {
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+        {
+            16,
+            {
+                0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+    },
+    { /* 5*H+L reduction final */
+        {
+            48,
+            {
+                0xe3, 0x35, 0x94, 0xd7, 0x50, 0x5e, 0x43, 0xb9,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x33, 0x94, 0xd7, 0x50, 0x5e, 0x43, 0x79, 0xcd,
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+            }
+        },
+        {
+            32,
+            {
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        },
+        {
+            16,
+            {
+                0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            }
+        }
+    }
+};
+
+static int drive_tests(int idx)
+{
+    SETUP_TEST_FIXTURE(SIMPLE_FIXTURE, setup_poly1305);
+    fixture.test_num = idx;
+    fixture.test_data = &tests[idx];
+    EXECUTE_TEST(execute_poly1305, teardown_poly1305);
+}
+
+int main(int argc, char **argv)
+{
+    int result = 0;
+    int iter_argv;
+    int benchmark = 0;
+
+    for (iter_argv = 1; iter_argv < argc; iter_argv++) {
+        if (strcmp(argv[iter_argv], "-b") == 0)
+            benchmark = 1;
+        else if (strcmp(argv[iter_argv], "-h") == 0)
+            goto help;
+    }
+
+    ADD_ALL_TESTS(drive_tests, OSSL_NELEM(tests));
+
+    result = run_tests(argv[0]);
+
+    if (benchmark)
+        benchmark_poly1305();
+
+    return result;
+
+ help:
+    printf("-h\tThis help\n");
+    printf("-b\tBenchmark in addition to the tests\n");
+
+    return 0;
+}