@ -628,12 +628,18 @@ BOOST_AUTO_TEST_CASE(script_build)
@@ -628,12 +628,18 @@ BOOST_AUTO_TEST_CASE(script_build)
bad . push_back ( TestBuilder ( CScript ( ) < < OP_2 < < ToByteVector ( keys . pubkey1C ) < < ToByteVector ( keys . pubkey1C ) < < OP_2 < < OP_CHECKMULTISIG ,
" 2-of-2 with two identical keys and sigs pushed using OP_DUP " , SCRIPT_VERIFY_SIGPUSHONLY
) . Num ( 0 ) . PushSig ( keys . key1 ) . Add ( CScript ( ) < < OP_DUP ) . ScriptError ( SCRIPT_ERR_SIG_PUSHONLY ) ) ;
good . push_back ( TestBuilder ( CScript ( ) < < ToByteVector ( keys . pubkey2C ) < < OP_CHECKSIG ,
" P2SH(P2PK) with non-push scriptSig but no P2SH or SIGPUSHONLY " , 0 , true
) . PushSig ( keys . key2 ) . Add ( CScript ( ) < < OP_NOP8 ) . PushRedeem ( ) ) ;
good . push_back ( TestBuilder ( CScript ( ) < < ToByteVector ( keys . pubkey2C ) < < OP_CHECKSIG ,
" P2PK with non-push scriptSig but with P2SH validation " , 0
) . PushSig ( keys . key2 ) . Add ( CScript ( ) < < OP_NOP8 ) ) ;
bad . push_back ( TestBuilder ( CScript ( ) < < ToByteVector ( keys . pubkey2C ) < < OP_CHECKSIG ,
" P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY " , 0
) . PushSig ( keys . key2 ) . PushRedeem ( ) . ScriptError ( SCRIPT_ERR_EVAL_FALSE ) ) ;
" P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY " , SCRIPT_VERIFY_P2SH , true
) . PushSig ( keys . key2 ) . Add ( CScript ( ) < < OP_NOP8 ) . PushRedeem ( ) . ScriptError ( SCRIPT_ERR_SIG_PUSHONLY ) ) ;
bad . push_back ( TestBuilder ( CScript ( ) < < ToByteVector ( keys . pubkey2C ) < < OP_CHECKSIG ,
" P2SH(P2PK) with non-push scriptSig " , SCRIPT_VERIFY_SIGPUSHONLY
) . PushSig ( keys . key2 ) . PushRedeem ( ) . ScriptError ( SCRIPT_ERR_EVAL_FALSE ) ) ;
" P2SH(P2PK) with non-push scriptSig but not P2SH " , SCRIPT_VERIFY_SIGPUSHONLY , true
) . PushSig ( keys . key2 ) . Add ( CScript ( ) < < OP_NOP8 ) . PushRedeem ( ) . ScriptError ( SCRIPT_ERR_SIG_PUSHONLY ) ) ;
good . push_back ( TestBuilder ( CScript ( ) < < OP_2 < < ToByteVector ( keys . pubkey1C ) < < ToByteVector ( keys . pubkey1C ) < < OP_2 < < OP_CHECKMULTISIG ,
" 2-of-2 with two identical keys and sigs pushed " , SCRIPT_VERIFY_SIGPUSHONLY
) . Num ( 0 ) . PushSig ( keys . key1 ) . PushSig ( keys . key1 ) ) ;