X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/b7a5ecfcbac18c56d0b044975f6ed6835dd86ab4..b823ca7c52b5a2434a61d086a8aec1579be2f4d2:/x25519.h

diff --git a/x25519.h b/x25519.h
index 56008df..422d161 100644
--- a/x25519.h
+++ b/x25519.h
@@ -7,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
@@ -45,11 +64,7 @@
 
 /*----- Header files ------------------------------------------------------*/
 
-#include <mLib/bits.h>
-
-#ifndef CATACOMB_KEY_H
-#  include "key.h"
-#endif
+#include "fake-mLib-bits.h"
 
 /*----- Important constants -----------------------------------------------*/
 
@@ -59,15 +74,6 @@
 
 extern const octet x25519_base[32];
 
-/*----- Key fetching ------------------------------------------------------*/
-
-typedef struct x25519_priv { key_bin priv, pub; } x25519_priv;
-typedef struct x25519_pub { key_bin pub; } x25519_pub;
-
-extern const key_fetchdef x25519_pubfetch[], x25519_privfetch[];
-#define X25519_PUBFETCHSZ 3
-#define X25519_PRIVFETCHSZ 6
-
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @x25519@ --- *