fixup! move musig_ge_{to,from} to group.h

Author: jonasnick

src/group.h

@@ -182,6 +182,14 @@ static void secp256k1_ge_to_bytes(unsigned char *buf, secp256k1_ge *a);
  *  provided buffer correctly encodes a group element. */
 static void secp256k1_ge_from_bytes(secp256k1_ge *r, const unsigned char *buf);
 
+/** Convert a group element (that is allowed to be infinity) to a 64-byte
+ *  array. The output array is platform-dependent. */
+static void secp256k1_ge_to_bytes_ext(unsigned char *data, secp256k1_ge *ge);
+
+/** Convert a 64-byte array into a group element. This function assumes that the
+ *  provided buffer is the output of secp256k1_ge_to_bytes_ext. */
+static void secp256k1_ge_from_bytes_ext(secp256k1_ge *ge, const unsigned char *data);
+
 /** Determine if a point (which is assumed to be on the curve) is in the correct (sub)group of the curve.
  *
  * In normal mode, the used group is secp256k1, which has cofactor=1 meaning that every point on the curve is in the

src/group_impl.h

@@ -963,4 +963,21 @@ static void secp256k1_ge_from_bytes(secp256k1_ge *r, const unsigned char *buf) {
     secp256k1_ge_from_storage(r, &s);
 }
 
+static void secp256k1_ge_to_bytes_ext(unsigned char *data, secp256k1_ge *ge) {
+    if (secp256k1_ge_is_infinity(ge)) {
+        memset(data, 0, 64);
+    } else {
+        secp256k1_ge_to_bytes(data, ge);
+    }
+}
+
+static void secp256k1_ge_from_bytes_ext(secp256k1_ge *ge, const unsigned char *data) {
+    unsigned char zeros[64] = { 0 };
+    if (secp256k1_memcmp_var(data, zeros, sizeof(zeros)) == 0) {
+        secp256k1_ge_set_infinity(ge);
+    } else {
+        secp256k1_ge_from_bytes(ge, data);
+    }
+}
+
 #endif /* SECP256K1_GROUP_IMPL_H */

src/modules/musig/keyagg.h

@@ -27,12 +27,6 @@ typedef struct {
     int parity_acc;
 } secp256k1_keyagg_cache_internal;
 
-/* musig_ge_to_bytes_ext and musig_ge_from_bytes_ext are identical to ge_save and ge_load
- * except that they allow saving and loading the point at infinity */
-static void secp256k1_musig_ge_to_bytes_ext(unsigned char *data, secp256k1_ge *ge);
-
-static void secp256k1_musig_ge_from_bytes_ext(secp256k1_ge *ge, const unsigned char *data);
-
 static int secp256k1_keyagg_cache_load(const secp256k1_context* ctx, secp256k1_keyagg_cache_internal *cache_i, const secp256k1_musig_keyagg_cache *cache);
 
 static void secp256k1_musig_keyaggcoef(secp256k1_scalar *r, const secp256k1_keyagg_cache_internal *cache_i, secp256k1_ge *pk);

src/modules/musig/keyagg_impl.h

@@ -17,23 +17,6 @@
 #include "../../hash.h"
 #include "../../util.h"
 
-static void secp256k1_musig_ge_to_bytes_ext(unsigned char *data, secp256k1_ge *ge) {
-    if (secp256k1_ge_is_infinity(ge)) {
-        memset(data, 0, 64);
-    } else {
-        secp256k1_ge_to_bytes(data, ge);
-    }
-}
-
-static void secp256k1_musig_ge_from_bytes_ext(secp256k1_ge *ge, const unsigned char *data) {
-    unsigned char zeros[64] = { 0 };
-    if (secp256k1_memcmp_var(data, zeros, sizeof(zeros)) == 0) {
-        secp256k1_ge_set_infinity(ge);
-    } else {
-        secp256k1_ge_from_bytes(ge, data);
-    }
-}
-
 static const unsigned char secp256k1_musig_keyagg_cache_magic[4] = { 0xf4, 0xad, 0xbb, 0xdf };
 
 /* A keyagg cache consists of
@@ -52,7 +35,7 @@ static void secp256k1_keyagg_cache_save(secp256k1_musig_keyagg_cache *cache, sec
     ptr += 4;
     secp256k1_ge_to_bytes(ptr, &cache_i->pk);
     ptr += 64;
-    secp256k1_musig_ge_to_bytes_ext(ptr, &cache_i->second_pk);
+    secp256k1_ge_to_bytes_ext(ptr, &cache_i->second_pk);
     ptr += 64;
     memcpy(ptr, cache_i->pk_hash, 32);
     ptr += 32;
@@ -67,7 +50,7 @@ static int secp256k1_keyagg_cache_load(const secp256k1_context* ctx, secp256k1_k
     ptr += 4;
     secp256k1_ge_from_bytes(&cache_i->pk, ptr);
     ptr += 64;
-    secp256k1_musig_ge_from_bytes_ext(&cache_i->second_pk, ptr);
+    secp256k1_ge_from_bytes_ext(&cache_i->second_pk, ptr);
     ptr += 64;
     memcpy(cache_i->pk_hash, ptr, 32);
     ptr += 32;

src/modules/musig/session_impl.h

@@ -114,7 +114,7 @@ static void secp256k1_musig_aggnonce_save(secp256k1_musig_aggnonce* nonce, secp2
     int i;
     memcpy(&nonce->data[0], secp256k1_musig_aggnonce_magic, 4);
     for (i = 0; i < 2; i++) {
-        secp256k1_musig_ge_to_bytes_ext(&nonce->data[4 + 64*i], &ge[i]);
+        secp256k1_ge_to_bytes_ext(&nonce->data[4 + 64*i], &ge[i]);
     }
 }
 
@@ -123,7 +123,7 @@ static int secp256k1_musig_aggnonce_load(const secp256k1_context* ctx, secp256k1
 
     ARG_CHECK(secp256k1_memcmp_var(&nonce->data[0], secp256k1_musig_aggnonce_magic, 4) == 0);
     for (i = 0; i < 2; i++) {
-        secp256k1_musig_ge_from_bytes_ext(&ge[i], &nonce->data[4 + 64*i]);
+        secp256k1_ge_from_bytes_ext(&ge[i], &nonce->data[4 + 64*i]);
     }
     return 1;
 }