Update crypto code from Catacomb 2.3.0.1-45-g9c14.

[secnet] / fgoldi.h

diff --git a/fgoldi.h b/fgoldi.h
index 1857008..cac2ff1 100644 (file)
--- a/fgoldi.h
+++ b/fgoldi.h
@@ -1,39 +1,3 @@
-/*
- * fgoldi.h: arithmetic modulo 2^448 - 2^224 - 1
- */
-/*
- * 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 lightly modified for Secnet (2017-04-30):
- *
- *   * Use `fake-mLib-bits.h' in place of the real <mLib/bits.h>.
- *
- *   * Remove the 16/32-bit implementation, since C99 always has 64-bit
- *     arithmetic.
- *
- * The file's original comment headers are preserved below.
- */
 /* -*-c-*-
  *
  * Arithmetic in the Goldilocks field GF(2^448 - 2^224 - 1)
@@ -43,7 +7,26 @@
 
 /*----- 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
@@ -82,14 +65,6 @@ typedef union {
   int32 p28[16];
 } fgoldi;
 
-#if !defined(FGOLDI_IMPL) && defined(HAVE_INT64)
-#  define FGOLDI_IMPL 28
-#endif
-
-#ifndef FGOLDI_IMPL
-#  define FGOLDI_IMPL 12
-#endif
-
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @fgoldi_load@ --- *