DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #1406 from jl777/dev

Browse Source 
Dev
This commit is contained in:
jl777
2019-04-11 20:06:30 -11:00
committed by GitHub
parent cf6dd0a8f9 3069976877
commit db3b3de75d
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cc/dilithium.c
View File

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

6
src/cryptoconditions/src/asn/constr_SET_OF.c
View File

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

12
src/cryptoconditions/src/threshold.c
View File

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

5
src/pow/tromp/equi.h
View File

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