deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add precomputed tables.

Browse Source
This commit is contained in:
NIIBE Yutaka
2014-03-20 17:15:53 +09:00
parent 25e71cb29b
commit 129d1b0d30
2 changed files with 270 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2014-03-20 Niibe Yutaka <gniibe@fsij.org>
* src/ecc-edwards.c (ed_add_25638): Fix for X == A.
(main): Compute pre-computed tables.
(precomputed_KG, precomputed_2E_KG): Add.
2014-03-19 Niibe Yutaka <gniibe@fsij.org>
* src/bn.c (bn256_add): Fix for X == B.

292
src/ecc-edwards.c
View File

@@ -125,8 +125,8 @@ ed_double_25638 (ptc *X, const ptc *A)
static void
ed_add_25638 (ptc *X, const ptc *A, const ac *B, int minus)
{
bn256 c[1], d[1], e[1];
#define minus_B_x X->x
bn256 c[1], d[1], e[1], tmp[1];
bn256 minus_B_x[1];
uint32_t borrow;
/* Compute: C = X1 * X2 */
@@ -134,7 +134,7 @@ ed_add_25638 (ptc *X, const ptc *A, const ac *B, int minus)
if (borrow)
bn256_add (minus_B_x, minus_B_x, n25638); /* carry ignored */
else
bn256_add (X->z, minus_B_x, n25638); /* dummy calculation */
bn256_add (c, minus_B_x, n25638); /* dummy calculation */
if (minus)
mod25638_mul (c, A->x, minus_B_x);
else
@@ -154,13 +154,13 @@ ed_add_25638 (ptc *X, const ptc *A, const ac *B, int minus)
/* Compute: D_1 = Z1^2 : B */
mod25638_sqr (d, A->z);
/* Z3_tmp = D_1 - E : F */
mod25638_sub (X->z, d, e);
/* tmp = D_1 - E : F */
mod25638_sub (tmp, d, e);
/* D_2 = D_1 + E : G */
mod25638_add (d, d, e);
/* X3_final = Z1 * Z3_tmp * ((X1 + Y1) * (X2 + Y2) - C_1) */
/* X3_final = Z1 * tmp * ((X1 + Y1) * (X2 + Y2) - C_1) */
mod25638_add (X->x, A->x, A->y);
if (minus)
mod25638_sub (e, B->y, B->x);
@@ -168,15 +168,15 @@ ed_add_25638 (ptc *X, const ptc *A, const ac *B, int minus)
mod25638_add (e, B->x, B->y);
mod25638_mul (e, X->x, e);
mod25638_sub (e, e, c);
mod25638_mul (e, X->z, e);
mod25638_mul (e, tmp, e);
mod25638_mul (X->x, A->z, e);
/* Y3_final = Z1 * D_2 * C_1 */
mod25638_mul (c, d, c);
mod25638_mul (X->y, A->z, c);
/* Z3_final = Z3_tmp * D_2 */
mod25638_mul (X->z, X->z, d);
/* Z3_final = tmp * D_2 */
mod25638_mul (X->z, tmp, d);
/* A = Z1 */
/* B = A^2 */
@@ -242,6 +242,132 @@ ptc_to_ac_25519 (ac *X, const ptc *A)
}
static const ac precomputed_KG[15] = {
{ {{{ 0x8f25d51a, 0xc9562d60, 0x9525a7b2, 0x692cc760,
0xfdd6dc5c, 0xc0a4e231, 0xcd6e53fe, 0x216936d3 }}},
{{{ 0x66666658, 0x66666666, 0x66666666, 0x66666666,
0x66666666, 0x66666666, 0x66666666, 0x66666666 }}} },
{ {{{ 0xf4eda202, 0x3e0b6b8f, 0xd51a35eb, 0x0078db7e,
0xb4a08a96, 0xd44b60cf, 0xbf2df9d5, 0x6222bd88 }}},
{{{ 0x82e45313, 0x8f1efa57, 0xba902b06, 0x5410b608,
0x261b7c4f, 0xdd6bdaed, 0xea4ed025, 0x0325bb42 }}} },
{ {{{ 0x61ccfba2, 0x1a700667, 0xff3a78c4, 0x2cdd6232,
0x3b1950ab, 0xb87d9bf2, 0x9c294ffd, 0x0eba91a7 }}},
{{{ 0xfe515e46, 0xe5e5bf1d, 0x670d959b, 0x5ab5d1f8,
0xc32c93a1, 0x85970ede, 0xabea7f2d, 0x1830473e }}} },
{ {{{ 0x60b7e824, 0xfc8047ae, 0xc2e723e5, 0x98e685c9,
0xe14e29a0, 0x952d3984, 0x3c45f32c, 0x4c27afff }}},
{{{ 0x4bf5a66b, 0x5bbabd11, 0x51a4c49e, 0x90d0be1e,
0x26c29c3a, 0x95f11eb6, 0x526dc87d, 0x5f2c99e6 }}} },
{ {{{ 0x680c969a, 0xfbe2fd29, 0x31ecbce6, 0xb0e6ec08,
0x8cc36053, 0x8ab3c1be, 0x2b88e48f, 0x6e64e555 }}},
{{{ 0x7bafd09b, 0x25352a64, 0x9ec55210, 0x36391158,
0x39b85145, 0x6a9dfc93, 0xa4cb58be, 0x383c510f }}} },
{ {{{ 0x43abca05, 0x8bf30e63, 0x9bf8a641, 0x53807053,
0xe38f5e86, 0xc8180dc3, 0xd81f344b, 0x6df2bc1d }}},
{{{ 0xdfbe3a34, 0x89f3f6d9, 0x9f94e1a1, 0xe95d4c5d,
0xef9249a1, 0x8981530e, 0x37a68758, 0x6062ddf1 }}} },
{ {{{ 0x1b9d5a63, 0x527dc68c, 0x6a0970ea, 0x73f332e1,
0x7b071f21, 0xd8499b7c, 0x7225f3c0, 0x31ed9d6f }}},
{{{ 0x54363667, 0xe6719240, 0xad112811, 0x7b853293,
0x493bb73e, 0xb0071c13, 0xfdaa932e, 0x3d4728fd }}} },
{ {{{ 0xc7dad28d, 0xdb7ad644, 0xb81d7d26, 0x7a9ddee1,
0x1c7e177d, 0x2d8d0437, 0x38185e7c, 0x1bc7af1e }}},
{{{ 0x00314833, 0xcaf2f659, 0x631b270f, 0x1d027e12,
0x795dc049, 0x7a5eef87, 0x55661f2f, 0x61d909d8 }}} },
{ {{{ 0x07b06838, 0x85ccfca3, 0x654c7f10, 0xfafab365,
0xdb6f53a5, 0x46564c74, 0x7ad5e203, 0x02c61c29 }}},
{{{ 0x04f259bc, 0x84c06375, 0x671c602f, 0x8663fd76,
0xdcbffaf3, 0x91902dd2, 0xe5a933bd, 0x42da0c66 }}} },
{ {{{ 0x66f4ca27, 0x1492ecc2, 0xd0630657, 0xeb06154d,
0x774f5869, 0xf0c78bc5, 0xa064ed8e, 0x71663cb3 }}},
{{{ 0x0ada2dc6, 0x2770fe0d, 0xfa27f864, 0xa5305ff6,
0xf2da6c0d, 0x47785e62, 0x1c0066d3, 0x5d1f56fd }}} },
{ {{{ 0x4cf46f3f, 0x270efdd8, 0xbc2b5cc9, 0x23e7a4c0,
0x319f0229, 0x96d7e9d6, 0x0b5ee0f4, 0x3cee130e }}},
{{{ 0x3df2ed09, 0xa4c39176, 0x87d4ae97, 0x18f65dd0,
0x671d1f47, 0xa063cff2, 0x93f82791, 0x3f237545 }}} },
{ {{{ 0x23adf1d1, 0x969364dd, 0xf77f7041, 0xa289a9f5,
0x1b8db034, 0x491519ae, 0x876d2358, 0x76814f15 }}},
{{{ 0xeab523fb, 0x8d54accf, 0xeb2f424e, 0x68db630f,
0x8bcfa837, 0x6ea4f5ab, 0xd6b22a96, 0x0dbd9ebe }}} },
{ {{{ 0xcfa942b4, 0x178a8301, 0xc6c47647, 0x0b950483,
0x62c911fc, 0x84760cb8, 0xfa37b9d9, 0x6dc27cfc }}},
{{{ 0x04b33e58, 0x488f8cbb, 0xcc2791bc, 0x1922b7f9,
0xb5092e83, 0x1c54d972, 0x0beaa14d, 0x7208c6f1 }}} },
{ {{{ 0x6e7a8746, 0x8a0a5680, 0x6b11ddc0, 0xdf47ddd6,
0xead8d910, 0x038fb07c, 0x8fc12e00, 0x30d3a844 }}},
{{{ 0xf9a28906, 0x03dcad34, 0xa751ed85, 0x5de79c82,
0x320c9352, 0xaae15b9a, 0x6d02b8ca, 0x3ab1d43a }}} },
{ {{{ 0xb5be5ff0, 0x386b100d, 0x8076ac32, 0x7194cabd,
0x35c9f27a, 0x429fde2a, 0xab011849, 0x647cefbc }}},
{{{ 0x923d583f, 0xdb13db59, 0xe00a6e58, 0x084a91b7,
0x3c2ed620, 0x178bc945, 0x90c7e779, 0x25183a99 }}} },
};
static const ac precomputed_2E_KG[15] = {
{ {{{ 0x6abc0cbb, 0x931797a4, 0x72de6f2d, 0x2c081c10,
0x6832800f, 0xddabd427, 0x136158c5, 0x4d1e116d }}},
{{{ 0x10c9b91a, 0xf44e1efb, 0x5e8a4b84, 0x43e84b7b,
0xb5008f8c, 0x5cc51354, 0x9d4e35b6, 0x6d415be4 }}} },
{ {{{ 0x3b5775d0, 0x56145ceb, 0xb84fc950, 0xf4a31eb8,
0x20a9f5ab, 0xda829415, 0x599b1c96, 0x51f4ff8c }}},
{{{ 0xd7863ac1, 0x7f8406b0, 0x07d4bd1b, 0xb12e8078,
0x3852eeb4, 0xf6f99aee, 0xd46e41f3, 0x35ac9588 }}} },
{ {{{ 0xb1e3cbcb, 0x23246812, 0xb51b86b7, 0x4626ba92,
0x7c5a82a9, 0xbad60319, 0xb0a4d421, 0x1a3d5fa5 }}},
{{{ 0xa7f87bc6, 0xd984822e, 0xd61f19a1, 0xc9878318,
0xd28f1441, 0x033d3655, 0xa0ee984e, 0x1d5faa15 }}} },
{ {{{ 0x52014031, 0x285b9456, 0xee52aa8a, 0x8d050ad8,
0x2eaab5cd, 0x87b7aa38, 0x04fb2bf7, 0x543d84cb }}},
{{{ 0xde59ef20, 0x6e932ba4, 0x9a42ec2e, 0x46f42dd4,
0x182b2758, 0x693d838f, 0xb63ed49e, 0x0358fdc5 }}} },
{ {{{ 0xb32f56f0, 0x5682666f, 0x38fd4625, 0xe8be4ba2,
0x649501d6, 0xf78cf0e0, 0xbcce6bab, 0x2567450f }}},
{{{ 0x538b58d7, 0x6581f96e, 0xc25cfdf1, 0x5eb54f3e,
0xf899e2cf, 0x84f772f7, 0x4768df26, 0x7c9ca5b5 }}} },
{ {{{ 0xa955bba4, 0x35d5face, 0xd1bf9787, 0x13e50d77,
0xeff0ee33, 0xc9b67e36, 0x40ef61cd, 0x32e253be }}},
{{{ 0xcc8e3fd4, 0x03fa09fa, 0x57f17d59, 0x04d1daed,
0xe17b4361, 0x6f356428, 0x5d8a9401, 0x2d9acf86 }}} },
{ {{{ 0xe9edd690, 0x06ea63bb, 0xb2d7d5f4, 0x1532536e,
0x8e9f5c47, 0xd55c86c3, 0x0077fe28, 0x35e81b03 }}},
{{{ 0xdeb7e5f8, 0xf8f5f35a, 0x9386c94f, 0xf1384675,
0xbbf27ae1, 0x89c2f5c7, 0x1bcb5d12, 0x6e2810d6 }}} },
{ {{{ 0xcb05dc3f, 0x23c83c41, 0x99382c04, 0xf95568e3,
0xbfc732d3, 0x5d1bd4fa, 0x4210dcde, 0x75d942c0 }}},
{{{ 0x4e35ab2d, 0x9765c487, 0x47a42467, 0xf38e3fad,
0x771731cb, 0x8fd7e2c5, 0x56cdc13c, 0x696cc148 }}} },
{ {{{ 0x1c3eae7b, 0x3fde9e2a, 0x54665d04, 0xf3bea8c8,
0x0d7e1fdf, 0x11c026d7, 0xe0744e05, 0x7d17c4ff }}},
{{{ 0x2479704e, 0x71530a4d, 0x70a41133, 0x316b2419,
0x3008bf60, 0xe6b151ed, 0x91f4ba0f, 0x3d8acfb9 }}} },
{ {{{ 0xfba75a58, 0xb6859189, 0xefad9ec8, 0xb459a9b1,
0x6c18aaad, 0x250970a4, 0x6c9ed604, 0x48540861 }}},
{{{ 0xdbe02f54, 0x51c52acc, 0x5c87096e, 0xa1ffff9e,
0x5cca82cd, 0xd7b2b928, 0xa7047f4e, 0x00b7a530 }}} },
{ {{{ 0xd7a206ad, 0x2fa8b877, 0xc26be66b, 0xeb0ec8e5,
0x6c43abcf, 0x812d4d32, 0x21b49825, 0x15b95ece }}},
{{{ 0x6401bfc5, 0xc5c588ca, 0x26caa2eb, 0x6c2f708f,
0x7b620be3, 0x5575925c, 0x285eb272, 0x1b8e9998 }}} },
{ {{{ 0xc8c0b25a, 0x3c58fb25, 0xf61dd811, 0x45e69804,
0x4f4f3099, 0xe0506d88, 0xf6cb4804, 0x46e5ad62 }}},
{{{ 0x2b3d2d89, 0x3ab72c24, 0x83a0d441, 0xc3547b12,
0x6b6b242d, 0x4bc9ef39, 0x8c21d8f4, 0x35dd429a }}} },
{ {{{ 0x40d5666c, 0xda6a76e6, 0x02bbbfdd, 0xfe5fb226,
0xec0db634, 0x335c47d6, 0x27a83af1, 0x0b3a68e0 }}},
{{{ 0xeb1ed0fe, 0x958eda03, 0x58cb1b6c, 0x98ad7ed0,
0xe6e0887c, 0xc9a8a932, 0x8d10575b, 0x182ae50d }}} },
{ {{{ 0xc80926b5, 0xe85218d5, 0x663244da, 0x4e3ca84c,
0x8c93a82e, 0xd8dd2b95, 0x694d17e6, 0x3be6208c }}},
{{{ 0xa3cd685d, 0xbb2f7abd, 0x9636e5cc, 0x43ddbc27,
0x8398acfd, 0x22cd89da, 0xa454d187, 0x663fede3 }}} },
{ {{{ 0xdd12463a, 0x77e83188, 0x10321a86, 0xc29101f7,
0x80c4fcac, 0x739f0dfb, 0x3c0a1c4e, 0x6bb76555 }}},
{{{ 0x4f7a95fd, 0xb6b30c93, 0x28f71108, 0x3070bbe4,
0xee80b79c, 0x1ce155df, 0xe9bdf1b1, 0x181b445b }}} },
};
/**
* @brief X = k * G
*
@@ -253,6 +379,7 @@ ptc_to_ac_25519 (ac *X, const ptc *A)
int
compute_kG_25519 (ac *X, const bn256 *K)
{
return 0;
}
@@ -297,15 +424,55 @@ print_point (const ac *X)
{
int i;
for (i = 0; i < 8; i++)
printf ("%08x\n", X->x->word[i]);
#ifdef PRINT_OUT_TABLE_AS_C
fputs (" { {{{ ", stdout);
for (i = 0; i < 4; i++)
printf ("0x%08x, ", X->x->word[i]);
fputs ("\n ", stdout);
for (; i < 7; i++)
printf ("0x%08x, ", X->x->word[i]);
printf ("0x%08x }}},\n", X->x->word[i]);
fputs (" {{{ ", stdout);
for (i = 0; i < 4; i++)
printf ("0x%08x, ", X->y->word[i]);
fputs ("\n ", stdout);
for (; i < 7; i++)
printf ("0x%08x, ", X->y->word[i]);
printf ("0x%08x }}} },\n", X->y->word[i]);
#else
puts ("--");
for (i = 7; i >= 0; i--)
printf ("%08x", X->x->word[i]);
puts ("");
for (i = 0; i < 8; i++)
printf ("%08x\n", X->y->word[i]);
for (i = 7; i >= 0; i--)
printf ("%08x", X->y->word[i]);
puts ("");
puts ("--");
#endif
}
#if 0
static void
print_point_ptc (const ptc *X)
{
int i;
static const uint8_t *str = "abcdefghijklmnopqrstuvwxyz0123456789";
puts ("---");
for (i = 7; i >= 0; i--)
printf ("%08x", X->x->word[i]);
puts ("");
for (i = 7; i >= 0; i--)
printf ("%08x", X->y->word[i]);
puts ("");
for (i = 7; i >= 0; i--)
printf ("%08x", X->z->word[i]);
puts ("");
puts ("---");
}
#endif
static const uint8_t *str = (const uint8_t *)
"abcdefghijklmnopqrstuvwxyz0123456789";
const uint8_t *
random_bytes_get (void)
@@ -326,27 +493,96 @@ random_bytes_free (const uint8_t *p)
int
main (int argc, char *argv[])
{
ac a0001[1], a0010[1], a0100[1], a1000[1];
ac x[1];
ptc a[1];
int i;
ed_double_25638 (a, G);
ptc_to_ac_25519 (x, a);
print_point (x);
memcpy (a, G, sizeof (ptc));
ptc_to_ac_25519 (a0001, a);
ed_add_25638 (a, G, G, 1);
ptc_to_ac_25519 (x, a);
print_point (x);
ed_add_25638 (a, G, G, 0);
ptc_to_ac_25519 (x, a);
print_point (x);
for (i = 0; i < 64 - 1; i++)
for (i = 0; i < 64; i++)
ed_double_25638 (a, a);
ptc_to_ac_25519 (a0010, a);
for (i = 0; i < 64; i++)
ed_double_25638 (a, a);
ptc_to_ac_25519 (a0100, a);
for (i = 0; i < 64; i++)
ed_double_25638 (a, a);
ptc_to_ac_25519 (a1000, a);
for (i = 1; i < 16; i++)
{
/* A := Identity Element */
memset (a, 0, sizeof (ptc));
a->y->word[0] = 1;
a->z->word[0] = 1;
if ((i & 1))
ed_add_25638 (a, a, a0001, 0);
if ((i & 2))
ed_add_25638 (a, a, a0010, 0);
if ((i & 4))
ed_add_25638 (a, a, a0100, 0);
if ((i & 8))
ed_add_25638 (a, a, a1000, 0);
ptc_to_ac_25519 (x, a);
print_point (x);
}
fputs ("\n", stdout);
memcpy (a, a0001, sizeof (ac));
memset (a->z, 0, sizeof (bn256));
a->z->word[0] = 1;
for (i = 0; i < 32; i++)
ed_double_25638 (a, a);
ptc_to_ac_25519 (a0001, a);
memcpy (a, a0010, sizeof (ac));
memset (a->z, 0, sizeof (bn256));
a->z->word[0] = 1;
for (i = 0; i < 32; i++)
ed_double_25638 (a, a);
ptc_to_ac_25519 (a0010, a);
memcpy (a, a0100, sizeof (ac));
memset (a->z, 0, sizeof (bn256));
a->z->word[0] = 1;
for (i = 0; i < 32; i++)
ed_double_25638 (a, a);
ptc_to_ac_25519 (a0100, a);
memcpy (a, a1000, sizeof (ac));
memset (a->z, 0, sizeof (bn256));
a->z->word[0] = 1;
for (i = 0; i < 32; i++)
ed_double_25638 (a, a);
ptc_to_ac_25519 (a1000, a);
for (i = 1; i < 16; i++)
{
/* A := Identity Element */
memset (a, 0, sizeof (ptc));
a->y->word[0] = 1;
a->z->word[0] = 1;
if ((i & 1))
ed_add_25638 (a, a, a0001, 0);
if ((i & 2))
ed_add_25638 (a, a, a0010, 0);
if ((i & 4))
ed_add_25638 (a, a, a0100, 0);
if ((i & 8))
ed_add_25638 (a, a, a1000, 0);
ptc_to_ac_25519 (x, a);
print_point (x);
}
ptc_to_ac_25519 (x, a);
print_point (x);
return 0;
}
#endif