Merge branch 'main' into amore

relic-toolkit · Apr 23, 2024 · 7156953 · 7156953
2 parents f3a7826 + b02e550
commit 7156953
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/gmp.yml b/.github/workflows/gmp.yml
@@ -56,12 +56,12 @@ jobs:
         with:
           msystem: MINGW64
           install: >-
+            gmp
+            gmp-devel
             git
             base-devel
             gcc
             cmake
-            gmp
-            gmp-devel
           update: true
 
       - name: Run CMake (MingW)

diff --git a/src/ep/relic_ep_curve.c b/src/ep/relic_ep_curve.c
@@ -173,7 +173,7 @@ static void ep_curve_set_map(void) {
 
 		/* If curve is not supersingular, precompute and store sqrt(-3)
 		 * neeed for hashing using the SwiftEC algorithm and variants. */
-		if (!ep_curve_is_super()) {
+		if (!ep_curve_is_super() && (ep_curve_opt_a() == RLC_ZERO || ep_curve_opt_b() == RLC_ZERO)) {
 			fp_set_dig(c4, 3);
 			fp_neg(c4, c4);
 			if (!fp_srt(c4, c4)) {
@@ -574,4 +574,5 @@ int ep_curve_frdim(void) {
 			return 16;
 			break;
 	}
-}
+	return 0;
+}
diff --git a/src/fp/relic_fp_param.c b/src/fp/relic_fp_param.c
@@ -46,7 +46,7 @@
 /**
  * Random prime modulus for the Brainpool P256r1.
  */
-#define STR_P256	"AA9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377"
+#define STR_P256	"A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377"
 
 #elif FP_PRIME == 511
 /**