Move F25519 ops into separate header; add header for Curve25519

IanHarvey · May 29, 2014 · d027d15 · d027d15
1 parent 2dd6d73
commit d027d15
Show file tree

Hide file tree

Showing 10 changed files with 108 additions and 56 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,5 @@
 *.exe
 *.out
 *.app
+*.pyc
+
diff --git a/src/curve25519_mini.c b/src/curve25519_mini.c
@@ -8,17 +8,7 @@
  */
 
 #define MPIMINI_INTERNAL_API
-#include "mpi_mini.h"
-
-#include <stdio.h>
-typedef struct
-{
-  uint8_t bytes[F25519MINI_MSGSIZE];
-}
-  Curve25519Msg_Mini;
-
-extern MCResult Curve25519_mini(Curve25519Msg_Mini *res, const Curve25519Msg_Mini *a,
-	const Curve25519Msg_Mini *P );
+#include "curve25519_mini.h"
 
 /* ------------------ */
 

diff --git a/src/curve25519_mini.h b/src/curve25519_mini.h
@@ -0,0 +1,39 @@
+/*
+ * Minicrypt library - Curve25519 public-key crypto primitive
+ *
+ * See: http://cr.yp.to/ecdh.html
+ *
+ * https://github.com/IanHarvey/minicrypt
+ *
+ * This file is placed in the public domain by its author.
+ * Note there is NO WARRANTY.
+ *
+ */
+#ifndef CURVE25519_MINI_H
+#define CURVE25519_MINI_H
+
+#include "minicrypt.h"
+#include "f25519_mini.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct
+{
+  uint8_t bytes[F25519MINI_MSGSIZE];
+}
+  Curve25519Msg_Mini;
+
+extern MCResult Curve25519_mini(Curve25519Msg_Mini *res, const Curve25519Msg_Mini *a,
+	const Curve25519Msg_Mini *P );
+/* Multiplies base point P by scalar a, giving result in res.
+ * Returns error only if base point is invalid.
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/src/f25519_mini.h b/src/f25519_mini.h
@@ -0,0 +1,60 @@
+/*
+ * Minicrypt library - F25519 (2^255-19) field operations
+ *
+ * https://github.com/IanHarvey/minicrypt
+ *
+ * This file is placed in the public domain by its author.
+ * Note there is NO WARRANTY.
+ *
+ */
+#ifndef F25519_MINI_H
+#define F25519_MINI_H
+
+#include "minicrypt.h"
+#include "mpi_mini.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef UInt_Mini F25519_Mini;
+
+#define F25519MINI_MSGSIZE	32
+extern MCResult F25519_set_mini(F25519_Mini *res, const uint8_t *bytes, size_t len);
+/* Sets a field element from a byte-block message, in
+ * little-endian. 'len' must be exactly F25519MINI_MSGSIZE. */
+
+extern void F25519_setK_mini(F25519_Mini *res, uint32_t n);
+/* Sets a field element to a 1-word value */
+
+extern MCResult F25519_get_mini(uint8_t *bytes, size_t len, const F25519_Mini *s);
+/* Writes a field element as a byte-block message. len should be F25519MINI_MSGSIZE */
+
+extern void F25519_copy_mini(F25519_Mini *res, const F25519_Mini *s);
+/* Does *res = *s. No-op if args are the same */
+
+extern int F25519_equal_mini(const UInt_Mini *a, const UInt_Mini *b);
+/* Returns nonzero if *a==*b, or 0 if they're different */
+
+extern void F25519_add3_mini(F25519_Mini *res, const F25519_Mini *s1, const F25519_Mini *s2);
+/* Does *res = *s1 + *s2 in field arithmetic. Operands are allowed to be the same */
+
+extern void F25519_sub3_mini(F25519_Mini *res, const F25519_Mini *s1, const F25519_Mini *s2);
+/* Does *res = *s1 - *s2 in field arithmetic. Operands are allowed to be the same */
+
+extern void F25519_mul3_mini(F25519_Mini *res, const F25519_Mini *s1, const F25519_Mini *s2);
+/* Does *res = *s1 x *s2 in field arithmetic. Operands are allowed to be the same */
+
+extern void F25519_sqr_mini(F25519_Mini *res, const F25519_Mini *s);
+/* Does *res = *s x *s in field arithmetic. Operands are allowed to be the same */
+
+extern void F25519_mulK_mini(F25519_Mini *res, const F25519_Mini *s1, uint32_t s2);
+/* Does *res = *s1 x s2 in field arithmetic, where s2 is a small integer */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/src/f25519add_mini.c b/src/f25519add_mini.c
@@ -8,7 +8,7 @@
  */
 
 #define MPIMINI_INTERNAL_API
-#include "mpi_mini.h"
+#include "f25519_mini.h"
 
 void F25519_add3_mini(F25519_Mini *res, const F25519_Mini *s1, const F25519_Mini *s2)
 {

diff --git a/src/f25519mul_mini.c b/src/f25519mul_mini.c
@@ -8,7 +8,7 @@
  */
 
 #define MPIMINI_INTERNAL_API
-#include "mpi_mini.h"
+#include "f25519_mini.h"
 
 
 static void mul_reduce_approx(uint32_t *dst, uint32_t *src)

diff --git a/src/f25519sub_mini.c b/src/f25519sub_mini.c
@@ -8,7 +8,7 @@
  */
 
 #define MPIMINI_INTERNAL_API
-#include "mpi_mini.h"
+#include "f25519_mini.h"
 
 void F25519_sub3_mini(F25519_Mini *res, const F25519_Mini *s1, const F25519_Mini *s2)
 {

diff --git a/src/f25519util_mini.c b/src/f25519util_mini.c
@@ -8,7 +8,7 @@
  */
 
 #define MPIMINI_INTERNAL_API
-#include "mpi_mini.h"
+#include "f25519_mini.h"
 
 const UInt_Mini F25519_P_mini_ = 
 {

diff --git a/src/minicrypt.h b/src/minicrypt.h
@@ -7,8 +7,8 @@
  * Note there is NO WARRANTY.
  *
  */
-#ifndef _MINICRYPT_H
-#define _MINICRYPT_H
+#ifndef MINICRYPT_H
+#define MINICRYPT_H
 
 #include <stdint.h>
 #include <stddef.h>

diff --git a/src/mpi_mini.h b/src/mpi_mini.h
@@ -55,45 +55,6 @@ extern int mpicmp_mini( const UInt_Mini *a, const UInt_Mini *b );
 extern void mpisetval_mini( UInt_Mini *res, uint32_t val);
 /* Sets 'res' to a 32-bit value */
 
-
-/* F25519 (2^255-19 prime field) operations
- *
- */
-
-typedef UInt_Mini F25519_Mini;
-
-#define F25519MINI_MSGSIZE	32
-extern MCResult F25519_set_mini(F25519_Mini *res, const uint8_t *bytes, size_t len);
-/* Sets a field element from a byte-block message, in
- * little-endian. 'len' must be exactly F25519MINI_MSGSIZE. */
-
-extern void F25519_setK_mini(F25519_Mini *res, uint32_t n);
-/* Sets a field element to a 1-word value */
-
-extern MCResult F25519_get_mini(uint8_t *bytes, size_t len, const F25519_Mini *s);
-/* Writes a field element as a byte-block message. len should be F25519MINI_MSGSIZE */
-
-extern void F25519_copy_mini(F25519_Mini *res, const F25519_Mini *s);
-/* Does *res = *s. No-op if args are the same */
-
-extern int F25519_equal_mini(const UInt_Mini *a, const UInt_Mini *b);
-/* Returns nonzero if *a==*b, or 0 if they're different */
-
-extern void F25519_add3_mini(F25519_Mini *res, const F25519_Mini *s1, const F25519_Mini *s2);
-/* Does *res = *s1 + *s2 in field arithmetic. Operands are allowed to be the same */
-
-extern void F25519_sub3_mini(F25519_Mini *res, const F25519_Mini *s1, const F25519_Mini *s2);
-/* Does *res = *s1 - *s2 in field arithmetic. Operands are allowed to be the same */
-
-extern void F25519_mul3_mini(F25519_Mini *res, const F25519_Mini *s1, const F25519_Mini *s2);
-/* Does *res = *s1 x *s2 in field arithmetic. Operands are allowed to be the same */
-
-extern void F25519_sqr_mini(F25519_Mini *res, const F25519_Mini *s);
-/* Does *res = *s x *s in field arithmetic. Operands are allowed to be the same */
-
-extern void F25519_mulK_mini(F25519_Mini *res, const F25519_Mini *s1, uint32_t s2);
-/* Does *res = *s1 x s2 in field arithmetic, where s2 is a small integer */
-
 
 /* Internal API
  *
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,3 +16,5 @@ @@
     *.exe
     *.out
     *.app
+    *.pyc