diff --git a/src/secp256k1/src/ecdsa.h b/src/secp256k1/src/ecdsa.h
--- a/src/secp256k1/src/ecdsa.h
+++ b/src/secp256k1/src/ecdsa.h
@@ -13,6 +13,8 @@
 #include "group.h"
 #include "ecmult.h"
 
+const unsigned char secp256k1_ecdsa_algo16[17] = "ECDSA_secp256k1 ";
+
 static int secp256k1_ecdsa_sig_parse(secp256k1_scalar *r, secp256k1_scalar *s, const unsigned char *sig, size_t size);
 static int secp256k1_ecdsa_sig_serialize(unsigned char *sig, size_t *size, const secp256k1_scalar *r, const secp256k1_scalar *s);
 static int secp256k1_ecdsa_sig_verify(const secp256k1_ecmult_context *ctx, const secp256k1_scalar* r, const secp256k1_scalar* s, const secp256k1_ge *pubkey, const secp256k1_scalar *message);
diff --git a/src/secp256k1/src/modules/recovery/main_impl.h b/src/secp256k1/src/modules/recovery/main_impl.h
--- a/src/secp256k1/src/modules/recovery/main_impl.h
+++ b/src/secp256k1/src/modules/recovery/main_impl.h
@@ -142,7 +142,7 @@
         unsigned int count = 0;
         secp256k1_scalar_set_b32(&msg, msg32, NULL);
         while (1) {
-            ret = noncefp(nonce32, msg32, seckey, NULL, (void*)noncedata, count);
+            ret = noncefp(nonce32, msg32, seckey, secp256k1_ecdsa_algo16, (void*)noncedata, count);
             if (!ret) {
                 break;
             }
diff --git a/src/secp256k1/src/secp256k1.c b/src/secp256k1/src/secp256k1.c
--- a/src/secp256k1/src/secp256k1.c
+++ b/src/secp256k1/src/secp256k1.c
@@ -366,7 +366,7 @@
         unsigned int count = 0;
         secp256k1_scalar_set_b32(&msg, msg32, NULL);
         while (1) {
-            ret = noncefp(nonce32, msg32, seckey, NULL, (void*)noncedata, count);
+            ret = noncefp(nonce32, msg32, seckey, secp256k1_ecdsa_algo16, (void*)noncedata, count);
             if (!ret) {
                 break;
             }
diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@@ -1528,203 +1528,203 @@
 
 ["Automatically generated test cases"],
 [
-    "0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
+    "0x47 0x304402207b05c3ddfd438445d50c1444ede2e67c02b18a8f68cc748b3297c9b8394ff9ff02206900b0442c5d0c718c914b11ede7a202dcca4ed52ee11a208db85b6aecbe593701",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "",
     "OK",
     "P2PK"
 ],
 [
-    "0x47 0x304402200a5c6163f07b8c3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
+    "0x47 0x304402207b05c3ddfd438545d50c1444ede2e67c02b18a8f68cc748b3297c9b8394ff9ff02206900b0442c5d0c718c914b11ede7a202dcca4ed52ee11a208db85b6aecbe593701",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "",
     "EVAL_FALSE",
     "P2PK, bad sig"
 ],
 [
-    "0x47 0x304402206e05a6fe23c59196ffe176c9ddc31e73a9885638f9d1328d47c0c703863b8876022076feb53811aa5b04e0e79f938eb19906cc5e67548bc555a8e8b8b0fc603d840c01 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508",
+    "0x47 0x304402206cee39c63c6af61afe2f287513a7ced3774581ae61f4f591717ea55f1c05c49802202091a29f58984120ce59e4e5075684a8dd62e613d2e3a683c23e5d9bfd45bc8701 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508",
     "DUP HASH160 0x14 0x1018853670f9f3b0582c5b9ee8ce93764ac32b93 EQUALVERIFY CHECKSIG",
     "",
     "OK",
     "P2PKH"
 ],
 [
-    "0x47 0x3044022034bb0494b50b8ef130e2185bb220265b9284ef5b4b8a8da4d8415df489c83b5102206259a26d9cc0a125ac26af6153b17c02956855ebe1467412f066e402f5f05d1201 0x21 0x03363d90d446b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640",
+    "0x47 0x304402207e657d24eef9959ca16bd4ef7f092cdd3bee47638f1f1e59bd3c000232b63b900220317144e4117500d5ea6d0d6b87b3d8f3694fae1b6f77707954417c2a9cd205c701 0x21 0x03363d90d446b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640",
     "DUP HASH160 0x14 0xc0834c0c158f53be706d234c38fd52de7eece656 EQUALVERIFY CHECKSIG",
     "",
     "EQUALVERIFY",
     "P2PKH, bad pubkey"
 ],
 [
-    "0x47 0x304402204710a85181663b32d25c70ec2bbd14adff5ddfff6cb50d09e155ef5f541fc86c0220056b0cc949be9386ecc5f6c2ac0493269031dbb185781db90171b54ac127790281",
+    "0x47 0x304402200081bb395153c8bcb72de00f61e0c8a3e52c42669ae2875efc11e252ae3689f40220517e62954345648bc8e2437257a427d03b5ff50337c93978dd746adf6154563381",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
     "",
     "OK",
     "P2PK anyonecanpay"
 ],
 [
-    "0x47 0x304402204710a85181663b32d25c70ec2bbd14adff5ddfff6cb50d09e155ef5f541fc86c0220056b0cc949be9386ecc5f6c2ac0493269031dbb185781db90171b54ac127790201",
+    "0x47 0x304402200081bb395153c8bcb72de00f61e0c8a3e52c42669ae2875efc11e252ae3689f40220517e62954345648bc8e2437257a427d03b5ff50337c93978dd746adf6154563301",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
     "",
     "EVAL_FALSE",
     "P2PK anyonecanpay marked with normal hashtype"
 ],
 [
-    "0x47 0x3044022003fef42ed6c7be8917441218f525a60e2431be978e28b7aca4d7a532cc413ae8022067a1f82c74e8d69291b90d148778405c6257bbcfc2353cc38a3e1f22bf44254601 0x23 0x210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798ac",
+    "0x47 0x304402202a348044843378d67fa3f129a4e7f544577b6069617e86af231c9b8d2c812e5e0220649d7a111323cdab25f52568e08ab1e8ea1ff6a0f1fc50bf05e29fa717eecd8b01 0x23 0x210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798ac",
     "HASH160 0x14 0x23b0ad3477f2178bc0b3eed26e4e6316f4e83aa1 EQUAL",
     "P2SH",
     "OK",
     "P2SH(P2PK)"
 ],
 [
-    "0x47 0x3044022003fef42ed6c7be8917441218f525a60e2431be978e28b7aca4d7a532cc413ae8022067a1f82c74e8d69291b90d148778405c6257bbcfc2353cc38a3e1f22bf44254601 0x23 0x210279be667ef9dcbbac54a06295ce870b07029bfcdb2dce28d959f2815b16f81798ac",
+    "0x47 0x304402202a348044843378d67fa3f129a4e7f544577b6069617e86af231c9b8d2c812e5e0220649d7a111323cdab25f52568e08ab1e8ea1ff6a0f1fc50bf05e29fa717eecd8b01 0x23 0x210279be667ef9dcbbac54a06295ce870b07029bfcdb2dce28d959f2815b16f81798ac",
     "HASH160 0x14 0x23b0ad3477f2178bc0b3eed26e4e6316f4e83aa1 EQUAL",
     "P2SH",
     "EVAL_FALSE",
     "P2SH(P2PK), bad redeemscript"
 ],
 [
-    "0x47 0x30440220781ba4f59a7b207a10db87628bc2168df4d59b844b397d2dbc9a5835fb2f2b7602206ed8fbcc1072fe2dfc5bb25909269e5dc42ffcae7ec2bc81d59692210ff30c2b01 0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 0x19 0x76a91491b24bf9f5288532960ac687abb035127b1d28a588ac",
+    "0x47 0x304402205d73f65e78f0221a50413821ac8f72cf825fd207f0640a2882e62f9d2ec2edef0220793f7c3aeeda53b5a4fb1c778b47933797b9c519dd51a6553e93df5f8749d1f201 0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 0x19 0x76a91491b24bf9f5288532960ac687abb035127b1d28a588ac",
     "HASH160 0x14 0x7f67f0521934a57d3039f77f9f32cf313f3ac74b EQUAL",
     "P2SH",
     "OK",
     "P2SH(P2PKH)"
 ],
 [
-    "0x47 0x304402204e2eb034be7b089534ac9e798cf6a2c79f38bcb34d1b179efd6f2de0841735db022071461beb056b5a7be1819da6a3e3ce3662831ecc298419ca101eb6887b5dd6a401 0x19 0x76a9147cf9c846cd4882efec4bf07e44ebdad495c94f4b88ac",
+    "0x47 0x3044022062aa7925cd615ff7f6e1a769ff5aac99f65e1d86d41894d102a471610fd5752802205f1008a4372aa78deb705b0e6f62547a9e398bc938607f8701d9435d63f057b701 0x19 0x76a9147cf9c846cd4882efec4bf07e44ebdad495c94f4b88ac",
     "HASH160 0x14 0x2df519943d5acc0ef5222091f9dfe3543f489a82 EQUAL",
     "",
     "OK",
     "P2SH(P2PKH), bad sig but no VERIFY_P2SH"
 ],
 [
-    "0x47 0x304402204e2eb034be7b089534ac9e798cf6a2c79f38bcb34d1b179efd6f2de0841735db022071461beb056b5a7be1819da6a3e3ce3662831ecc298419ca101eb6887b5dd6a401 0x19 0x76a9147cf9c846cd4882efec4bf07e44ebdad495c94f4b88ac",
+    "0x47 0x3044022062aa7925cd615ff7f6e1a769ff5aac99f65e1d86d41894d102a471610fd5752802205f1008a4372aa78deb705b0e6f62547a9e398bc938607f8701d9435d63f057b701 0x19 0x76a9147cf9c846cd4882efec4bf07e44ebdad495c94f4b88ac",
     "HASH160 0x14 0x2df519943d5acc0ef5222091f9dfe3543f489a82 EQUAL",
     "P2SH",
     "EQUALVERIFY",
     "P2SH(P2PKH), bad sig"
 ],
 [
-    "0 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0x47 0x304402200955d031fff71d8653221e85e36c3c85533d2312fc3045314b19650b7ae2f81002202a6bb8505e36201909d0921f01abff390ae6b7ff97bbf959f98aedeb0a56730901",
+    "0 0x47 0x304402202e15d375ac0a863f15307dc43a9c790227da7169b3aced1a49545a20e99ef26d02200f164dbad2f4dc38f42a6ee6711cb881246a3a3edffb860d48fd81bc72455a2501 0x47 0x304402207ab644d911574dd8ea2573545dd6e26130c4f4db04762ee1293f4c52e82cebc702207f69bd0004d07a405b65f50b3ceaf5360003b25f4ac8b5ffd451e498d4d184d601 0x47 0x30440220732d2945c4bb86f24fcf5084a8ba122de63ec8781c3014c04335c009d7eb828b022078a225967a71121f9da9886740ed8d4b88d77ff59e7a0c61fbfd825a551a632701",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
     "",
     "OK",
     "3-of-3"
 ],
 [
-    "0 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0",
+    "0 0x47 0x304402202e15d375ac0a863f15307dc43a9c790227da7169b3aced1a49545a20e99ef26d02200f164dbad2f4dc38f42a6ee6711cb881246a3a3edffb860d48fd81bc72455a2501 0x47 0x304402207ab644d911574dd8ea2573545dd6e26130c4f4db04762ee1293f4c52e82cebc702207f69bd0004d07a405b65f50b3ceaf5360003b25f4ac8b5ffd451e498d4d184d601 0",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
     "",
     "EVAL_FALSE",
     "3-of-3, 2 sigs"
 ],
 [
-    "0 0x47 0x304402205b7d2c2f177ae76cfbbf14d589c113b0b35db753d305d5562dd0b61cbf366cfb02202e56f93c4f08a27f986cd424ffc48a462c3202c4902104d4d0ff98ed28f4bf8001 0x47 0x30440220563e5b3b1fc11662a84bc5ea2a32cc3819703254060ba30d639a1aaf2d5068ad0220601c1f47ddc76d93284dd9ed68f7c9974c4a0ea7cbe8a247d6bc3878567a5fca01 0x4c69 0x52210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179821038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f515082103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff464053ae",
+    "0 0x47 0x3044022051c753f26a8c1c9da3a60e9f178f5016d638f096bbf232962e3d514a973b9f0602206d771dd62f6629b572fd9a3579d9b29381b82728d341000b45e7b9932c009dd201 0x47 0x304402202749ac94f29456bb3852400b180e5ff5e6115dbc77d67ff2f9d2c58e2200605d02207d672f14b95ea1897ca72a2c251b8da75a1dbe153e9fefc19aa451693bf5ca3a01 0x4c69 0x52210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179821038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f515082103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff464053ae",
     "HASH160 0x14 0xc9e4a896d149702d0d1695434feddd52e24ad78d EQUAL",
     "P2SH",
     "OK",
     "P2SH(2-of-3)"
 ],
 [
-    "0 0x47 0x304402205b7d2c2f177ae76cfbbf14d589c113b0b35db753d305d5562dd0b61cbf366cfb02202e56f93c4f08a27f986cd424ffc48a462c3202c4902104d4d0ff98ed28f4bf8001 0 0x4c69 0x52210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179821038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f515082103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff464053ae",
+    "0 0x47 0x3044022051c753f26a8c1c9da3a60e9f178f5016d638f096bbf232962e3d514a973b9f0602206d771dd62f6629b572fd9a3579d9b29381b82728d341000b45e7b9932c009dd201 0 0x4c69 0x52210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179821038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f515082103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff464053ae",
     "HASH160 0x14 0xc9e4a896d149702d0d1695434feddd52e24ad78d EQUAL",
     "P2SH",
     "EVAL_FALSE",
     "P2SH(2-of-3), 1 sig"
 ],
 [
-    "0x47 0x304402200060558477337b9022e70534f1fea71a318caf836812465a2509931c5e7c4987022078ec32bd50ac9e03a349ba953dfd9fe1c8d2dd8bdb1d38ddca844d3d5c78c11801",
+    "0x47 0x30440220001e662277b0721ef4c43772e421d32e5bf456051d5c4aac2e36934e13d5c61702200ba642d77e589cb18216dd34da468ca8f09b010aa70ebfc9ed9294e63b3dbade01",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "",
     "OK",
     "P2PK with too much R padding but no DERSIG"
 ],
 [
-    "0x47 0x304402200060558477337b9022e70534f1fea71a318caf836812465a2509931c5e7c4987022078ec32bd50ac9e03a349ba953dfd9fe1c8d2dd8bdb1d38ddca844d3d5c78c11801",
+    "0x47 0x30440220001e662277b0721ef4c43772e421d32e5bf456051d5c4aac2e36934e13d5c61702200ba642d77e589cb18216dd34da468ca8f09b010aa70ebfc9ed9294e63b3dbade01",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "DERSIG",
     "SIG_DER",
     "P2PK with too much R padding"
 ],
 [
-    "0x48 0x304502202de8c03fc525285c9c535631019a5f2af7c6454fa9eb392a3756a4917c420edd02210046130bf2baf7cfc065067c8b9e33a066d9c15edcea9feb0ca2d233e3597925b401",
+    "0x48 0x30450220443b1377ea4cdb02ae5b9969ea9a2bafa68671c36a0f25de98ad279dc28f07ed02210003b45b8224c649d3ac8580bbcf6a46804416a1d146446f36434d63915fc780c301",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "",
     "OK",
     "P2PK with too much S padding but no DERSIG"
 ],
 [
-    "0x48 0x304502202de8c03fc525285c9c535631019a5f2af7c6454fa9eb392a3756a4917c420edd02210046130bf2baf7cfc065067c8b9e33a066d9c15edcea9feb0ca2d233e3597925b401",
+    "0x48 0x30450220443b1377ea4cdb02ae5b9969ea9a2bafa68671c36a0f25de98ad279dc28f07ed02210003b45b8224c649d3ac8580bbcf6a46804416a1d146446f36434d63915fc780c301",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "DERSIG",
     "SIG_DER",
     "P2PK with too much S padding"
 ],
 [
-    "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
+    "0x47 0x30440220915f7ad84241cf55205af436817ab9d7b68a550642e5e6acce6b487a1f468d67022047f589220b75c3055ae75c3f937be7ac67bf9f5320328edf0edc3ef595b31b4901",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "",
     "OK",
     "P2PK with too little R padding but no DERSIG"
 ],
 [
-    "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
+    "0x47 0x30440220915f7ad84241cf55205af436817ab9d7b68a550642e5e6acce6b487a1f468d67022047f589220b75c3055ae75c3f937be7ac67bf9f5320328edf0edc3ef595b31b4901",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "DERSIG",
     "SIG_DER",
     "P2PK with too little R padding"
 ],
 [
-    "0x47 0x30440220005ece1335e7f757a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
+    "0x47 0x30440220006aab73eede744e13730c7c4998712d0939962b41b7df2e137f8e100cdb1fd202202bec1658207a025884bf1fa59d3d29356cadaa91a603866be132311fa6fba83001",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
     "",
     "OK",
     "P2PK NOT with bad sig with too much R padding but no DERSIG"
 ],
 [
-    "0x47 0x30440220005ece1335e7f757a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
+    "0x47 0x30440220006aab73eede744e13730c7c4998712d0939962b41b7df2e137f8e100cdb1fd202202bec1658207a025884bf1fa59d3d29356cadaa91a603866be132311fa6fba83001",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
     "DERSIG",
     "SIG_DER",
     "P2PK NOT with bad sig with too much R padding"
 ],
 [
-    "0x47 0x30440220005ece1335e7f657a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
+    "0x47 0x30440220006aab73eede754e13730c7c4998712d0939962b41b7df2e137f8e100cdb1fd202202bec1658207a025884bf1fa59d3d29356cadaa91a603866be132311fa6fba83001",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
     "",
     "EVAL_FALSE",
     "P2PK NOT with too much R padding but no DERSIG"
 ],
 [
-    "0x47 0x30440220005ece1335e7f657a1a1f476a7fb5bd90964e8a022489f890614a04acfb734c002206c12b8294a6513c7710e8c82d3c23d75cdbfe83200eb7efb495701958501a5d601",
+    "0x47 0x30440220006aab73eede754e13730c7c4998712d0939962b41b7df2e137f8e100cdb1fd202202bec1658207a025884bf1fa59d3d29356cadaa91a603866be132311fa6fba83001",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG NOT",
     "DERSIG",
     "SIG_DER",
     "P2PK NOT with too much R padding"
 ],
 [
-    "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
+    "0x47 0x30440220915f7ad84241cf55205af436817ab9d7b68a550642e5e6acce6b487a1f468d67022047f589220b75c3055ae75c3f937be7ac67bf9f5320328edf0edc3ef595b31b4901",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "",
     "OK",
     "BIP66 example 1, without DERSIG"
 ],
 [
-    "0x47 0x30440220d7a0417c3f6d1a15094d1cf2a3378ca0503eb8a57630953a9e2987e21ddd0a6502207a6266d686c99090920249991d3d42065b6d43eb70187b219c0db82e4f94d1a201",
+    "0x47 0x30440220915f7ad84241cf55205af436817ab9d7b68a550642e5e6acce6b487a1f468d67022047f589220b75c3055ae75c3f937be7ac67bf9f5320328edf0edc3ef595b31b4901",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG",
     "DERSIG",
     "SIG_DER",
     "BIP66 example 1, with DERSIG"
 ],
 [
-    "0x47 0x304402208e43c0b91f7c1e5bc58e41c8185f8a6086e111b0090187968a86f2822462d3c902200a58f4076b1133b18ff1dc83ee51676e44c60cc608d9534e0df5ace0424fc0be01",
+    "0x47 0x30440220918f9945db3cda2d8935fa52de8b6b5c8e73f5221c4eaf91137d3a47d6951bf602200a6deb72b0d41d6d4ab55f5674acfb7d67441123c9befd0768ee7c018779023201",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
     "",
     "EVAL_FALSE",
     "BIP66 example 2, without DERSIG"
 ],
 [
-    "0x47 0x304402208e43c0b91f7c1e5bc58e41c8185f8a6086e111b0090187968a86f2822462d3c902200a58f4076b1133b18ff1dc83ee51676e44c60cc608d9534e0df5ace0424fc0be01",
+    "0x47 0x30440220918f9945db3cda2d8935fa52de8b6b5c8e73f5221c4eaf91137d3a47d6951bf602200a6deb72b0d41d6d4ab55f5674acfb7d67441123c9befd0768ee7c018779023201",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKSIG NOT",
     "DERSIG",
     "SIG_DER",
@@ -1808,343 +1808,343 @@
     "BIP66 example 6, with DERSIG"
 ],
 [
-    "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0x47 0x3044022027c2714269ca5aeecc4d70edc88ba5ee0e3da4986e9216028f489ab4f1b8efce022022bd545b4951215267e4c5ceabd4c5350331b2e4a0b6494c56f361fa5a57a1a201",
+    "0 0x47 0x30440220fe7ea966131650f60fc35443452bbe12927e8b78ae52fd27384dc9764bb07209022063cc1dd532147600247d0f5e42e65f29b8b29401a2666bcf1bf9f952b7b4d44701 0x47 0x304402202d2a1b694acedae2ab42eb3d86ba0ce339ac3972778ff441a2d50a8a28ac699f0220021f82a8426cd5fe9bff44a2770a4282669a2dc1a90c7116573749c065bee33001",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
     "",
     "OK",
     "BIP66 example 7, without DERSIG"
 ],
 [
-    "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0x47 0x3044022027c2714269ca5aeecc4d70edc88ba5ee0e3da4986e9216028f489ab4f1b8efce022022bd545b4951215267e4c5ceabd4c5350331b2e4a0b6494c56f361fa5a57a1a201",
+    "0 0x47 0x30440220fe7ea966131650f60fc35443452bbe12927e8b78ae52fd27384dc9764bb07209022063cc1dd532147600247d0f5e42e65f29b8b29401a2666bcf1bf9f952b7b4d44701 0x47 0x304402202d2a1b694acedae2ab42eb3d86ba0ce339ac3972778ff441a2d50a8a28ac699f0220021f82a8426cd5fe9bff44a2770a4282669a2dc1a90c7116573749c065bee33001",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
     "DERSIG",
     "SIG_DER",
     "BIP66 example 7, with DERSIG"
 ],
 [
-    "0 0x47 0x30440220b119d67d389315308d1745f734a51ff3ec72e06081e84e236fdf9dc2f5d2a64802204b04e3bc38674c4422ea317231d642b56dc09d214a1ecbbf16ecca01ed996e2201 0x47 0x3044022079ea80afd538d9ada421b5101febeb6bc874e01dde5bca108c1d0479aec339a4022004576db8f66130d1df686ccf00935703689d69cf539438da1edab208b0d63c4801",
+    "0 0x47 0x30440220ba60d48e261d609db5b2b8e8e67a32eff65bea3b5ebacb92465b3a63b9230fa80220078cce3912c1b0fd087f18f64e97b3a9c9438cb7c2f93d5bb558ca4f882f59da01 0x47 0x30440220093ff5934835f51611b9addd96d99bea83f7c035524e6bc421c183fb87a003d60220032528af2ed31cc86f341818b68881bbdad32d668000f5b92f50bb3f38c5a21501",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
     "",
     "EVAL_FALSE",
     "BIP66 example 8, without DERSIG"
 ],
 [
-    "0 0x47 0x30440220b119d67d389315308d1745f734a51ff3ec72e06081e84e236fdf9dc2f5d2a64802204b04e3bc38674c4422ea317231d642b56dc09d214a1ecbbf16ecca01ed996e2201 0x47 0x3044022079ea80afd538d9ada421b5101febeb6bc874e01dde5bca108c1d0479aec339a4022004576db8f66130d1df686ccf00935703689d69cf539438da1edab208b0d63c4801",
+    "0 0x47 0x30440220ba60d48e261d609db5b2b8e8e67a32eff65bea3b5ebacb92465b3a63b9230fa80220078cce3912c1b0fd087f18f64e97b3a9c9438cb7c2f93d5bb558ca4f882f59da01 0x47 0x30440220093ff5934835f51611b9addd96d99bea83f7c035524e6bc421c183fb87a003d60220032528af2ed31cc86f341818b68881bbdad32d668000f5b92f50bb3f38c5a21501",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
     "DERSIG",
     "SIG_DER",
     "BIP66 example 8, with DERSIG"
 ],
 [
-    "0 0 0x47 0x3044022081aa9d436f2154e8b6d600516db03d78de71df685b585a9807ead4210bd883490220534bb6bdf318a419ac0749660b60e78d17d515558ef369bf872eff405b676b2e01",
+    "0 0 0x47 0x30440220bf860045d6f6856c6f7a202f245d5a2f24805aa38dc9b740f6d14b43de2e4d7b0220596690663ee151d023646e0ffb9a7c219ddb0c0d7450f37c2926874719060ca601",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
     "",
     "EVAL_FALSE",
     "BIP66 example 9, without DERSIG"
 ],
 [
-    "0 0 0x47 0x3044022081aa9d436f2154e8b6d600516db03d78de71df685b585a9807ead4210bd883490220534bb6bdf318a419ac0749660b60e78d17d515558ef369bf872eff405b676b2e01",
+    "0 0 0x47 0x30440220bf860045d6f6856c6f7a202f245d5a2f24805aa38dc9b740f6d14b43de2e4d7b0220596690663ee151d023646e0ffb9a7c219ddb0c0d7450f37c2926874719060ca601",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
     "DERSIG",
     "SIG_DER",
     "BIP66 example 9, with DERSIG"
 ],
 [
-    "0 0 0x47 0x30440220da6f441dc3b4b2c84cfa8db0cd5b34ed92c9e01686de5a800d40498b70c0dcac02207c2cf91b0c32b860c4cd4994be36cfb84caf8bb7c3a8e4d96a31b2022c5299c501",
+    "0 0 0x47 0x3044022082904a2bcefb652204d6bba788185a6f19222eda57b1ec315b0f304f9831c569022060cbdeaeb7f3d8bb3df5d5d1940dc4098130eaafad5bc0b8076787daa869592901",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
     "",
     "OK",
     "BIP66 example 10, without DERSIG"
 ],
 [
-    "0 0 0x47 0x30440220da6f441dc3b4b2c84cfa8db0cd5b34ed92c9e01686de5a800d40498b70c0dcac02207c2cf91b0c32b860c4cd4994be36cfb84caf8bb7c3a8e4d96a31b2022c5299c501",
+    "0 0 0x47 0x3044022082904a2bcefb652204d6bba788185a6f19222eda57b1ec315b0f304f9831c569022060cbdeaeb7f3d8bb3df5d5d1940dc4098130eaafad5bc0b8076787daa869592901",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
     "DERSIG",
     "SIG_DER",
     "BIP66 example 10, with DERSIG"
 ],
 [
-    "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0",
+    "0 0x47 0x30440220fe7ea966131650f60fc35443452bbe12927e8b78ae52fd27384dc9764bb07209022063cc1dd532147600247d0f5e42e65f29b8b29401a2666bcf1bf9f952b7b4d44701 0",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
     "",
     "EVAL_FALSE",
     "BIP66 example 11, without DERSIG"
 ],
 [
-    "0 0x47 0x30440220cae00b1444babfbf6071b0ba8707f6bd373da3df494d6e74119b0430c5db810502205d5231b8c5939c8ff0c82242656d6e06edb073d42af336c99fe8837c36ea39d501 0",
+    "0 0x47 0x30440220fe7ea966131650f60fc35443452bbe12927e8b78ae52fd27384dc9764bb07209022063cc1dd532147600247d0f5e42e65f29b8b29401a2666bcf1bf9f952b7b4d44701 0",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG",
     "DERSIG",
     "EVAL_FALSE",
     "BIP66 example 11, with DERSIG"
 ],
 [
-    "0 0x47 0x30440220b119d67d389315308d1745f734a51ff3ec72e06081e84e236fdf9dc2f5d2a64802204b04e3bc38674c4422ea317231d642b56dc09d214a1ecbbf16ecca01ed996e2201 0",
+    "0 0x47 0x30440220ba60d48e261d609db5b2b8e8e67a32eff65bea3b5ebacb92465b3a63b9230fa80220078cce3912c1b0fd087f18f64e97b3a9c9438cb7c2f93d5bb558ca4f882f59da01 0",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
     "",
     "OK",
     "BIP66 example 12, without DERSIG"
 ],
 [
-    "0 0x47 0x30440220b119d67d389315308d1745f734a51ff3ec72e06081e84e236fdf9dc2f5d2a64802204b04e3bc38674c4422ea317231d642b56dc09d214a1ecbbf16ecca01ed996e2201 0",
+    "0 0x47 0x30440220ba60d48e261d609db5b2b8e8e67a32eff65bea3b5ebacb92465b3a63b9230fa80220078cce3912c1b0fd087f18f64e97b3a9c9438cb7c2f93d5bb558ca4f882f59da01 0",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 2 CHECKMULTISIG NOT",
     "DERSIG",
     "OK",
     "BIP66 example 12, with DERSIG"
 ],
 [
-    "0x48 0x304402203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022054e1c258c2981cdfba5df1f46661fb6541c44f77ca0092f3600331abfffb12510101",
+    "0x48 0x304402203e83f612853184dc2884a046ad41ace41c313c5cb294d5cc44003adf51bedef602200fd6abdafc1d0fde73bc84a223471cda53866c768b0740dd244928a57f93b2c10101",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
     "",
     "OK",
     "P2PK with multi-byte hashtype, without DERSIG"
 ],
 [
-    "0x48 0x304402203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022054e1c258c2981cdfba5df1f46661fb6541c44f77ca0092f3600331abfffb12510101",
+    "0x48 0x304402203e83f612853184dc2884a046ad41ace41c313c5cb294d5cc44003adf51bedef602200fd6abdafc1d0fde73bc84a223471cda53866c768b0740dd244928a57f93b2c10101",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
     "DERSIG",
     "SIG_DER",
     "P2PK with multi-byte hashtype, with DERSIG"
 ],
 [
-    "0x48 0x304502203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022100ab1e3da73d67e32045a20e0b999e049978ea8d6ee5480d485fcf2ce0d03b2ef001",
+    "0x48 0x304502203e83f612853184dc2884a046ad41ace41c313c5cb294d5cc44003adf51bedef6022100f029542503e2f0218c437b5ddcb8e3246728707024415f5e9b8935e750a28e8001",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
     "",
     "OK",
     "P2PK with high S but no LOW_S"
 ],
 [
-    "0x48 0x304502203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022100ab1e3da73d67e32045a20e0b999e049978ea8d6ee5480d485fcf2ce0d03b2ef001",
+    "0x48 0x304502203e83f612853184dc2884a046ad41ace41c313c5cb294d5cc44003adf51bedef6022100f029542503e2f0218c437b5ddcb8e3246728707024415f5e9b8935e750a28e8001",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
     "LOW_S",
     "SIG_HIGH_S",
     "P2PK with high S"
 ],
 [
-    "0x47 0x3044022057292e2d4dfe775becdd0a9e6547997c728cdf35390f6a017da56d654d374e4902206b643be2fc53763b4e284845bfea2c597d2dc7759941dce937636c9d341b71ed01",
+    "0x47 0x304402201c15360c9cbbd2e873a95352319bd2105576f2d82c113636f251489f17443e2102206f2400f1ad3d788e46828d157618facaac9e55da9ae12d7d754f435c3e625c1a01",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "",
     "OK",
     "P2PK with hybrid pubkey but no STRICTENC"
 ],
 [
-    "0x47 0x3044022057292e2d4dfe775becdd0a9e6547997c728cdf35390f6a017da56d654d374e4902206b643be2fc53763b4e284845bfea2c597d2dc7759941dce937636c9d341b71ed01",
+    "0x47 0x304402201c15360c9cbbd2e873a95352319bd2105576f2d82c113636f251489f17443e2102206f2400f1ad3d788e46828d157618facaac9e55da9ae12d7d754f435c3e625c1a01",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "STRICTENC",
     "PUBKEYTYPE",
     "P2PK with hybrid pubkey"
 ],
 [
-    "0x47 0x30440220035d554e3153c14950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
+    "0x47 0x30440220035a093c9749e13246016069ce324fefe46348dd16cffea69253c5795086847e022070f4f4ca0d4e11f4fa190543d35bd5ce4506b1e00a9c731e83f79b5cdd723dc301",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
     "",
     "EVAL_FALSE",
     "P2PK NOT with hybrid pubkey but no STRICTENC"
 ],
 [
-    "0x47 0x30440220035d554e3153c14950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
+    "0x47 0x30440220035a093c9749e13246016069ce324fefe46348dd16cffea69253c5795086847e022070f4f4ca0d4e11f4fa190543d35bd5ce4506b1e00a9c731e83f79b5cdd723dc301",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
     "STRICTENC",
     "PUBKEYTYPE",
     "P2PK NOT with hybrid pubkey"
 ],
 [
-    "0x47 0x30440220035d554e3153c04950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
+    "0x47 0x30440220035a093c9749e03246016069ce324fefe46348dd16cffea69253c5795086847e022070f4f4ca0d4e11f4fa190543d35bd5ce4506b1e00a9c731e83f79b5cdd723dc301",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
     "",
     "OK",
     "P2PK NOT with invalid hybrid pubkey but no STRICTENC"
 ],
 [
-    "0x47 0x30440220035d554e3153c04950c9993f41c496607a8e24093db0595be7bf875cf64fcf1f02204731c8c4e5daf15e706cec19cdd8f2c5b1d05490e11dab8465ed426569b6e92101",
+    "0x47 0x30440220035a093c9749e03246016069ce324fefe46348dd16cffea69253c5795086847e022070f4f4ca0d4e11f4fa190543d35bd5ce4506b1e00a9c731e83f79b5cdd723dc301",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG NOT",
     "STRICTENC",
     "PUBKEYTYPE",
     "P2PK NOT with invalid hybrid pubkey"
 ],
 [
-    "0 0x47 0x304402202e79441ad1baf5a07fb86bae3753184f6717d9692680947ea8b6e8b777c69af1022079a262e13d868bb5a0964fefe3ba26942e1b0669af1afb55ef3344bc9d4fc4c401",
+    "0 0x47 0x304402203dba8d5022624f7d17af51f5f27efb37f547fc3065f73f0e3a8afcbdb40e0a0f0220439bf53bfc3d61d8941db04c39f63dc69ef658a84e03246fa688172f6931c57801",
     "1 0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
     "",
     "OK",
     "1-of-2 with the second 1 hybrid pubkey and no STRICTENC"
 ],
 [
-    "0 0x47 0x304402202e79441ad1baf5a07fb86bae3753184f6717d9692680947ea8b6e8b777c69af1022079a262e13d868bb5a0964fefe3ba26942e1b0669af1afb55ef3344bc9d4fc4c401",
+    "0 0x47 0x304402203dba8d5022624f7d17af51f5f27efb37f547fc3065f73f0e3a8afcbdb40e0a0f0220439bf53bfc3d61d8941db04c39f63dc69ef658a84e03246fa688172f6931c57801",
     "1 0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
     "STRICTENC",
     "OK",
     "1-of-2 with the second 1 hybrid pubkey"
 ],
 [
-    "0 0x47 0x3044022079c7824d6c868e0e1a273484e28c2654a27d043c8a27f49f52cb72efed0759090220452bbbf7089574fa082095a4fc1b3a16bafcf97a3a34d745fafc922cce66b27201",
+    "0 0x47 0x304402207a1fd7dcc48887b09374eed1e949eee74cf60541fa8d06dafbd41939f3a49aab02206e7168ec88af68474bc1210cfc6efe129c1429ffb31b1399a8912111f416a52e01",
     "1 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 2 CHECKMULTISIG",
     "STRICTENC",
     "PUBKEYTYPE",
     "1-of-2 with the first 1 hybrid pubkey"
 ],
 [
-    "0x47 0x304402206177d513ec2cda444c021a1f4f656fc4c72ba108ae063e157eb86dc3575784940220666fc66702815d0e5413bb9b1df22aed44f5f1efb8b99d41dd5dc9a5be6d205205",
+    "0x47 0x3044022054dadf4e6bffb6575ad33ca9f8094fe03260552af2fcc52ffb092e51099fa47b022009b102f6b302b98191f1c7b1bb4c1b54013d4dbd1e9339f631341add2f18a16205",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
     "",
     "OK",
     "P2PK with undefined hashtype but no STRICTENC"
 ],
 [
-    "0x47 0x304402206177d513ec2cda444c021a1f4f656fc4c72ba108ae063e157eb86dc3575784940220666fc66702815d0e5413bb9b1df22aed44f5f1efb8b99d41dd5dc9a5be6d205205",
+    "0x47 0x3044022054dadf4e6bffb6575ad33ca9f8094fe03260552af2fcc52ffb092e51099fa47b022009b102f6b302b98191f1c7b1bb4c1b54013d4dbd1e9339f631341add2f18a16205",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG",
     "STRICTENC",
     "SIG_HASHTYPE",
     "P2PK with undefined hashtype"
 ],
 [
-    "0x47 0x30440220647a83507454f15f85f7e24de6e70c9d7b1d4020c71d0e53f4412425487e1dde022015737290670b4ab17b6783697a88ddd581c2d9c9efe26a59ac213076fc67f53021 0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+    "0x47 0x3044022063293ce3062ddb67044d2c201cd93fde918c9e09db833cc5271234e19163b6c80220726e89ea6c384a4721e27d82f4914cfacb0aa2cd13ac781178a8ff1bcb04098321 0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
     "DUP HASH160 0x14 0x91b24bf9f5288532960ac687abb035127b1d28a5 EQUALVERIFY CHECKSIG",
     "",
     "OK",
     "P2PKH with invalid sighashtype"
 ],
 [
-    "0x47 0x30440220647a83507454f15f85f7e24de6e70c9d7b1d4020c71d0e53f4412425487e1dde022015737290670b4ab17b6783697a88ddd581c2d9c9efe26a59ac213076fc67f53021 0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+    "0x47 0x3044022063293ce3062ddb67044d2c201cd93fde918c9e09db833cc5271234e19163b6c80220726e89ea6c384a4721e27d82f4914cfacb0aa2cd13ac781178a8ff1bcb04098321 0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
     "DUP HASH160 0x14 0x91b24bf9f5288532960ac687abb035127b1d28a5 EQUALVERIFY CHECKSIG",
     "STRICTENC",
     "SIG_HASHTYPE",
     "P2PKH with invalid sighashtype and STRICTENC"
 ],
 [
-    "0x47 0x304402200874e1681429dcddb8a1b6f573cb450692d08b41ab2078190dbb95478dc9ce3602206964f027a39cfdcbf7af62190db04406357a3017f7e82193ef3df4aff3cd87da21 0x43 0x41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac",
+    "0x47 0x3044022071f8a48323f155820c6f364db0075eb6d500a9e9972d045aed9d66c6674d462e02204c8d072c669826838c088388adfc41333dc4066dc18e06c01eac62bb4ee0db5021 0x43 0x41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac",
     "HASH160 0x14 0x49ba2f86705b5dcd48d93b750f03289db3b8ce21 EQUAL",
     "P2SH",
     "OK",
     "P2SH(P2PK) with invalid sighashtype"
 ],
 [
-    "0x47 0x304402200874e1681429dcddb8a1b6f573cb450692d08b41ab2078190dbb95478dc9ce3602206964f027a39cfdcbf7af62190db04406357a3017f7e82193ef3df4aff3cd87da21 0x43 0x41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac",
+    "0x47 0x3044022071f8a48323f155820c6f364db0075eb6d500a9e9972d045aed9d66c6674d462e02204c8d072c669826838c088388adfc41333dc4066dc18e06c01eac62bb4ee0db5021 0x43 0x41048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26cafac",
     "HASH160 0x14 0x49ba2f86705b5dcd48d93b750f03289db3b8ce21 EQUAL",
     "P2SH,STRICTENC",
     "SIG_HASHTYPE",
     "P2SH(P2PK) with invalid sighashtype and STRICTENC"
 ],
 [
-    "0x47 0x304402207409b5b320296e5e2136a7b281a7f803028ca4ca44e2b83eebd46932677725de02202d4eea1c8d3c98e6f42614f54764e6e5e6542e213eb4d079737e9a8b6e9812ec05",
+    "0x47 0x30440220291dec3df46a12c4af947d1994a3defd62c6875202704dd98722c9f085ec3b6302202a95d1e4dbc97bf0a61f4f5826373ada366dc65c55e8e140e80a292d01488b4505",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG NOT",
     "",
     "OK",
     "P2PK NOT with invalid sig and undefined hashtype but no STRICTENC"
 ],
 [
-    "0x47 0x304402207409b5b320296e5e2136a7b281a7f803028ca4ca44e2b83eebd46932677725de02202d4eea1c8d3c98e6f42614f54764e6e5e6542e213eb4d079737e9a8b6e9812ec05",
+    "0x47 0x30440220291dec3df46a12c4af947d1994a3defd62c6875202704dd98722c9f085ec3b6302202a95d1e4dbc97bf0a61f4f5826373ada366dc65c55e8e140e80a292d01488b4505",
     "0x41 0x048282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f5150811f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf CHECKSIG NOT",
     "STRICTENC",
     "SIG_HASHTYPE",
     "P2PK NOT with invalid sig and undefined hashtype"
 ],
 [
-    "1 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0x47 0x304402200955d031fff71d8653221e85e36c3c85533d2312fc3045314b19650b7ae2f81002202a6bb8505e36201909d0921f01abff390ae6b7ff97bbf959f98aedeb0a56730901",
+    "1 0x47 0x304402202e15d375ac0a863f15307dc43a9c790227da7169b3aced1a49545a20e99ef26d02200f164dbad2f4dc38f42a6ee6711cb881246a3a3edffb860d48fd81bc72455a2501 0x47 0x304402207ab644d911574dd8ea2573545dd6e26130c4f4db04762ee1293f4c52e82cebc702207f69bd0004d07a405b65f50b3ceaf5360003b25f4ac8b5ffd451e498d4d184d601 0x47 0x30440220732d2945c4bb86f24fcf5084a8ba122de63ec8781c3014c04335c009d7eb828b022078a225967a71121f9da9886740ed8d4b88d77ff59e7a0c61fbfd825a551a632701",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
     "",
     "OK",
     "3-of-3 with nonzero dummy but no NULLDUMMY"
 ],
 [
-    "1 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0x47 0x304402200955d031fff71d8653221e85e36c3c85533d2312fc3045314b19650b7ae2f81002202a6bb8505e36201909d0921f01abff390ae6b7ff97bbf959f98aedeb0a56730901",
+    "1 0x47 0x304402202e15d375ac0a863f15307dc43a9c790227da7169b3aced1a49545a20e99ef26d02200f164dbad2f4dc38f42a6ee6711cb881246a3a3edffb860d48fd81bc72455a2501 0x47 0x304402207ab644d911574dd8ea2573545dd6e26130c4f4db04762ee1293f4c52e82cebc702207f69bd0004d07a405b65f50b3ceaf5360003b25f4ac8b5ffd451e498d4d184d601 0x47 0x30440220732d2945c4bb86f24fcf5084a8ba122de63ec8781c3014c04335c009d7eb828b022078a225967a71121f9da9886740ed8d4b88d77ff59e7a0c61fbfd825a551a632701",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",
     "NULLDUMMY",
     "SIG_NULLDUMMY",
     "3-of-3 with nonzero dummy"
 ],
 [
-    "1 0x47 0x304402201bb2edab700a5d020236df174fefed78087697143731f659bea59642c759c16d022061f42cdbae5bcd3e8790f20bf76687443436e94a634321c16a72aa54cbc7c2ea01 0x47 0x304402204bb4a64f2a6e5c7fb2f07fef85ee56fde5e6da234c6a984262307a20e99842d702206f8303aaba5e625d223897e2ffd3f88ef1bcffef55f38dc3768e5f2e94c923f901 0x47 0x3044022040c2809b71fffb155ec8b82fe7a27f666bd97f941207be4e14ade85a1249dd4d02204d56c85ec525dd18e29a0533d5ddf61b6b1bb32980c2f63edf951aebf7a27bfe01",
+    "1 0x47 0x304402206a89db51c49e021c726a9a79de41dd8dcd9edc336efa4e279eb53df6ef0ef35402204a611981b9d781ac3406f03602876bef5226f4172718c7b15f1f13e87a63a73701 0x47 0x304402203e5ab50f55c5f73d9fd0e933daf128610d44f92100b9a1137050cc688bb02fed022009d80280530b951338e4a6f2352a1696f93d40655c9b0d68d659b2b46c22ba8701 0x47 0x304402202142d405383c3b18001ae39499c7a0f6d6768a01feb4880726c5f93177a7174f022020e961cbc6f6445b8f12e240142ff674cfc66d714046c6eb35ceca0199a3db4701",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG NOT",
     "",
     "OK",
     "3-of-3 NOT with invalid sig and nonzero dummy but no NULLDUMMY"
 ],
 [
-    "1 0x47 0x304402201bb2edab700a5d020236df174fefed78087697143731f659bea59642c759c16d022061f42cdbae5bcd3e8790f20bf76687443436e94a634321c16a72aa54cbc7c2ea01 0x47 0x304402204bb4a64f2a6e5c7fb2f07fef85ee56fde5e6da234c6a984262307a20e99842d702206f8303aaba5e625d223897e2ffd3f88ef1bcffef55f38dc3768e5f2e94c923f901 0x47 0x3044022040c2809b71fffb155ec8b82fe7a27f666bd97f941207be4e14ade85a1249dd4d02204d56c85ec525dd18e29a0533d5ddf61b6b1bb32980c2f63edf951aebf7a27bfe01",
+    "1 0x47 0x304402206a89db51c49e021c726a9a79de41dd8dcd9edc336efa4e279eb53df6ef0ef35402204a611981b9d781ac3406f03602876bef5226f4172718c7b15f1f13e87a63a73701 0x47 0x304402203e5ab50f55c5f73d9fd0e933daf128610d44f92100b9a1137050cc688bb02fed022009d80280530b951338e4a6f2352a1696f93d40655c9b0d68d659b2b46c22ba8701 0x47 0x304402202142d405383c3b18001ae39499c7a0f6d6768a01feb4880726c5f93177a7174f022020e961cbc6f6445b8f12e240142ff674cfc66d714046c6eb35ceca0199a3db4701",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG NOT",
     "NULLDUMMY",
     "SIG_NULLDUMMY",
     "3-of-3 NOT with invalid sig with nonzero dummy"
 ],
 [
-    "0 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901 DUP",
+    "0 0x47 0x304402205e04fb5fe913db7c3bcceebfab0da8eefbb2d7a33962e97d23f4d89db42c1814022034269cda94350055a09ab9ae388ef2ab221374ea2f1a340a06c317f9b24422ae01 DUP",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
     "",
     "OK",
     "2-of-2 with two identical keys and sigs pushed using OP_DUP but no SIGPUSHONLY"
 ],
 [
-    "0 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901 DUP",
+    "0 0x47 0x304402205e04fb5fe913db7c3bcceebfab0da8eefbb2d7a33962e97d23f4d89db42c1814022034269cda94350055a09ab9ae388ef2ab221374ea2f1a340a06c317f9b24422ae01 DUP",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
     "SIGPUSHONLY",
     "SIG_PUSHONLY",
     "2-of-2 with two identical keys and sigs pushed using OP_DUP"
 ],
 [
-    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
+    "0x47 0x3044022001ff8992c729d33b43bdb65094f6d484af9ec428e01f174f43f51e81e27de07102202557692d38ddefd356188baa66fa2e3078fbaa87f838017ff524bf6718bcfdf901 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
     "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
     "",
     "OK",
     "P2SH(P2PK) with non-push scriptSig but no P2SH or SIGPUSHONLY"
 ],
 [
-    "0x47 0x304402203e4516da7253cf068effec6b95c41221c0cf3a8e6ccb8cbf1725b562e9afde2c022054e1c258c2981cdfba5df1f46661fb6541c44f77ca0092f3600331abfffb125101 NOP8",
+    "0x47 0x304402203e83f612853184dc2884a046ad41ace41c313c5cb294d5cc44003adf51bedef602200fd6abdafc1d0fde73bc84a223471cda53866c768b0740dd244928a57f93b2c101 NOP8",
     "0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 CHECKSIG",
     "",
     "OK",
     "P2PK with non-push scriptSig but with P2SH validation"
 ],
 [
-    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
+    "0x47 0x3044022001ff8992c729d33b43bdb65094f6d484af9ec428e01f174f43f51e81e27de07102202557692d38ddefd356188baa66fa2e3078fbaa87f838017ff524bf6718bcfdf901 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
     "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
     "P2SH",
     "SIG_PUSHONLY",
     "P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY"
 ],
 [
-    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
+    "0x47 0x3044022001ff8992c729d33b43bdb65094f6d484af9ec428e01f174f43f51e81e27de07102202557692d38ddefd356188baa66fa2e3078fbaa87f838017ff524bf6718bcfdf901 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
     "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
     "SIGPUSHONLY",
     "SIG_PUSHONLY",
     "P2SH(P2PK) with non-push scriptSig but not P2SH"
 ],
 [
-    "0 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901 0x47 0x304402200abeb4bd07f84222f474aed558cfbdfc0b4e96cde3c2935ba7098b1ff0bd74c302204a04c1ca67b2a20abee210cf9a21023edccbbf8024b988812634233115c6b73901",
+    "0 0x47 0x304402205e04fb5fe913db7c3bcceebfab0da8eefbb2d7a33962e97d23f4d89db42c1814022034269cda94350055a09ab9ae388ef2ab221374ea2f1a340a06c317f9b24422ae01 0x47 0x304402205e04fb5fe913db7c3bcceebfab0da8eefbb2d7a33962e97d23f4d89db42c1814022034269cda94350055a09ab9ae388ef2ab221374ea2f1a340a06c317f9b24422ae01",
     "2 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 2 CHECKMULTISIG",
     "SIGPUSHONLY",
     "OK",
     "2-of-2 with two identical keys and sigs pushed"
 ],
 [
-    "11 0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
+    "11 0x47 0x304402207b05c3ddfd438445d50c1444ede2e67c02b18a8f68cc748b3297c9b8394ff9ff02206900b0442c5d0c718c914b11ede7a202dcca4ed52ee11a208db85b6aecbe593701",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "P2SH",
     "OK",
     "P2PK with unnecessary input but no CLEANSTACK"
 ],
 [
-    "11 0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001",
+    "11 0x47 0x304402207b05c3ddfd438445d50c1444ede2e67c02b18a8f68cc748b3297c9b8394ff9ff02206900b0442c5d0c718c914b11ede7a202dcca4ed52ee11a208db85b6aecbe593701",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "CLEANSTACK,P2SH",
     "CLEANSTACK",
     "P2PK with unnecessary input"
 ],
 [
-    "11 0x47 0x304402202f7505132be14872581f35d74b759212d9da40482653f1ffa3116c3294a4a51702206adbf347a2240ca41c66522b1a22a41693610b76a8e7770645dc721d1635854f01 0x43 0x410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
+    "11 0x47 0x304402202092ec524929f4d9ac39dfcd19445b9b72d922635d4461cd562328b37046fb92022076899c7c0835d7094f4c0a889aa358d84b24bde43a2703057a8042b61232da6e01 0x43 0x410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
     "HASH160 0x14 0x31edc23bdafda4639e669f89ad6b2318dd79d032 EQUAL",
     "P2SH",
     "OK",
     "P2SH with unnecessary input but no CLEANSTACK"
 ],
 [
-    "11 0x47 0x304402202f7505132be14872581f35d74b759212d9da40482653f1ffa3116c3294a4a51702206adbf347a2240ca41c66522b1a22a41693610b76a8e7770645dc721d1635854f01 0x43 0x410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
+    "11 0x47 0x304402202092ec524929f4d9ac39dfcd19445b9b72d922635d4461cd562328b37046fb92022076899c7c0835d7094f4c0a889aa358d84b24bde43a2703057a8042b61232da6e01 0x43 0x410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
     "HASH160 0x14 0x31edc23bdafda4639e669f89ad6b2318dd79d032 EQUAL",
     "CLEANSTACK,P2SH",
     "CLEANSTACK",
     "P2SH with unnecessary input"
 ],
 [
-    "0x47 0x304402202f7505132be14872581f35d74b759212d9da40482653f1ffa3116c3294a4a51702206adbf347a2240ca41c66522b1a22a41693610b76a8e7770645dc721d1635854f01 0x43 0x410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
+    "0x47 0x304402202092ec524929f4d9ac39dfcd19445b9b72d922635d4461cd562328b37046fb92022076899c7c0835d7094f4c0a889aa358d84b24bde43a2703057a8042b61232da6e01 0x43 0x410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac",
     "HASH160 0x14 0x31edc23bdafda4639e669f89ad6b2318dd79d032 EQUAL",
     "CLEANSTACK,P2SH",
     "OK",
@@ -2154,7 +2154,7 @@
     [
         123450.00000000
     ],
-    "0x47 0x30440220368d68340dfbebf99d5ec87d77fba899763e466c0a7ab2fa0221fb868ab0f3ef0220266c1a52a8e5b7b597613b80cf53814d3925dfb6715dce712c8e7a25e63a044041",
+    "0x47 0x3044022039fd2650e415956ed1489652ca4f18712fecd334b0a9299e6a9ca25fd67dc87d022042594ba129cd188d8976ab182ba3af80f8fd9f783d7631a6ea4ff5ee4eecfdbf41",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "SIGHASH_FORKID",
     "OK",
@@ -2164,7 +2164,7 @@
     [
         123450.00000000
     ],
-    "0x47 0x3044022053cebf0befa1f435d1631d7b0de2c870203b4cedcce98bd2ce6b72e08978e1a302203b63345ec2de3682eec5f008a3b1c925b2f71be53f0469a49fb7f1df0c49409b41",
+    "0x47 0x304402206ee906138d168e8a47f390a3a6051bc7187a2054ec32a248a788ed80ca252c35022043dd95cd9eb683cc3fd80b9ce422bd4a4843efcbc9c720e74b60704ecb3aa67141",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "SIGHASH_FORKID",
     "EVAL_FALSE",
@@ -2174,7 +2174,7 @@
     [
         123450.00000000
     ],
-    "0x47 0x30440220368d68340dfbebf99d5ec87d77fba899763e466c0a7ab2fa0221fb868ab0f3ef0220266c1a52a8e5b7b597613b80cf53814d3925dfb6715dce712c8e7a25e63a044041",
+    "0x47 0x3044022039fd2650e415956ed1489652ca4f18712fecd334b0a9299e6a9ca25fd67dc87d022042594ba129cd188d8976ab182ba3af80f8fd9f783d7631a6ea4ff5ee4eecfdbf41",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "STRICTENC",
     "ILLEGAL_FORKID",
@@ -2184,7 +2184,7 @@
     [
         123450.00000000
     ],
-    "0x47 0x3044022037611855758bff48e49f99ad521223506d175364b652a5a4d02282f1e48367cc02200b513f17ee300d64f339872594c3e2ee3411242ef506ad4cc7dbdbd029ca7f2f41",
+    "0x47 0x3044022026fc4d0a0d5e49802d92abef108c64f635156b8cfd6be220adc54f1b3a43d26402202258b826e15f544b5d13b1b9d68f0af9e022577549b00bd96e6cc9f075ad553241",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "REPLAY_PROTECTION,SIGHASH_FORKID",
     "OK",
@@ -2194,28 +2194,28 @@
     [
         123450.00000000
     ],
-    "0x47 0x30440220368d68340dfbebf99d5ec87d77fba899763e466c0a7ab2fa0221fb868ab0f3ef0220266c1a52a8e5b7b597613b80cf53814d3925dfb6715dce712c8e7a25e63a044041",
+    "0x47 0x3044022039fd2650e415956ed1489652ca4f18712fecd334b0a9299e6a9ca25fd67dc87d022042594ba129cd188d8976ab182ba3af80f8fd9f783d7631a6ea4ff5ee4eecfdbf41",
     "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG",
     "REPLAY_PROTECTION,SIGHASH_FORKID",
     "EVAL_FALSE",
     "P2PK REPLAY PROTECTED"
 ],
 [
-    "0x46 0x30440220256c12175e809381f97637933ed6ab97737d263eaaebca6add21bced67fd12a402205ce29ecc1369d6fc1b51977ed38faaf41119e3be1d7edfafd7cfaf0b6061bd07 0",
+    "0x46 0x30440220367b0f0c64d01810f19cc55904d701aede7458b3490f9a00c2e7b604a2c05a370220696916e711e86120c4b81aa3891a987ad071308d9a6a217c007b5b5ac4dd8788 0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIG",
     "CHECKDATASIG,NULLFAIL,STRICTENC",
     "OK",
     "Standard CHECKDATASIG"
 ],
 [
-    "0x46 0x30440220256c12175e809381f97637933ed6ab97737d263eaaebca6add21bced67fd12a402205ce29ecc1369d6fc1b51977ed38faaf41119e3be1d7edfafd7cfaf0b6061bd07 1",
+    "0x46 0x30440220367b0f0c64d01810f19cc55904d701aede7458b3490f9a00c2e7b604a2c05a370220696916e711e86120c4b81aa3891a987ad071308d9a6a217c007b5b5ac4dd8788 1",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIG NOT",
     "CHECKDATASIG,NULLFAIL,STRICTENC",
     "NULLFAIL",
     "CHECKDATASIG with NULLFAIL flags"
 ],
 [
-    "0x46 0x30440220256c12175e809381f97637933ed6ab97737d263eaaebca6add21bced67fd12a402205ce29ecc1369d6fc1b51977ed38faaf41119e3be1d7edfafd7cfaf0b6061bd07 1",
+    "0x46 0x30440220367b0f0c64d01810f19cc55904d701aede7458b3490f9a00c2e7b604a2c05a370220696916e711e86120c4b81aa3891a987ad071308d9a6a217c007b5b5ac4dd8788 1",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIG NOT",
     "CHECKDATASIG,STRICTENC",
     "OK",
@@ -2229,77 +2229,77 @@
     "CHECKDATASIG empty signature"
 ],
 [
-    "0x47 0x30450220256c12175e809381f97637933ed6ab97737d263eaaebca6add21bced67fd12a4022100a31d6133ec962903e4ae68812c70550aa994f92891c9c08be802af816fd4843a 0",
+    "0x47 0x30450220367b0f0c64d01810f19cc55904d701aede7458b3490f9a00c2e7b604a2c05a370221009696e918ee179edf3b47e55c76e56783ea3dac5914de7ebfbf5703320b58b9b9 0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIG",
     "CHECKDATASIG,NULLFAIL,STRICTENC",
     "OK",
     "CHECKDATASIG with High S but no Low S"
 ],
 [
-    "0x47 0x30450220256c12175e809381f97637933ed6ab97737d263eaaebca6add21bced67fd12a4022100a31d6133ec962903e4ae68812c70550aa994f92891c9c08be802af816fd4843a 0",
+    "0x47 0x30450220367b0f0c64d01810f19cc55904d701aede7458b3490f9a00c2e7b604a2c05a370221009696e918ee179edf3b47e55c76e56783ea3dac5914de7ebfbf5703320b58b9b9 0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIG",
     "CHECKDATASIG,LOW_S,NULLFAIL,STRICTENC",
     "SIG_HIGH_S",
     "CHECKDATASIG with High S"
 ],
 [
-    "0x46 0x3044022090c2b41ac64aea5808a991dac049bf6a98816f8610b4028cd371e68a23b0cd47022073310757507b168533cc141e3243416cf2c55e3b4525655abf5c97c8724a68aa 0",
+    "0x46 0x30440220f0ea9a551f73ce2db1ea83bda4989c3abc5f3901f2526af377c88ff695bcf8b30220516c7cacf5e0453b77756174d87a55bc3460f93d253819522ad2305dfe7103dd 0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIG",
     "CHECKDATASIG,NULLFAIL",
     "OK",
     "CHECKDATASIG with too little R padding but no DERSIG"
 ],
 [
-    "0x46 0x3044022090c2b41ac64aea5808a991dac049bf6a98816f8610b4028cd371e68a23b0cd47022073310757507b168533cc141e3243416cf2c55e3b4525655abf5c97c8724a68aa 0",
+    "0x46 0x30440220f0ea9a551f73ce2db1ea83bda4989c3abc5f3901f2526af377c88ff695bcf8b30220516c7cacf5e0453b77756174d87a55bc3460f93d253819522ad2305dfe7103dd 0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIG",
     "CHECKDATASIG,NULLFAIL,STRICTENC",
     "SIG_DER",
     "CHECKDATASIG with too little R padding"
 ],
 [
-    "0x46 0x3044022077c8d336572f6f466055b5f70f433851f8f535f6c4fc71133a6cfd71079d03b702200ed9f5eb8aa5b266abac35d416c3207e7a538bf5f37649727d7a9823b1069577 0",
+    "0x46 0x3044022006100cabde7e5272a9c2974e8b72c4a4f1f06fd5f16133b88f2585726fe88ea4022059c0384e05fd376a4a3a0caf72573602b4f7438d75745a2f3526b163739c0115 0",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKDATASIG",
     "CHECKDATASIG,NULLFAIL",
     "OK",
     "CHECKDATASIG with hybrid pubkey but no STRICTENC"
 ],
 [
-    "0x46 0x3044022077c8d336572f6f466055b5f70f433851f8f535f6c4fc71133a6cfd71079d03b702200ed9f5eb8aa5b266abac35d416c3207e7a538bf5f37649727d7a9823b1069577 0",
+    "0x46 0x3044022006100cabde7e5272a9c2974e8b72c4a4f1f06fd5f16133b88f2585726fe88ea4022059c0384e05fd376a4a3a0caf72573602b4f7438d75745a2f3526b163739c0115 0",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKDATASIG",
     "CHECKDATASIG,NULLFAIL,STRICTENC",
     "PUBKEYTYPE",
     "CHECKDATASIG with hybrid pubkey"
 ],
 [
-    "0x46 0x3044022077c8d336572f6e466055b5f70f433851f8f535f6c4fc71133a6cfd71079d03b702200ed9f5eb8aa5b266abac35d416c3207e7a538bf5f37649727d7a9823b1069577 0",
+    "0x46 0x3044022006100cabde7e5372a9c2974e8b72c4a4f1f06fd5f16133b88f2585726fe88ea4022059c0384e05fd376a4a3a0caf72573602b4f7438d75745a2f3526b163739c0115 0",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKDATASIG NOT",
     "CHECKDATASIG",
     "OK",
     "CHECKDATASIG with invalid hybrid pubkey but no STRICTENC"
 ],
 [
-    "0x46 0x3044022077c8d336572f6e466055b5f70f433851f8f535f6c4fc71133a6cfd71079d03b702200ed9f5eb8aa5b266abac35d416c3207e7a538bf5f37649727d7a9823b1069577 0",
+    "0x46 0x3044022006100cabde7e5372a9c2974e8b72c4a4f1f06fd5f16133b88f2585726fe88ea4022059c0384e05fd376a4a3a0caf72573602b4f7438d75745a2f3526b163739c0115 0",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKDATASIG",
     "CHECKDATASIG,NULLFAIL,STRICTENC",
     "PUBKEYTYPE",
     "CHECKDATASIG with invalid hybrid pubkey"
 ],
 [
-    "0x46 0x30440220256c12175e809381f97637933ed6ab97737d263eaaebca6add21bced67fd12a402205ce29ecc1369d6fc1b51977ed38faaf41119e3be1d7edfafd7cfaf0b6061bd07 0",
+    "0x46 0x30440220367b0f0c64d01810f19cc55904d701aede7458b3490f9a00c2e7b604a2c05a370220696916e711e86120c4b81aa3891a987ad071308d9a6a217c007b5b5ac4dd8788 0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIGVERIFY 1",
     "CHECKDATASIG,NULLFAIL,STRICTENC",
     "OK",
     "Standard CHECKDATASIGVERIFY"
 ],
 [
-    "0x46 0x30440220256c12175e809381f97637933ed6ab97737d263eaaebca6add21bced67fd12a402205ce29ecc1369d6fc1b51977ed38faaf41119e3be1d7edfafd7cfaf0b6061bd07 1",
+    "0x46 0x30440220367b0f0c64d01810f19cc55904d701aede7458b3490f9a00c2e7b604a2c05a370220696916e711e86120c4b81aa3891a987ad071308d9a6a217c007b5b5ac4dd8788 1",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIGVERIFY 1",
     "CHECKDATASIG,NULLFAIL,STRICTENC",
     "NULLFAIL",
     "CHECKDATASIGVERIFY with NULLFAIL flags"
 ],
 [
-    "0x46 0x30440220256c12175e809381f97637933ed6ab97737d263eaaebca6add21bced67fd12a402205ce29ecc1369d6fc1b51977ed38faaf41119e3be1d7edfafd7cfaf0b6061bd07 1",
+    "0x46 0x30440220367b0f0c64d01810f19cc55904d701aede7458b3490f9a00c2e7b604a2c05a370220696916e711e86120c4b81aa3891a987ad071308d9a6a217c007b5b5ac4dd8788 1",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIGVERIFY 1",
     "CHECKDATASIG,STRICTENC",
     "CHECKDATASIGVERIFY",
@@ -2313,56 +2313,56 @@
     "CHECKDATASIGVERIFY empty signature"
 ],
 [
-    "0x47 0x30450220256c12175e809381f97637933ed6ab97737d263eaaebca6add21bced67fd12a4022100a31d6133ec962903e4ae68812c70550aa994f92891c9c08be802af816fd4843a 0",
+    "0x47 0x30450220367b0f0c64d01810f19cc55904d701aede7458b3490f9a00c2e7b604a2c05a370221009696e918ee179edf3b47e55c76e56783ea3dac5914de7ebfbf5703320b58b9b9 0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIGVERIFY 1",
     "CHECKDATASIG,NULLFAIL,STRICTENC",
     "OK",
     "CHECKDATASIG with High S but no Low S"
 ],
 [
-    "0x47 0x30450220256c12175e809381f97637933ed6ab97737d263eaaebca6add21bced67fd12a4022100a31d6133ec962903e4ae68812c70550aa994f92891c9c08be802af816fd4843a 0",
+    "0x47 0x30450220367b0f0c64d01810f19cc55904d701aede7458b3490f9a00c2e7b604a2c05a370221009696e918ee179edf3b47e55c76e56783ea3dac5914de7ebfbf5703320b58b9b9 0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIGVERIFY 1",
     "CHECKDATASIG,LOW_S,NULLFAIL,STRICTENC",
     "SIG_HIGH_S",
     "CHECKDATASIG with High S"
 ],
 [
-    "0x46 0x3044022090c2b41ac64aea5808a991dac049bf6a98816f8610b4028cd371e68a23b0cd47022073310757507b168533cc141e3243416cf2c55e3b4525655abf5c97c8724a68aa 0",
+    "0x46 0x30440220f0ea9a551f73ce2db1ea83bda4989c3abc5f3901f2526af377c88ff695bcf8b30220516c7cacf5e0453b77756174d87a55bc3460f93d253819522ad2305dfe7103dd 0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIGVERIFY 1",
     "CHECKDATASIG,NULLFAIL",
     "OK",
     "CHECKDATASIGVERIFY with too little R padding but no DERSIG"
 ],
 [
-    "0x46 0x3044022090c2b41ac64aea5808a991dac049bf6a98816f8610b4028cd371e68a23b0cd47022073310757507b168533cc141e3243416cf2c55e3b4525655abf5c97c8724a68aa 0",
+    "0x46 0x30440220f0ea9a551f73ce2db1ea83bda4989c3abc5f3901f2526af377c88ff695bcf8b30220516c7cacf5e0453b77756174d87a55bc3460f93d253819522ad2305dfe7103dd 0",
     "0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIGVERIFY 1",
     "CHECKDATASIG,NULLFAIL,STRICTENC",
     "SIG_DER",
     "CHECKDATASIGVERIFY with too little R padding"
 ],
 [
-    "0x46 0x3044022077c8d336572f6f466055b5f70f433851f8f535f6c4fc71133a6cfd71079d03b702200ed9f5eb8aa5b266abac35d416c3207e7a538bf5f37649727d7a9823b1069577 0",
+    "0x46 0x3044022006100cabde7e5272a9c2974e8b72c4a4f1f06fd5f16133b88f2585726fe88ea4022059c0384e05fd376a4a3a0caf72573602b4f7438d75745a2f3526b163739c0115 0",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKDATASIGVERIFY 1",
     "CHECKDATASIG,NULLFAIL",
     "OK",
     "CHECKDATASIGVERIFY with hybrid pubkey but no STRICTENC"
 ],
 [
-    "0x46 0x3044022077c8d336572f6f466055b5f70f433851f8f535f6c4fc71133a6cfd71079d03b702200ed9f5eb8aa5b266abac35d416c3207e7a538bf5f37649727d7a9823b1069577 0",
+    "0x46 0x3044022006100cabde7e5272a9c2974e8b72c4a4f1f06fd5f16133b88f2585726fe88ea4022059c0384e05fd376a4a3a0caf72573602b4f7438d75745a2f3526b163739c0115 0",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKDATASIGVERIFY 1",
     "CHECKDATASIG,NULLFAIL,STRICTENC",
     "PUBKEYTYPE",
     "CHECKDATASIGVERIFY with hybrid pubkey"
 ],
 [
-    "0x46 0x3044022077c8d336572f6e466055b5f70f433851f8f535f6c4fc71133a6cfd71079d03b702200ed9f5eb8aa5b266abac35d416c3207e7a538bf5f37649727d7a9823b1069577 0",
+    "0x46 0x3044022006100cabde7e5372a9c2974e8b72c4a4f1f06fd5f16133b88f2585726fe88ea4022059c0384e05fd376a4a3a0caf72573602b4f7438d75745a2f3526b163739c0115 0",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKDATASIGVERIFY 1",
     "CHECKDATASIG",
     "CHECKDATASIGVERIFY",
     "CHECKDATASIGVERIFY with invalid hybrid pubkey but no STRICTENC"
 ],
 [
-    "0x46 0x3044022077c8d336572f6e466055b5f70f433851f8f535f6c4fc71133a6cfd71079d03b702200ed9f5eb8aa5b266abac35d416c3207e7a538bf5f37649727d7a9823b1069577 0",
+    "0x46 0x3044022006100cabde7e5372a9c2974e8b72c4a4f1f06fd5f16133b88f2585726fe88ea4022059c0384e05fd376a4a3a0caf72573602b4f7438d75745a2f3526b163739c0115 0",
     "0x41 0x0679be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKDATASIGVERIFY 1",
     "CHECKDATASIG,NULLFAIL,STRICTENC",
     "PUBKEYTYPE",
diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp
--- a/src/test/key_tests.cpp
+++ b/src/test/key_tests.cpp
@@ -150,36 +150,36 @@
     BOOST_CHECK(key1C.Sign(hashMsg, detsigc));
     BOOST_CHECK(detsig == detsigc);
     BOOST_CHECK(detsig ==
-                ParseHex("304402205dbbddda71772d95ce91cd2d14b592cfbc1dd0aabd6a3"
-                         "94b6c2d377bbe59d31d022014ddda21494a4e221f0824f0b8b924"
-                         "c43fa43c0ad57dccdaa11f81a6bd4582f6"));
+                ParseHex("304402204d6ca0cc7f5184bd1861cd67edbaf25f1e8c22b8c2ac1"
+                         "5921fc224ac9696f05e02206bf0b4b9d6f1846d6acaa31de129c3"
+                         "e3521df5efb2a2f477cc1a5b6292ea8cea"));
     BOOST_CHECK(key2.Sign(hashMsg, detsig));
     BOOST_CHECK(key2C.Sign(hashMsg, detsigc));
     BOOST_CHECK(detsig == detsigc);
     BOOST_CHECK(detsig ==
-                ParseHex("3044022052d8a32079c11e79db95af63bb9600c5b04f21a9ca33d"
-                         "c129c2bfa8ac9dc1cd5022061d8ae5e0f6c1a16bde3719c64c2fd"
-                         "70e404b6428ab9a69566962e8771b5944d"));
+                ParseHex("304402206932b3ed1e2e03c29ad504be5f3577de265c8b4ddc92a"
+                         "649c8c7b03eb4ba85e102201db5a68fbbb6a681477304aeb49c0a"
+                         "f4443c707a64a768792607fb7ee151b3ce"));
     BOOST_CHECK(key1.SignCompact(hashMsg, detsig));
     BOOST_CHECK(key1C.SignCompact(hashMsg, detsigc));
     BOOST_CHECK(detsig ==
-                ParseHex("1c5dbbddda71772d95ce91cd2d14b592cfbc1dd0aabd6a394b6c2"
-                         "d377bbe59d31d14ddda21494a4e221f0824f0b8b924c43fa43c0a"
-                         "d57dccdaa11f81a6bd4582f6"));
+                ParseHex("1b4d6ca0cc7f5184bd1861cd67edbaf25f1e8c22b8c2ac15921fc"
+                         "224ac9696f05e6bf0b4b9d6f1846d6acaa31de129c3e3521df5ef"
+                         "b2a2f477cc1a5b6292ea8cea"));
     BOOST_CHECK(detsigc ==
-                ParseHex("205dbbddda71772d95ce91cd2d14b592cfbc1dd0aabd6a394b6c2"
-                         "d377bbe59d31d14ddda21494a4e221f0824f0b8b924c43fa43c0a"
-                         "d57dccdaa11f81a6bd4582f6"));
+                ParseHex("1f4d6ca0cc7f5184bd1861cd67edbaf25f1e8c22b8c2ac15921fc"
+                         "224ac9696f05e6bf0b4b9d6f1846d6acaa31de129c3e3521df5ef"
+                         "b2a2f477cc1a5b6292ea8cea"));
     BOOST_CHECK(key2.SignCompact(hashMsg, detsig));
     BOOST_CHECK(key2C.SignCompact(hashMsg, detsigc));
     BOOST_CHECK(detsig ==
-                ParseHex("1c52d8a32079c11e79db95af63bb9600c5b04f21a9ca33dc129c2"
-                         "bfa8ac9dc1cd561d8ae5e0f6c1a16bde3719c64c2fd70e404b642"
-                         "8ab9a69566962e8771b5944d"));
+                ParseHex("1c6932b3ed1e2e03c29ad504be5f3577de265c8b4ddc92a649c8c"
+                         "7b03eb4ba85e11db5a68fbbb6a681477304aeb49c0af4443c707a"
+                         "64a768792607fb7ee151b3ce"));
     BOOST_CHECK(detsigc ==
-                ParseHex("2052d8a32079c11e79db95af63bb9600c5b04f21a9ca33dc129c2"
-                         "bfa8ac9dc1cd561d8ae5e0f6c1a16bde3719c64c2fd70e404b642"
-                         "8ab9a69566962e8771b5944d"));
+                ParseHex("206932b3ed1e2e03c29ad504be5f3577de265c8b4ddc92a649c8c"
+                         "7b03eb4ba85e11db5a68fbbb6a681477304aeb49c0af4443c707a"
+                         "64a768792607fb7ee151b3ce"));
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/util/data/txcreatesignv1.hex b/test/util/data/txcreatesignv1.hex
--- a/test/util/data/txcreatesignv1.hex
+++ b/test/util/data/txcreatesignv1.hex
@@ -1 +1 @@
-01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008b48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000
+01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008b483045022100bb9810a687fbab9c7cbe717b71b51920d7223fa3cc132fa1e013386cd1db8ce102207e8796c4105c204960fdeb989ed7a8059021bff54df1ffea607ea0f9082a49ec01410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000
diff --git a/test/util/data/txcreatesignv1.json b/test/util/data/txcreatesignv1.json
--- a/test/util/data/txcreatesignv1.json
+++ b/test/util/data/txcreatesignv1.json
@@ -1,6 +1,6 @@
 {
-    "txid": "977e7cd286cb72cd470d539ba6cb48400f8f387d97451d45cdb8819437a303af",
-    "hash": "977e7cd286cb72cd470d539ba6cb48400f8f387d97451d45cdb8819437a303af",
+    "txid": "de3f7fe4042763c21e19bc8f7e01db801d7fa9066fc90d1ffdba598565a9dc38",
+    "hash": "de3f7fe4042763c21e19bc8f7e01db801d7fa9066fc90d1ffdba598565a9dc38",
     "version": 1,
     "locktime": 0,
     "vin": [
@@ -8,8 +8,8 @@
             "txid": "4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485",
             "vout": 0,
             "scriptSig": {
-                "asm": "304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e2[ALL] 0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
-                "hex": "48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
+                "asm": "3045022100bb9810a687fbab9c7cbe717b71b51920d7223fa3cc132fa1e013386cd1db8ce102207e8796c4105c204960fdeb989ed7a8059021bff54df1ffea607ea0f9082a49ec[ALL] 0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+                "hex": "483045022100bb9810a687fbab9c7cbe717b71b51920d7223fa3cc132fa1e013386cd1db8ce102207e8796c4105c204960fdeb989ed7a8059021bff54df1ffea607ea0f9082a49ec01410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
             },
             "sequence": 4294967295
         }
@@ -29,5 +29,5 @@
             }
         }
     ],
-    "hex": "01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008b48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000"
+    "hex": "01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008b483045022100bb9810a687fbab9c7cbe717b71b51920d7223fa3cc132fa1e013386cd1db8ce102207e8796c4105c204960fdeb989ed7a8059021bff54df1ffea607ea0f9082a49ec01410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000"
 }
diff --git a/test/util/data/txcreatesignv2.hex b/test/util/data/txcreatesignv2.hex
--- a/test/util/data/txcreatesignv2.hex
+++ b/test/util/data/txcreatesignv2.hex
@@ -1 +1 @@
-02000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008a473044022079c7aa014177a2e973caf6df7c7b8f15399083b91eba370ea1e19c4caed9181e02205f8f8763505ce8e6cbdd2cd28fab3fd407a75003e7d0dc04e6bebb0a3c89e7cb01410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000
+02000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008b4830450221009e8308510e9d1419899ed2301941917026ca63d0e0b1aaf5faf0e38bff3e5c5d02203ea53cfdc5affce79a63fbde3963c4080af4305f02aa94e672582def5d8137e701410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000