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

+prints

Browse Source
This commit is contained in:
jl777
2019-02-23 03:18:52 -11:00
parent 54e28a8ebf
commit 99f94425eb
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/cc/dilithium.c
View File

@@ -2426,7 +2426,7 @@ void challenge(poly *c,
}
/*************************************************
* Name: dilithium_keypair
* Name: _dilithium_keypair
*
* Description: Generates public and private key.
*
@@ -2437,7 +2437,7 @@ void challenge(poly *c,
*
* Returns 0 (success)
**************************************************/
int dilithium_keypair(uint8_t *pk, uint8_t *sk) {
int _dilithium_keypair(uint8_t *pk, uint8_t *sk) {
uint32_t i;
uint8_t seedbuf[3*SEEDBYTES];
uint8_t tr[CRHBYTES];
@@ -2488,7 +2488,7 @@ int dilithium_keypair(uint8_t *pk, uint8_t *sk) {
}
/*************************************************
* Name: dilithium_sign
* Name: _dilithium_sign
*
* Description: Compute signed message.
*
@@ -2503,7 +2503,7 @@ int dilithium_keypair(uint8_t *pk, uint8_t *sk) {
*
* Returns 0 (success)
**************************************************/
int dilithium_sign(uint8_t *sm,
int _dilithium_sign(uint8_t *sm,
int32_t *smlen,
const uint8_t *m,
int32_t mlen,
@@ -2613,7 +2613,7 @@ int dilithium_sign(uint8_t *sm,
}
/*************************************************
* Name: dilithium_verify
* Name: _dilithium_verify
*
* Description: Verify signed message.
*
@@ -2626,7 +2626,7 @@ int dilithium_sign(uint8_t *sm,
*
* Returns 0 if signed message could be verified correctly and -1 otherwise
**************************************************/
int dilithium_verify(uint8_t *m,
int _dilithium_verify(uint8_t *m,
int32_t *mlen,
const uint8_t *sm,
int32_t smlen,
@@ -2785,7 +2785,7 @@ int32_t main(void)
tkeygen[i] = cpucycles_start();
#endif
dilithium_keypair(pk, sk); // 1.3
_dilithium_keypair(pk, sk); // 1.3
#ifdef DBENCH
tkeygen[i] = cpucycles_stop() - tkeygen[i] - timing_overhead;
// tred = tadd = tmul = tround = tsample = tpack = tshake = &dummy;
@@ -2793,13 +2793,13 @@ int32_t main(void)
#endif
randombytes(m, MLEN); // 1.27
dilithium_sign(sm, &smlen, m, MLEN, sk); // 7.2
_dilithium_sign(sm, &smlen, m, MLEN, sk); // 7.2
#ifdef DBENCH
tsign[i] = cpucycles_stop() - tsign[i] - timing_overhead;
tverify[i] = cpucycles_start();
#endif
ret = dilithium_verify(m2, &mlen, sm, smlen, pk);
ret = _dilithium_verify(m2, &mlen, sm, smlen, pk);
#ifdef DBENCH
tverify[i] = cpucycles_stop() - tverify[i] - timing_overhead;
#endif
@@ -2842,7 +2842,7 @@ int32_t main(void)
UniValue dilithium_keypair(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
{
UniValue result(UniValue::VOBJ); uint8_t pk[CRYPTO_PUBLICKEYBYTES],sk[CRYPTO_SECRETKEYBYTES]; char str[CRYPTO_SECRETKEYBYTES*2+1]; int32_t i;
dilithium_keypair(pk,sk);
_dilithium_keypair(pk,sk);
for (i=0; i<sizeof(pk); i++)
sprintf(&str[i<<1],"%02x",pk[i]);
str[i<<1] = 0;
@@ -2858,6 +2858,8 @@ UniValue dilithium_keypair(uint64_t txfee,struct CCcontract_info *cp,cJSON *para
UniValue dilithium_sign(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
{
UniValue result(UniValue::VOBJ);
_dilithium_sign(sm, &smlen, m, MLEN, sk); // 7.2
return(result);
}

9
src/cc/rogue_rpc.cpp
View File

@@ -839,6 +839,8 @@ char *rogue_extractgame(int32_t makefiles,char *str,int32_t *numkeysp,std::vecto
roguepk = GetUnspendable(cp,0);
*numkeysp = 0;
seed = 0;
num = numkeys = 0;
playertxid = zeroid;
if ( (err= rogue_isvalidgame(cp,gameheight,gametx,buyin,maxplayers,gametxid,0)) == 0 )
{
if ( rogue_findbaton(cp,playertxid,&keystrokes,numkeys,regslot,playerdata,batontxid,batonvout,batonvalue,batonht,gametxid,gametx,maxplayers,rogueaddr,numplayers,symbol,pname) == 0 )
@@ -852,7 +854,7 @@ char *rogue_extractgame(int32_t makefiles,char *str,int32_t *numkeysp,std::vecto
for (i=0; i<playerdata.size(); i++)
((uint8_t *)&P)[i] = playerdata[i];
}
if ( keystrokes != 0 )
if ( keystrokes != 0 && numkeys != 0 )
{
if ( makefiles != 0 )
{
@@ -885,11 +887,12 @@ char *rogue_extractgame(int32_t makefiles,char *str,int32_t *numkeysp,std::vecto
}
sprintf(str,"extracted $$$gold.%d hp.%d strength.%d/%d level.%d exp.%d dl.%d\n",endP.gold,endP.hitpoints,endP.strength&0xffff,endP.strength>>16,endP.level,endP.experience,endP.dungeonlevel);
fprintf(stderr,"%s\n",str);
*numkeysp = numkeys;
return(keystrokes);
} else num = 0;
} else fprintf(stderr,"extractgame: couldnt find baton\n");
} else fprintf(stderr,"extractgame: invalid game\n");
*numkeysp = numkeys;
return(keystrokes);
return(0);
}
UniValue rogue_extract(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)