diff --git a/src/cryptoconditions b/src/cryptoconditions index 6e34f2e32..89325dc29 160000 --- a/src/cryptoconditions +++ b/src/cryptoconditions @@ -1 +1 @@ -Subproject commit 6e34f2e325516a08ea11e847f661bf6a8e524d38 +Subproject commit 89325dc29391f473da75503105a4946f2f96fb76 diff --git a/src/komodo_cryptoconditions.h b/src/komodo_cryptoconditions.h new file mode 100644 index 000000000..d5e643c91 --- /dev/null +++ b/src/komodo_cryptoconditions.h @@ -0,0 +1,8 @@ + + +/* + * Method stub for aux conditions. Unimplemented, thus fails if an aux condition is encountered. + */ +int komodoCCAux(CC *cond, void *context) { + return 0; +} diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index f65581068..94727cbca 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -14,6 +14,7 @@ #include "script/script.h" #include "uint256.h" #include "cryptoconditions/include/cryptoconditions.h" +#include "komodo_cryptoconditions.h" using namespace std; @@ -963,8 +964,8 @@ bool EvalScript(vector >& stack, const CScript& script, un // TODO: Should nHashType be hardcoded? // Other types use the last byte of the signature char *msg = (char*) checker.GetMessage(script, SIGHASH_ALL).begin(); -; - bool fSuccess = cc_verify(cond, msg, 32, condBin, vchCondition.size()); + + bool fSuccess = cc_verify(cond, msg, 32, condBin, vchCondition.size(), komodoCCAux, NULL); popstack(stack); popstack(stack);