This commit is contained in:
@@ -2940,11 +2940,17 @@ int32_t dilithium_Qmsghash(uint8_t *msg,CTransaction tx,std::vector<uint256> vou
|
|||||||
{
|
{
|
||||||
vintxids.push_back(tx.vin[i].prevout.hash);
|
vintxids.push_back(tx.vin[i].prevout.hash);
|
||||||
vinprevns.push_back(tx.vin[i].prevout.n);
|
vinprevns.push_back(tx.vin[i].prevout.n);
|
||||||
|
fprintf(stderr,"%s/v%d ",tx.vin[i].prevout.hash.GetHex().c_str(),tx.vin[i].prevout.n);
|
||||||
}
|
}
|
||||||
for (i=0; i<numvouts-1; i++)
|
for (i=0; i<numvouts-1; i++)
|
||||||
|
{
|
||||||
|
char destaddr[64];
|
||||||
|
Getscriptaddress(destaddr,tx.vout[i].scriptPubKey);
|
||||||
|
fprintf(stderr,"%s %.8f ",destaddr,(double)tx.vout[i].nValue/COIN);
|
||||||
vouts.push_back(tx.vout[i]);
|
vouts.push_back(tx.vout[i]);
|
||||||
|
}
|
||||||
data << E_MARSHAL(ss << vintxids << vinprevns << vouts << voutpubtxids);
|
data << E_MARSHAL(ss << vintxids << vinprevns << vouts << voutpubtxids);
|
||||||
//fprintf(stderr,"size of data.%d\n",(int32_t)data.size());
|
fprintf(stderr,"numvins.%d numvouts.%d size of data.%d\n",numvins,numvouts,(int32_t)data.size());
|
||||||
hash = Hash(data.begin(),data.end());
|
hash = Hash(data.begin(),data.end());
|
||||||
memcpy(msg,&hash,sizeof(hash));
|
memcpy(msg,&hash,sizeof(hash));
|
||||||
return(0);
|
return(0);
|
||||||
@@ -3368,6 +3374,9 @@ UniValue dilithium_Qsend(uint64_t txfee,struct CCcontract_info *cp,cJSON *params
|
|||||||
}
|
}
|
||||||
tx = mtx;
|
tx = mtx;
|
||||||
dilithium_Qmsghash(msg,tx,voutpubtxids);
|
dilithium_Qmsghash(msg,tx,voutpubtxids);
|
||||||
|
for (i=0; i<32; i++)
|
||||||
|
fprintf(stderr,"%02x",msg[i]);
|
||||||
|
fprintf(stderr," msg\n");
|
||||||
sig.resize(32+CRYPTO_BYTES);
|
sig.resize(32+CRYPTO_BYTES);
|
||||||
if ( dilithium_bigpubget(handle,destpub33,pk2,mypubtxid) < 0 )
|
if ( dilithium_bigpubget(handle,destpub33,pk2,mypubtxid) < 0 )
|
||||||
return(cclib_error(result,"couldnt get bigpub"));
|
return(cclib_error(result,"couldnt get bigpub"));
|
||||||
@@ -3432,7 +3441,15 @@ bool dilithium_Qvalidate(struct CCcontract_info *cp,int32_t height,Eval *eval,co
|
|||||||
if ( _dilithium_verify(msg2,&mlen,&sig[0],smlen,pk) < 0 )
|
if ( _dilithium_verify(msg2,&mlen,&sig[0],smlen,pk) < 0 )
|
||||||
return eval->Invalid("failed dilithium verify");
|
return eval->Invalid("failed dilithium verify");
|
||||||
else if ( mlen != 32 || memcmp(msg,msg2,32) != 0 )
|
else if ( mlen != 32 || memcmp(msg,msg2,32) != 0 )
|
||||||
|
{
|
||||||
|
for (i=0; i<32; i++)
|
||||||
|
fprintf(stderr,"%02x",msg[i]);
|
||||||
|
fprintf(stderr," vs ");
|
||||||
|
for (i=0; i<mlen; i++)
|
||||||
|
fprintf(stderr,"%02x",msg32[i]);
|
||||||
|
fprintf(stderr,"mlen.%d\n");
|
||||||
return eval->Invalid("failed dilithium msg verify");
|
return eval->Invalid("failed dilithium msg verify");
|
||||||
|
}
|
||||||
else return true;
|
else return true;
|
||||||
}
|
}
|
||||||
} else return eval->Invalid("failed decode Qsend");
|
} else return eval->Invalid("failed decode Qsend");
|
||||||
|
|||||||
@@ -131,21 +131,21 @@ int32_t flushkeystrokes_local(struct rogue_state *rs,int32_t waitflag)
|
|||||||
rs->num = 0;
|
rs->num = 0;
|
||||||
retflag = 0;
|
retflag = 0;
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
if ( (fp= fopen("savefile","wb")) != 0 )
|
/*if ( (fp= fopen("savefile","wb")) != 0 )
|
||||||
{
|
{
|
||||||
//save_file(rs,fp,0);
|
save_file(rs,fp,0);
|
||||||
if ( 0 && (fp= fopen("savefile","rb")) != 0 )
|
if ( 0 && (fp= fopen("savefile","rb")) != 0 )
|
||||||
{
|
{
|
||||||
for (i=0; i<0x150; i++)
|
for (i=0; i<0x150; i++)
|
||||||
fprintf(stderr,"%02x",fgetc(fp));
|
fprintf(stderr,"%02x",fgetc(fp));
|
||||||
fprintf(stderr," first part rnd.%d\n",rnd(1000));
|
fprintf(stderr," first part rnd.%d\n",rnd(1000));
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
}
|
}*/
|
||||||
roguefname(fname,rs->seed,rs->counter+1);
|
roguefname(fname,rs->seed,rs->counter+1);
|
||||||
if ( (fp= fopen(fname,"wb")) != 0 ) // truncate next file
|
if ( (fp= fopen(fname,"wb")) != 0 ) // truncate next file
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
//fprintf(stderr,"savefile <- %s retflag.%d\n",fname,retflag);
|
//fprintf(stderr,"savefile <- %s retflag.%d\n",fname,retflag);
|
||||||
}
|
//}
|
||||||
} else fprintf(stderr,"error writing (%s)\n",fname);
|
} else fprintf(stderr,"error writing (%s)\n",fname);
|
||||||
} else fprintf(stderr,"error creating (%s)\n",fname);
|
} else fprintf(stderr,"error creating (%s)\n",fname);
|
||||||
return(retflag);
|
return(retflag);
|
||||||
|
|||||||
Reference in New Issue
Block a user