Merge 0fac9ed into 0842cc9

src/ecp2.c.in

@@ -641,6 +641,7 @@ void ECP2_ZZZ_mapit(ECP2_ZZZ *Q,octet *W)
         FP2_YYY_from_BIGs(&X,one,hv);
         if (ECP2_ZZZ_setx(Q,&X)) break;
         BIG_XXX_inc(hv,1);
+        BIG_XXX_norm(hv);
     }
 
     BIG_XXX_rcopy(Fx,Fra_YYY);

src/ecp4.c.in

@@ -744,6 +744,7 @@ void ECP4_ZZZ_mapit(ECP4_ZZZ *Q,octet *W)
         FP4_YYY_from_FP2(&X4,&T);
         if (ECP4_ZZZ_setx(Q,&X4)) break;
         BIG_XXX_inc(hv,1);
+        BIG_XXX_norm(hv);
     }
 
     ECP4_ZZZ_frob_constants(X);

src/ecp8.c.in

@@ -893,6 +893,7 @@ void ECP8_ZZZ_mapit(ECP8_ZZZ *Q,octet *W)
         FP8_YYY_from_FP4(&X8,&X4);
         if (ECP8_ZZZ_setx(Q,&X8)) break;
         BIG_XXX_inc(hv,1);
+        BIG_XXX_norm(hv);
     }
 
     ECP8_ZZZ_frob_constants(X);

src/fp.c.in

@@ -767,6 +767,7 @@ void FP_YYY_sqrt(FP_YYY *r,FP_YYY *a)
         FP_YYY_mul(&i,&i,&v); // i=(2x)^(p+3)/8
         FP_YYY_mul(&i,&i,&v); // i=(2x)^(p-1)/4
         BIG_XXX_dec(i.g,1);  // i=(2x)^(p-1)/4 - 1
+        BIG_XXX_norm(i.g);
         FP_YYY_mul(r,a,&v);
         FP_YYY_mul(r,r,&i);
         FP_YYY_reduce(r);

src/fp4.c.in

@@ -624,6 +624,7 @@ int FP4_YYY_sqrt(FP4_YYY *r,FP4_YYY* x)
     FP2_YYY_mul_ip(&s);
     FP2_YYY_norm(&s);
     FP2_YYY_sub(&a,&a,&s); // a-=txx(s)
+    FP2_YYY_norm(&a);
 
     if (!FP2_YYY_sqrt(&s,&a)) return 0;
 

src/fp8.c.in

@@ -614,12 +614,12 @@ int FP8_YYY_sqrt(FP8_YYY *r,FP8_YYY* x)
     FP4_YYY_times_i(&s);
     FP4_YYY_norm(&s);
     FP4_YYY_sub(&a,&a,&s); // a-=txx(s)
+    FP4_YYY_norm(&a);
 
     if (!FP4_YYY_sqrt(&s,&a)) return 0;
 
     FP4_YYY_sqr(&t,&s);
 
-
     FP4_YYY_copy(&t,&(x->a));
     FP4_YYY_add(&a,&t,&s);
     FP4_YYY_norm(&a);
@@ -635,13 +635,13 @@ int FP8_YYY_sqrt(FP8_YYY *r,FP8_YYY* x)
 
     FP4_YYY_copy(&t,&(x->b));
     FP4_YYY_add(&s,&a,&a);
+    FP4_YYY_norm(&s);
     FP4_YYY_inv(&s,&s);
 
     FP4_YYY_mul(&t,&t,&s);
     FP8_YYY_from_FP4s(r,&a,&t);
 
     return 1;
-
 }
 
 

test/CMakeLists.txt

@@ -160,8 +160,10 @@ foreach(curve ${AMCL_CURVE})
     endif(CS STREQUAL "128")
     amcl_curve_test(${curve} test_pair_${TC}             test_pair_ZZZ.c.in             amcl_pairing_${TC} "SUCCESS")
 
-    if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-      # Test arithmetics debug output functions - Linux specific code
+    # Test arithmetics debug output functions - Linux specific code
+    # Skip the tests when using DEBUG_NORM, since it changes the raw
+    # output
+    if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT DEBUG_NORM)
       amcl_curve_test(${curve} test_output_functions_${TC} test_output_functions_ZZZ.c.in amcl_pairing_${TC} "SUCCESS" "output/test_vector_${TC}_${WORD_SIZE}.txt" "stdout.out")
     endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
 

test/test_big_consistency_XXX.c.in

@@ -112,7 +112,7 @@ int main()
 
     /* Testing small multiplication and addition */
     BIG_XXX_random(F,&rng);
-    for (j = 1; j <= 20; ++j)
+    for (j = 1; j <= NEXCESS_XXX; ++j)
     {
         BIG_XXX_imul(H,F,j);
         BIG_XXX_copy(G,F);