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

+print

Browse Source
This commit is contained in:
jl777
2018-08-18 01:27:42 -11:00
parent 64836d75a0
commit ad4d921071
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cryptoconditions/src/cryptoconditions.c
View File

@@ -232,12 +232,15 @@ int cc_verify(const struct CC *cond, const unsigned char *msg, size_t msgLength,
const unsigned char *condBin, size_t condBinLength, const unsigned char *condBin, size_t condBinLength,
VerifyEval verifyEval, void *evalContext) { VerifyEval verifyEval, void *evalContext) {
unsigned char targetBinary[1000]; unsigned char targetBinary[1000];
fprintf(stderr,"in cc_verify cond.%p msg.%p[%d] dohash.%d condbin.%p[%d]\n",cond,msg,(int32_t)msgLength,doHashMsg,condBin,(int32_t)condBinLength);
const size_t binLength = cc_conditionBinary(cond, targetBinary); const size_t binLength = cc_conditionBinary(cond, targetBinary);
if (0 != memcmp(condBin, targetBinary, binLength)) { if (0 != memcmp(condBin, targetBinary, binLength)) {
fprintf(stderr,"cc_verify error A\n");
return 0; return 0;
} }
if (!cc_ed25519VerifyTree(cond, msg, msgLength)) { if (!cc_ed25519VerifyTree(cond, msg, msgLength)) {
fprintf(stderr,"cc_verify error B\n");
return 0; return 0;
} }
@@ -246,10 +249,12 @@ int cc_verify(const struct CC *cond, const unsigned char *msg, size_t msgLength,
else memcpy(msgHash, msg, 32); else memcpy(msgHash, msg, 32);
if (!cc_secp256k1VerifyTreeMsg32(cond, msgHash)) { if (!cc_secp256k1VerifyTreeMsg32(cond, msgHash)) {
fprintf(stderr,"cc_verify error C\n");
return 0; return 0;
} }
if (!cc_verifyEval(cond, verifyEval, evalContext)) { if (!cc_verifyEval(cond, verifyEval, evalContext)) {
fprintf(stderr,"cc_verify error D\n");
return 0; return 0;
} }
return 1; return 1;

2
src/script/interpreter.cpp
View File

@@ -1326,7 +1326,7 @@ int TransactionSignatureChecker::CheckCryptoCondition(
fprintf(stderr,"checker.%p\n",(TransactionSignatureChecker*)checker); fprintf(stderr,"checker.%p\n",(TransactionSignatureChecker*)checker);
return ((TransactionSignatureChecker*)checker)->CheckEvalCondition(cond); return ((TransactionSignatureChecker*)checker)->CheckEvalCondition(cond);
}; };
fprintf(stderr,"non-checker path\n");
int out = cc_verify(cond, (const unsigned char*)&sighash, 32, 0, int out = cc_verify(cond, (const unsigned char*)&sighash, 32, 0,
condBin.data(), condBin.size(), eval, (void*)this); condBin.data(), condBin.size(), eval, (void*)this);
fprintf(stderr,"out.%d from cc_verify\n",(int32_t)out); fprintf(stderr,"out.%d from cc_verify\n",(int32_t)out);