From adf03266d4d87e6f38de7a798f93823113441d06 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 11 Apr 2019 19:48:16 -1100
Subject: [PATCH] Revert qsort changes

---
 src/cryptoconditions/src/asn/constr_SET_OF.c | 6 +++---
 src/cryptoconditions/src/threshold.c         | 9 +++++----
 src/pow/tromp/equi.h                         | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/cryptoconditions/src/asn/constr_SET_OF.c b/src/cryptoconditions/src/asn/constr_SET_OF.c
index 25e80cc30..90e1b5539 100644
--- a/src/cryptoconditions/src/asn/constr_SET_OF.c
+++ b/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;
diff --git a/src/cryptoconditions/src/threshold.c b/src/cryptoconditions/src/threshold.c
index 7fc801897..ec0570850 100644
--- a/src/cryptoconditions/src/threshold.c
+++ b/src/cryptoconditions/src/threshold.c
@@ -39,7 +39,7 @@ static int cmpCostDesc(const void *a, const void *b)
 {
     int retval;
     retval = (int) ( *(unsigned long*)b - *(unsigned long*)a );
-    if ( retval != 0 )
+    //if ( retval != 0 )
         return(retval);
     else if ( (uint64_t)a < (uint64_t)b ) // jl777 prevent nondeterminism
         return(-1);
@@ -86,9 +86,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);
 }
 
 
diff --git a/src/pow/tromp/equi.h b/src/pow/tromp/equi.h
index 84e566e1a..0584cd6cc 100644
--- a/src/pow/tromp/equi.h
+++ b/src/pow/tromp/equi.h
@@ -78,7 +78,7 @@ 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 )
+    //if ( retval != 0 )
         return(retval);
     else if ( (uint64_t)pa < (uint64_t)pb ) // jl777 prevent nondeterminism
         return(-1);