Lots of code documentation

2 files changed, 108 insertions, 5 deletions

diff --git a/src/ec25519.c b/src/ec25519.c
index bc6cc13..f77fcff 100644
--- a/src/ec25519.c
+++ b/src/ec25519.c
@@ -40,6 +40,7 @@
 #include <libuecc/ecc.h>
 
 
+/** Adds two unpacked integers (modulo p) */
 static void add(unsigned int out[32], const unsigned int a[32], const unsigned int b[32]) {
 	unsigned int j;
 	unsigned int u;
@@ -48,6 +49,7 @@ static void add(unsigned int out[32], const unsigned int a[32], const unsigned i
 	u += a[31] + b[31]; out[31] = u;
 }
 
+/** Subtracts two unpacked integers (modulo p) */
 static void sub(unsigned int out[32], const unsigned int a[32], const unsigned int b[32]) {
 	unsigned int j;
 	unsigned int u;
@@ -61,6 +63,7 @@ static void sub(unsigned int out[32], const unsigned int a[32], const unsigned i
 	out[31] = u;
 }
 
+/** Performs carry and reduce on an unpacked integer */
 static void squeeze(unsigned int a[32]) {
 	unsigned int j;
 	unsigned int u;
@@ -72,6 +75,11 @@ static void squeeze(unsigned int a[32]) {
 	u += a[31]; a[31] = u;
 }
 
+/**
+ * Ensures that the output of a previous \ref squeeze is fully reduced
+ *
+ * After a \ref freeze, only the lower byte of each integer part holds a meaningful value
+ */
 static void freeze(unsigned int a[32]) {
 	static const unsigned int minusp[32] = {
 		19, 0, 0, 0, 0, 0, 0, 0,
@@ -90,6 +98,7 @@ static void freeze(unsigned int a[32]) {
 	for (j = 0; j < 32; j++) a[j] ^= negative & (aorig[j] ^ a[j]);
 }
 
+/** Multiplies two unpacked integers (modulo p) */
 static void mult(unsigned int out[32], const unsigned int a[32], const unsigned int b[32]) {
 	unsigned int i;
 	unsigned int j;
@@ -104,6 +113,7 @@ static void mult(unsigned int out[32], const unsigned int a[32], const unsigned
 	squeeze(out);
 }
 
+/** Multiplies an unpacked integer with a small integer (modulo p) */
 static void mult_int(unsigned int out[32], const unsigned int n, const unsigned int a[32]) {
 	unsigned int j;
 	unsigned int u;
@@ -116,6 +126,7 @@ static void mult_int(unsigned int out[32], const unsigned int n, const unsigned
 	u += out[j]; out[j] = u;
 }
 
+/** Squares an unpacked integer */
 static void square(unsigned int out[32], const unsigned int a[32]) {
 	unsigned int i;
 	unsigned int j;
@@ -135,6 +146,7 @@ static void square(unsigned int out[32], const unsigned int a[32]) {
 	squeeze(out);
 }
 
+/** Checks for the equality of two unpacked integers */
 static int check_equal(const unsigned int x[32], const unsigned int y[32]) {
 	unsigned int differentbits = 0;
 	int i;
@@ -147,6 +159,11 @@ static int check_equal(const unsigned int x[32], const unsigned int y[32]) {
 	return (1 & ((differentbits - 1) >> 16));
 }
 
+/**
+ * Checks if an unpacked integer equals zero
+ *
+ * The intergers must be must be \ref squeeze "squeezed" before.
+ */
 static int check_zero(const unsigned int x[32]) {
 	static const unsigned int zero[32] = {0};
 	static const unsigned int p[32] = {
@@ -159,6 +176,7 @@ static int check_zero(const unsigned int x[32]) {
 	return (check_equal(x, zero) | check_equal(x, p));
 }
 
+/** Copies r to out when b == 0, s when b == 1 */
 static void selectw(ecc_25519_work_t *out, const ecc_25519_work_t *r, const ecc_25519_work_t *s, unsigned int b) {
 	unsigned int j;
 	unsigned int t;
@@ -180,6 +198,7 @@ static void selectw(ecc_25519_work_t *out, const ecc_25519_work_t *r, const ecc_
 	}
 }
 
+/** Copies r to out when b == 0, s when b == 1 */
 static void select(unsigned int out[32], const unsigned int r[32], const unsigned int s[32], unsigned int b) {
 	unsigned int j;
 	unsigned int t;
@@ -192,6 +211,11 @@ static void select(unsigned int out[32], const unsigned int r[32], const unsigne
 	}
 }
 
+/**
+ * Computes the square root of an unpacked integer (in the prime field modulo p)
+ *
+ * If the given integer has no square root, the result is undefined.
+ */
 static void square_root(unsigned int out[32], const unsigned int z[32]) {
 	static const unsigned int minus1[32] = {
 		0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -281,6 +305,7 @@ static void square_root(unsigned int out[32], const unsigned int z[32]) {
 	select(out, z2_252_1, z2_252_1_rho_s, check_equal(t1, minus1));
 }
 
+/** Computes the reciprocal of an unpacked integer (in the prime field modulo p) */
 static void recip(unsigned int out[32], const unsigned int z[32]) {
 	unsigned int z2[32];
 	unsigned int z9[32];
@@ -347,6 +372,7 @@ static void recip(unsigned int out[32], const unsigned int z[32]) {
 	/* 2^255 - 21 */ mult(out, t1, z11);
 }
 
+/** Loads a point with given coordinates into its unpacked representation */
 void ecc_25519_load_xy(ecc_25519_work_t *out, const ecc_int256_t *x, const ecc_int256_t *y) {
 	int i;
 
@@ -359,6 +385,13 @@ void ecc_25519_load_xy(ecc_25519_work_t *out, const ecc_int256_t *x, const ecc_i
 	mult(out->T, out->X, out->Y);
 }
 
+/**
+ * Stores a point's x and y coordinates
+ *
+ * \param x Returns the x coordinate of the point. May be NULL.
+ * \param y Returns the y coordinate of the point. May be NULL.
+ * \param in The unpacked point to store.
+ */
 void ecc_25519_store_xy(ecc_int256_t *x, ecc_int256_t *y, const ecc_25519_work_t *in) {
 	unsigned int X[32], Y[32], Z[32];
 	int i;
@@ -380,6 +413,7 @@ void ecc_25519_store_xy(ecc_int256_t *x, ecc_int256_t *y, const ecc_25519_work_t
 	}
 }
 
+/** Loads a packed point into its unpacked representation */
 void ecc_25519_load_packed(ecc_25519_work_t *out, const ecc_int256_t *in) {
 	static const unsigned int zero[32] = {0};
 	static const unsigned int one[32] = {1};
@@ -410,6 +444,7 @@ void ecc_25519_load_packed(ecc_25519_work_t *out, const ecc_int256_t *in) {
 	mult(out->T, out->X, out->Y);
 }
 
+/** Stores a point into its packed representation */
 void ecc_25519_store_packed(ecc_int256_t *out, const ecc_25519_work_t *in) {
 	ecc_int256_t y;
 
@@ -417,8 +452,10 @@ void ecc_25519_store_packed(ecc_int256_t *out, const ecc_25519_work_t *in) {
 	out->p[31] |= (y.p[0] << 7);
 }
 
+/** The identity element */
 static const ecc_25519_work_t id = {{0}, {1}, {1}, {0}};
 
+/** Checks if a point is the identity element of the Elliptic Curve group */
 int ecc_25519_is_identity(const ecc_25519_work_t *in) {
 	unsigned int Y_Z[32];
 
@@ -428,6 +465,13 @@ int ecc_25519_is_identity(const ecc_25519_work_t *in) {
 	return (check_zero(in->X)&check_zero(Y_Z));
 }
 
+/**
+ * Doubles a point of the Elliptic Curve
+ *
+ * ecc_25519_double(out, in) is equivalent to ecc_25519_add(out, in, in), but faster.
+ *
+ * The same pointers may be used for input and output.
+ */
 void ecc_25519_double(ecc_25519_work_t *out, const ecc_25519_work_t *in) {
 	unsigned int A[32], B[32], C[32], D[32], E[32], F[32], G[32], H[32], t0[32], t1[32], t2[32], t3[32];
 
@@ -449,6 +493,11 @@ void ecc_25519_double(ecc_25519_work_t *out, const ecc_25519_work_t *in) {
 	mult(out->Z, F, G);
 }
 
+/**
+ * Adds two points of the Elliptic Curve
+ *
+ * The same pointers may be used for input and output.
+ */
 void ecc_25519_add(ecc_25519_work_t *out, const ecc_25519_work_t *in1, const ecc_25519_work_t *in2) {
 	unsigned int A[32], B[32], C[32], D[32], E[32], F[32], G[32], H[32], t0[32], t1[32], t2[32], t3[32], t4[32], t5[32];
 
@@ -472,6 +521,11 @@ void ecc_25519_add(ecc_25519_work_t *out, const ecc_25519_work_t *in1, const ecc
 	mult(out->Z, F, G);
 }
 
+/**
+ * Does a scalar multiplication of a point of the Elliptic Curve with an integer
+ *
+ * The same pointers may be used for input and output.
+ **/
 void ecc_25519_scalarmult(ecc_25519_work_t *out, const ecc_int256_t *n, const ecc_25519_work_t *base) {
 	ecc_25519_work_t Q2, Q2p;
 	ecc_25519_work_t cur = id;
@@ -489,6 +543,7 @@ void ecc_25519_scalarmult(ecc_25519_work_t *out, const ecc_int256_t *n, const ec
 	*out = cur;
 }
 
+/** The ec25519 default base */
 static const ecc_25519_work_t default_base = {
 	{0xd4, 0x6b, 0xfe, 0x7f, 0x39, 0xfa, 0x8c, 0x22,
 	 0xe1, 0x96, 0x23, 0xeb, 0x26, 0xb7, 0x8e, 0x6a,
@@ -505,6 +560,11 @@ static const ecc_25519_work_t default_base = {
 	 0x47, 0x4b, 0x4c, 0x81, 0xa6, 0x02, 0xfd, 0x29}
 };
 
+/**
+ * Does a scalar multiplication of the default base point (generator element) of the Elliptic Curve with an integer
+ *
+ * The order of the base point is \f$ 2^{252} + 27742317777372353535851937790883648493 \f$.
+ */
 void ecc_25519_scalarmult_base(ecc_25519_work_t *out, const ecc_int256_t *n) {
 	ecc_25519_scalarmult(out, n, &default_base);
 }
diff --git a/src/ec25519_gf.c b/src/ec25519_gf.c
index ec3b543..d9f9bc1 100644
--- a/src/ec25519_gf.c
+++ b/src/ec25519_gf.c
@@ -24,19 +24,27 @@
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-/*
-  Simple finite field operations on the prime field F_q for
-  q = 2^252 + 27742317777372353535851937790883648493, which
+/** \file
+  Simple finite field operations on the prime field \f$ F_q \f$ for
+  \f$ q = 2^{252} + 27742317777372353535851937790883648493 \f$, which
   is the order of the base point used for ec25519
 */
 
 #include <libuecc/ecc.h>
 
 
+/** Checks if the highest bit of an unsigned integer is set */
 #define IS_NEGATIVE(n) ((int)((((unsigned)n) >> (8*sizeof(n)-1))&1))
+
+/** Performs an arithmetic right shift */
 #define ASR(n,s) (((n) >> s)|(IS_NEGATIVE(n)*((unsigned)-1) << (8*sizeof(n)-s)))
 
 
+/**
+ * The order of the prime field
+ *
+ * The order is \f$ 2^{252} + 27742317777372353535851937790883648493 \f$.
+ */
 const ecc_int256_t ecc_25519_gf_order = {{
 	0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58,
 	0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14,
@@ -44,8 +52,12 @@ const ecc_int256_t ecc_25519_gf_order = {{
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10
 }};
 
+/** An internal alias for \ref ecc_25519_gf_order */
 static const unsigned char *q = ecc_25519_gf_order.p;
 
+/**
+ * Copies the content of r into out if b == 0, the contents of s if b == 1
+ */
 static void select(unsigned char out[32], const unsigned char r[32], const unsigned char s[32], unsigned int b) {
 	unsigned int j;
 	unsigned int t;
@@ -58,6 +70,7 @@ static void select(unsigned char out[32], const unsigned char r[32], const unsig
 	}
 }
 
+/** Checks if an integer is equal to zero (after reduction) */
 int ecc_25519_gf_is_zero(const ecc_int256_t *in) {
 	int i;
 	ecc_int256_t r;
@@ -71,6 +84,11 @@ int ecc_25519_gf_is_zero(const ecc_int256_t *in) {
 	return (((bits-1)>>8) & 1);
 }
 
+/**
+ * Adds two integers as Galois field elements
+ *
+ * The same pointers may be used for input and output.
+ */
 void ecc_25519_gf_add(ecc_int256_t *out, const ecc_int256_t *in1, const ecc_int256_t *in2) {
 	unsigned int j;
 	unsigned int u;
@@ -85,6 +103,11 @@ void ecc_25519_gf_add(ecc_int256_t *out, const ecc_int256_t *in1, const ecc_int2
 	}
 }
 
+/**
+ * Subtracts two integers as Galois field elements
+ *
+ * The same pointers may be used for input and output.
+ */
 void ecc_25519_gf_sub(ecc_int256_t *out, const ecc_int256_t *in1, const ecc_int256_t *in2) {
 	unsigned int j;
 	unsigned int u;
@@ -99,6 +122,7 @@ void ecc_25519_gf_sub(ecc_int256_t *out, const ecc_int256_t *in1, const ecc_int2
 	}
 }
 
+/** Reduces an integer to a unique representation in the range \f$ [0,q-1] \f$ */
 static void reduce(unsigned char a[32]) {
 	unsigned int j;
 	unsigned int nq = a[31] >> 4;
@@ -121,6 +145,11 @@ static void reduce(unsigned char a[32]) {
 	select(a, out1, out2, IS_NEGATIVE(u1));
 }
 
+/**
+ * Reduces an integer to a unique representation in the range \f$ [0,q-1] \f$
+ *
+ * The same pointers may be used for input and output.
+ */
 void ecc_25519_gf_reduce(ecc_int256_t *out, const ecc_int256_t *in) {
 	int i;
 
@@ -130,7 +159,7 @@ void ecc_25519_gf_reduce(ecc_int256_t *out, const ecc_int256_t *in) {
 	reduce(out->p);
 }
 
-/* Montgomery modular multiplication algorithm */
+/** Montgomery modular multiplication algorithm */
 static void montgomery(unsigned char out[32], const unsigned char a[32], const unsigned char b[32]) {
 	unsigned int i, j;
 	unsigned int nq;
@@ -154,7 +183,11 @@ static void montgomery(unsigned char out[32], const unsigned char a[32], const u
 	}
 }
 
-
+/**
+ * Multiplies two integers as Galois field elements
+ *
+ * The same pointers may be used for input and output.
+ */
 void ecc_25519_gf_mult(ecc_int256_t *out, const ecc_int256_t *in1, const ecc_int256_t *in2) {
 	/* 2^512 mod q */
 	static const unsigned char C[32] = {
@@ -177,6 +210,11 @@ void ecc_25519_gf_mult(ecc_int256_t *out, const ecc_int256_t *in1, const ecc_int
 	montgomery(out->p, R, C);
 }
 
+/**
+ * Computes the reciprocal of a Galois field element
+ *
+ * The same pointers may be used for input and output.
+ */
 void ecc_25519_gf_recip(ecc_int256_t *out, const ecc_int256_t *in) {
 	static const unsigned char C[32] = {
 		0x01
@@ -230,6 +268,11 @@ void ecc_25519_gf_recip(ecc_int256_t *out, const ecc_int256_t *in) {
 	montgomery(out->p, R2, C);
 }
 
+/**
+ * Ensures some properties of a Galois field element to make it fit for use as a secret key
+ *
+ * The same pointers may be used for input and output.
+ */
 void ecc_25519_gf_sanitize_secret(ecc_int256_t *out, const ecc_int256_t *in) {
 	int i;