From 9df9cf5a9f5f56261b0b226dec6249f9dfbefed6 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 7 Oct 2014 02:22:47 +0200
Subject: Make SCRIPT_VERIFY_STRICTENC compatible with BIP62

* Delete canonical_tests.cpp, and move the tests to script_tests.cpp.
* Split off SCRIPT_VERIFY_DERSIG from SCRIPT_VERIFY_STRICTENC (the BIP62 part of it).
* Change signature STRICTENC/DERSIG semantics to fail the script entirely rather than the CHECKSIG result (softfork safety, and BIP62 requirement).
* Add many autogenerated tests for several odd cases.
* Mention specific BIP62 rules in the script verification flags.
---
 src/test/canonical_tests.cpp | 113 -------------------------------------------
 1 file changed, 113 deletions(-)
 delete mode 100644 src/test/canonical_tests.cpp

(limited to 'src/test/canonical_tests.cpp')

diff --git a/src/test/canonical_tests.cpp b/src/test/canonical_tests.cpp
deleted file mode 100644
index a17099de72..0000000000
--- a/src/test/canonical_tests.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) 2012-2013 The Bitcoin Core developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-//
-// Unit tests for canonical signatures
-//
-
-#include "data/sig_noncanonical.json.h"
-#include "data/sig_canonical.json.h"
-#include "key.h"
-#include "random.h"
-#include "script/interpreter.h"
-#include "util.h"
-#include "utilstrencodings.h"
-
-#include <boost/foreach.hpp>
-#include <boost/test/unit_test.hpp>
-#include "json/json_spirit_writer_template.h"
-#include <openssl/ecdsa.h>
-
-using namespace std;
-using namespace json_spirit;
-
-// In script_tests.cpp
-extern Array read_json(const std::string& jsondata);
-
-BOOST_AUTO_TEST_SUITE(canonical_tests)
-
-// OpenSSL-based test for canonical signature (without test for hashtype byte)
-bool static IsCanonicalSignature_OpenSSL_inner(const std::vector<unsigned char>& vchSig)
-{
-    if (vchSig.size() == 0)
-        return false;
-    const unsigned char *input = &vchSig[0];
-    ECDSA_SIG *psig = NULL;
-    d2i_ECDSA_SIG(&psig, &input, vchSig.size());
-    if (psig == NULL)
-        return false;
-    unsigned char buf[256];
-    unsigned char *pbuf = buf;
-    unsigned int nLen = i2d_ECDSA_SIG(psig, NULL);
-    if (nLen != vchSig.size()) {
-        ECDSA_SIG_free(psig);
-        return false;
-    }
-    nLen = i2d_ECDSA_SIG(psig, &pbuf);
-    ECDSA_SIG_free(psig);
-    return (memcmp(&vchSig[0], &buf[0], nLen) == 0);
-}
-
-// OpenSSL-based test for canonical signature
-bool static IsCanonicalSignature_OpenSSL(const std::vector<unsigned char> &vchSignature) {
-    if (vchSignature.size() < 1)
-        return false;
-    if (vchSignature.size() > 127)
-        return false;
-    if (vchSignature[vchSignature.size() - 1] & 0x7C)
-        return false;
-
-    std::vector<unsigned char> vchSig(vchSignature);
-    vchSig.pop_back();
-    if (!IsCanonicalSignature_OpenSSL_inner(vchSig))
-        return false;
-    return true;
-}
-
-BOOST_AUTO_TEST_CASE(script_canon)
-{
-    Array tests = read_json(std::string(json_tests::sig_canonical, json_tests::sig_canonical + sizeof(json_tests::sig_canonical)));
-
-    BOOST_FOREACH(Value &tv, tests) {
-        string test = tv.get_str();
-        if (IsHex(test)) {
-            std::vector<unsigned char> sig = ParseHex(test);
-            BOOST_CHECK_MESSAGE(IsCanonicalSignature(sig, SCRIPT_VERIFY_STRICTENC), test);
-            BOOST_CHECK_MESSAGE(IsCanonicalSignature_OpenSSL(sig), test);
-        }
-    }
-}
-
-BOOST_AUTO_TEST_CASE(script_noncanon)
-{
-    Array tests = read_json(std::string(json_tests::sig_noncanonical, json_tests::sig_noncanonical + sizeof(json_tests::sig_noncanonical)));
-
-    BOOST_FOREACH(Value &tv, tests) {
-        string test = tv.get_str();
-        if (IsHex(test)) {
-            std::vector<unsigned char> sig = ParseHex(test);
-            BOOST_CHECK_MESSAGE(!IsCanonicalSignature(sig, SCRIPT_VERIFY_STRICTENC), test);
-            BOOST_CHECK_MESSAGE(!IsCanonicalSignature_OpenSSL(sig), test);
-        }
-    }
-}
-
-BOOST_AUTO_TEST_CASE(script_signstrict)
-{
-    for (int i=0; i<100; i++) {
-        CKey key;
-        key.MakeNewKey(i & 1);
-        std::vector<unsigned char> sig;
-        uint256 hash = GetRandHash();
-
-        BOOST_CHECK(key.Sign(hash, sig)); // Generate a random signature.
-        BOOST_CHECK(key.GetPubKey().Verify(hash, sig)); // Check it.
-        sig.push_back(0x01); // Append a sighash type.
-
-        BOOST_CHECK(IsCanonicalSignature(sig, SCRIPT_VERIFY_STRICTENC | SCRIPT_VERIFY_LOW_S));
-        BOOST_CHECK(IsCanonicalSignature_OpenSSL(sig));
-    }
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-- 
cgit v1.2.3