-/*
- * x25519.c: Bernstein's X25519 key-exchange function
- */
-/*
- * This file is Free Software. It has been modified to as part of its
- * incorporation into secnet.
- *
- * Copyright 2017 Mark Wooding
- *
- * You may redistribute this file and/or modify it under the terms of
- * the permissive licence shown below.
- *
- * You may redistribute secnet as a whole and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see
- * https://www.gnu.org/licenses/gpl.html.
- */
-/*
- * Imported from Catacomb, and modified for Secnet (2017-04-30):
- *
- * * Use `fake-mLib-bits.h' in place of the real <mLib/bits.h>.
- *
- * * Remove the test rig code: a replacement is in a separate source file.
- *
- * * Ignore the top bit of the input public key: in Secnet, conformance
- * with RFC7748 is more valuable than flexibility.
- *
- * * Strip out the key-management definitions.
- *
- * The file's original comment headers are preserved below.
- */
/* -*-c-*-
*
* The X25519 key-agreement algorithm
/*----- Licensing notice --------------------------------------------------*
*
- * This file is part of Catacomb.
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version d of the License, or
+ * (at your option) any later version.
+ *
+ * secnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ *
+ * This file was originally part of Catacomb, but has been automatically
+ * modified for incorporation into secnet: see `import-catacomb-crypto'
+ * for details.
*
* Catacomb is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
const octet qx[X25519_PUBSZ])
{
uint32 kw[8];
- uint8_t b[X25519_PUBSZ];
f25519 x1;
/* Load and clamp the key. The low bits are cleared to kill the small
kw[6] = LOAD32_L(k + 24); kw[7] = LOAD32_L(k + 28);
kw[0] &= 0xfffffff8; kw[7] = (kw[7]&0x3fffffff) | 0x40000000;
- /* Copy the input point and clamp the top bit. */
- memcpy(b, qx, sizeof(b)); b[31] &= 0x7f;
- f25519_load(&x1, b);
-
/* And run the ladder. */
+ f25519_load(&x1, qx);
#define MULA0(z, x) do { f25519_mulconst((z), (x), A0); } while (0)
MONT_LADDER(f25519, MULA0, kw, 8, 32, &x1, &x1);
#undef MULA0
f25519_store(zz, &x1);
}
-/*----- Test rig ----------------------------------------------------------*/
-
-#ifdef TEST_RIG
-
-#include <stdio.h>
-#include <string.h>
-
-#include <mLib/report.h>
-#include <mLib/testrig.h>
-
-static int vrf_x25519(dstr dv[])
-{
- dstr dz = DSTR_INIT;
- int ok = 1;
-
- if (dv[0].len != 32) die(1, "bad key length");
- if (dv[1].len != 32) die(1, "bad public length");
- if (dv[2].len != 32) die(1, "bad result length");
-
- dstr_ensure(&dz, 32); dz.len = 32;
- x25519((octet *)dz.buf,
- (const octet *)dv[0].buf,
- (const octet *)dv[1].buf);
- if (memcmp(dz.buf, dv[2].buf, 32) != 0) {
- ok = 0;
- fprintf(stderr, "failed!");
- fprintf(stderr, "\n\t k = "); type_hex.dump(&dv[0], stderr);
- fprintf(stderr, "\n\t p = "); type_hex.dump(&dv[1], stderr);
- fprintf(stderr, "\n\twant = "); type_hex.dump(&dv[2], stderr);
- fprintf(stderr, "\n\tcalc = "); type_hex.dump(&dz, stderr);
- fprintf(stderr, "\n");
- }
-
- dstr_destroy(&dz);
- return (ok);
-}
-
-static int vrf_mct(dstr dv[])
-{
- octet b0[32], b1[32], *k = b0, *x = b1, *t;
- unsigned long i, niter;
- dstr d = DSTR_INIT;
- int ok = 1;
-
- if (dv[0].len != sizeof(b0)) { fprintf(stderr, "k len\n"); exit(2); }
- if (dv[1].len != sizeof(b1)) { fprintf(stderr, "x len\n"); exit(2); }
- if (dv[3].len != sizeof(b0)) { fprintf(stderr, "result len\n"); exit(2); }
- memcpy(b0, dv[0].buf, sizeof(b0));
- memcpy(b1, dv[1].buf, sizeof(b1));
- niter = *(unsigned long *)dv[2].buf;
- dstr_ensure(&d, 32); d.len = 32; t = (octet *)d.buf;
-
- for (i = 0; i < niter; i++) {
- x[31] &= 0x7f;
- x25519(x, k, x);
- t = x; x = k; k = t;
- }
- memcpy(d.buf, k, d.len);
-
- if (memcmp(d.buf, dv[3].buf, d.len) != 0) {
- ok = 0;
- fprintf(stderr, "failed...");
- fprintf(stderr, "\n\tinitial k = "); type_hex.dump(&dv[0], stderr);
- fprintf(stderr, "\n\tinitial x = "); type_hex.dump(&dv[1], stderr);
- fprintf(stderr, "\n\titerations = %lu", niter);
- fprintf(stderr, "\n\texpected = "); type_hex.dump(&dv[3], stderr);
- fprintf(stderr, "\n\tcalculated = "); type_hex.dump(&d, stderr);
- fputc('\n', stderr);
- }
-
- dstr_destroy(&d);
- return (ok);
-}
-
-static test_chunk tests[] = {
- { "x25519", vrf_x25519, { &type_hex, &type_hex, &type_hex } },
- { "x25519-mct", vrf_mct,
- { &type_hex, &type_hex, &type_ulong, &type_hex } },
- { 0, 0, { 0 } }
-};
-
-int main(int argc, char *argv[])
-{
- test_run(argc, argv, tests, SRCDIR "/t/x25519");
- return (0);
-}
-
-#endif
-
/*----- That's all, folks -------------------------------------------------*/
~mdw / secnet / blobdiff