Tests passing

Author: mariano54

contrib/relic/include/relic_label.h

@@ -42,6 +42,7 @@
 /* Macro definitions                                                          */
 /*============================================================================*/
 
+#ifdef LABEL
 
 #undef first_ctx
 #define first_ctx     PREFIX(first_ctx)
@@ -2661,6 +2662,6 @@
 #define md_xmd_sh384 	PREFIX(md_xmd_sh384)
 #define md_xmd_sh512 	PREFIX(md_xmd_sh512)
 
-// #endif /* LABEL */
+#endif /* LABEL */
 
 #endif /* !RLC_LABEL_H */

contrib/relic/src/ep/relic_ep_param.c

@@ -652,7 +652,7 @@
 	RLC_GET(str, CURVE##_S3, sizeof(CURVE##_S3));							\
 	bn_read_str(s3, str, strlen(str), 16);									\
 	RLC_GET(str, CURVE##_S32, sizeof(CURVE##_S32));							\
-	bn_read_str(s32, str, strlen(str), 16);									\
+	bn_read_str(s32, str, strlen(str), 16);
 
 /**
  * Assigns a set of parameters for an elliptic curve with endomorphisms.

contrib/relic/src/epx/relic_ep2_curve.c

@@ -286,6 +286,10 @@
 	bn_read_str(r, str, strlen(str), 16);									\
 	RLC_GET(str, CURVE##_H, sizeof(CURVE##_H));								\
 	bn_read_str(h, str, strlen(str), 16);									\
+	RLC_GET(str, CURVE##_S3, sizeof(CURVE##_S3));							\
+	bn_read_str(s3, str, strlen(str), 16);									\
+	RLC_GET(str, CURVE##_S32, sizeof(CURVE##_S32));							\
+	bn_read_str(s32, str, strlen(str), 16);									\
 	RLC_GET(str, CURVE##_MAPU0, sizeof(CURVE##_MAPU0));						\
 	fp_read_str(u[0], str, strlen(str), 16);								\
 	RLC_GET(str, CURVE##_MAPU1, sizeof(CURVE##_MAPU1));						\

contrib/relic/src/fp/relic_fp_inv.c

@@ -562,14 +562,14 @@ void fp_inv_exgcd_bn(bn_t c, const bn_t u1, const bn_t p) {
 	bn_null(q);
 	bn_null(r);
 	bn_null(u);
-
 	TRY {
 		bn_new(v);
 		bn_new(g1);
 		bn_new(g2);
 		bn_new(q);
 		bn_new(r);
 		bn_new(u);
+		bn_copy(u, u1);
 
 		/* u = a, v = p, g1 = 1, g2 = 0. */
 		bn_copy(v, p);

src/privatekey.cpp

@@ -214,9 +214,7 @@ InsecureSignature PrivateKey::SignInsecure(const uint8_t *msg, size_t len) const
 InsecureSignature PrivateKey::SignInsecurePrehashed(const uint8_t *messageHash) const {
     g2_t sig, point;
 
-    // std::cout << "Msg: " << Util::HexStr(messageHash, 32) << std::endl;
     g2_map(point, messageHash, BLS::MESSAGE_HASH_LEN, 0);
-    // std::cout << "Mapped" << InsecureSignature::FromG2(&point) << std::endl;
     g2_mul(sig, point, *keydata);
 
     return InsecureSignature::FromG2(&sig);