Remove some dead code.

gmaxwell · gmaxwell · commit 9f6993f37091 · 2015-09-28T05:43:51.000Z
diff --git a/src/group.h b/src/group.h
@@ -40,9 +40,6 @@ typedef struct {
 
 #define SECP256K1_GE_STORAGE_CONST_GET(t) SECP256K1_FE_STORAGE_CONST_GET(t.x), SECP256K1_FE_STORAGE_CONST_GET(t.y)
 
-/** Set a group element equal to the point at infinity */
-static void secp256k1_ge_set_infinity(secp256k1_ge *r);
-
 /** Set a group element equal to the point with given X and Y coordinates */
 static void secp256k1_ge_set_xy(secp256k1_ge *r, const secp256k1_fe *x, const secp256k1_fe *y);
 
@@ -79,9 +76,6 @@ static void secp256k1_ge_globalz_set_table_gej(size_t len, secp256k1_ge *r, secp
 /** Set a group element (jacobian) equal to the point at infinity. */
 static void secp256k1_gej_set_infinity(secp256k1_gej *r);
 
-/** Set a group element (jacobian) equal to the point with given X and Y coordinates. */
-static void secp256k1_gej_set_xy(secp256k1_gej *r, const secp256k1_fe *x, const secp256k1_fe *y);
-
 /** Set a group element (jacobian) equal to another which is given in affine coordinates. */
 static void secp256k1_gej_set_ge(secp256k1_gej *r, const secp256k1_ge *a);
 
diff --git a/src/group_impl.h b/src/group_impl.h
@@ -33,10 +33,6 @@ static void secp256k1_ge_set_gej_zinv(secp256k1_ge *r, const secp256k1_gej *a, c
     r->infinity = a->infinity;
 }
 
-static void secp256k1_ge_set_infinity(secp256k1_ge *r) {
-    r->infinity = 1;
-}
-
 static void secp256k1_ge_set_xy(secp256k1_ge *r, const secp256k1_fe *x, const secp256k1_fe *y) {
     r->infinity = 0;
     r->x = *x;
@@ -156,13 +152,6 @@ static void secp256k1_gej_set_infinity(secp256k1_gej *r) {
     secp256k1_fe_set_int(&r->z, 0);
 }
 
-static void secp256k1_gej_set_xy(secp256k1_gej *r, const secp256k1_fe *x, const secp256k1_fe *y) {
-    r->infinity = 0;
-    r->x = *x;
-    r->y = *y;
-    secp256k1_fe_set_int(&r->z, 1);
-}
-
 static void secp256k1_gej_clear(secp256k1_gej *r) {
     r->infinity = 0;
     secp256k1_fe_clear(&r->x);
diff --git a/src/scalar_4x64_impl.h b/src/scalar_4x64_impl.h
@@ -912,6 +912,7 @@ static void secp256k1_scalar_sqr(secp256k1_scalar *r, const secp256k1_scalar *a)
     secp256k1_scalar_reduce_512(r, l);
 }
 
+#ifdef USE_ENDOMORPHISM
 static void secp256k1_scalar_split_128(secp256k1_scalar *r1, secp256k1_scalar *r2, const secp256k1_scalar *a) {
     r1->d[0] = a->d[0];
     r1->d[1] = a->d[1];
@@ -922,6 +923,7 @@ static void secp256k1_scalar_split_128(secp256k1_scalar *r1, secp256k1_scalar *r
     r2->d[2] = 0;
     r2->d[3] = 0;
 }
+#endif
 
 SECP256K1_INLINE static int secp256k1_scalar_eq(const secp256k1_scalar *a, const secp256k1_scalar *b) {
     return ((a->d[0] ^ b->d[0]) | (a->d[1] ^ b->d[1]) | (a->d[2] ^ b->d[2]) | (a->d[3] ^ b->d[3])) == 0;

Original file line number	Diff line number	Diff line change
`@@ -912,6 +912,7 @@ static void secp256k1_scalar_sqr(secp256k1_scalar r, const secp256k1_scalar a)`
`912`	`912`	`secp256k1_scalar_reduce_512(r, l);`
`913`	`913`	`}`
`914`	`914`
	`915`	`+#ifdef USE_ENDOMORPHISM`
`915`	`916`	`static void secp256k1_scalar_split_128(secp256k1_scalar r1, secp256k1_scalar r2, const secp256k1_scalar *a) {`
`916`	`917`	`r1->d[0] = a->d[0];`
`917`	`918`	`r1->d[1] = a->d[1];`
`@@ -922,6 +923,7 @@ static void secp256k1_scalar_split_128(secp256k1_scalar r1, secp256k1_scalar r`
`922`	`923`	`r2->d[2] = 0;`
`923`	`924`	`r2->d[3] = 0;`
`924`	`925`	`}`
	`926`	`+#endif`
`925`	`927`
`926`	`928`	`SECP256K1_INLINE static int secp256k1_scalar_eq(const secp256k1_scalar a, const secp256k1_scalar b) {`
`927`	`929`	`return ((a->d[0] ^ b->d[0]) \| (a->d[1] ^ b->d[1]) \| (a->d[2] ^ b->d[2]) \| (a->d[3] ^ b->d[3])) == 0;`