Merge pull request #1405 from jl777/FSM

FSM

src/cc/dilithium.c

@@ -2718,8 +2718,9 @@ static int cmp_llu(const void *a, const void*b)
 {
     if(*(int64_t *)a < *(int64_t *)b) return -1;
     else if(*(int64_t *)a > *(int64_t *)b) return 1;
-    else if ( (uint64_t)a < (uint64_t)b ) return -1;
-    else return 1;
+    //else if ( (uint64_t)a < (uint64_t)b ) return -1;
+    //else return 1;
+    return(0);
 }
 
 static int64_t median(int64_t *l, size_t llen)

src/cryptoconditions/src/asn/constr_SET_OF.c

@@ -301,9 +301,9 @@ static int _el_buf_cmp(const void *ap, const void *bp) {
 			ret = -1;
 		else if(a->length > b->length)
 			ret = 1;
-        else if ( (uint64_t)a < (uint64_t)b ) // jl777 prevent nondeterminism
-            ret = -1;
-        else ret = 1;
+       // else if ( (uint64_t)a < (uint64_t)b ) // jl777 prevent nondeterminism
+       //     ret = -1;
+       // else ret = 1;
 	}
 
 	return ret;

src/cryptoconditions/src/threshold.c

@@ -39,11 +39,12 @@ static int cmpCostDesc(const void *a, const void *b)
 {
     int retval;
     retval = (int) ( *(unsigned long*)b - *(unsigned long*)a );
-    if ( retval != 0 )
+    return(retval);
+    /*if ( retval != 0 )
         return(retval);
     else if ( (uint64_t)a < (uint64_t)b ) // jl777 prevent nondeterminism
         return(-1);
-    else return(1);
+    else return(1);*/
 }
 
 
@@ -86,9 +87,10 @@ static int cmpConditionBin(const void *a, const void *b) {
 
     if (ret == 0)
         return r0.encoded < r1.encoded ? -1 : 1;
-    else if ( (uint64_t)a < (uint64_t)b ) // jl777 prevent nondeterminism
-        return(-1);
-    else return(1);
+    //else if ( (uint64_t)a < (uint64_t)b ) // jl777 prevent nondeterminism
+    //    return(-1);
+    //else return(1);
+    return(0);
 }
 
 

src/pow/tromp/equi.h

@@ -78,11 +78,12 @@ int compu32(const void *pa, const void *pb) {
     int32_t retval;
   u32 a = *(u32 *)pa, b = *(u32 *)pb;
   retval = a<b ? -1 : a==b ? 0 : +1;
-    if ( retval != 0 )
+    return(retval);
+/*   if ( retval != 0 )
         return(retval);
     else if ( (uint64_t)pa < (uint64_t)pb ) // jl777 prevent nondeterminism
         return(-1);
-    else return(1);
+    else return(1);*/
 }
 
 bool duped(proof prf) {