diff --git a/src/ripple/overlay/impl/Manifest.cpp b/src/ripple/overlay/impl/Manifest.cpp index c9cb27c38..ee2f8d584 100644 --- a/src/ripple/overlay/impl/Manifest.cpp +++ b/src/ripple/overlay/impl/Manifest.cpp @@ -100,11 +100,11 @@ bool Manifest::verify () const STObject st (sfGeneric); SerialIter sit (serialized.data (), serialized.size ()); st.set (sit); - if (! ripple::verify (st, HashPrefix::manifest, signingKey, true)) + if (! ripple::verify (st, HashPrefix::manifest, signingKey)) return false; return ripple::verify ( - st, HashPrefix::manifest, masterKey, true, sfMasterSignature); + st, HashPrefix::manifest, masterKey, sfMasterSignature); } uint256 Manifest::hash () const diff --git a/src/ripple/protocol/Sign.h b/src/ripple/protocol/Sign.h index 1872ba593..86559958c 100644 --- a/src/ripple/protocol/Sign.h +++ b/src/ripple/protocol/Sign.h @@ -54,7 +54,7 @@ sign (STObject& st, HashPrefix const& prefix, */ bool verify (STObject const& st, HashPrefix const& prefix, - PublicKey const& pk, bool mustBeFullyCanonical, + PublicKey const& pk, SF_Blob const& sigField = sfSignature); /** Return a Serializer suitable for computing a multisigning TxnSignature. */ diff --git a/src/ripple/protocol/impl/Sign.cpp b/src/ripple/protocol/impl/Sign.cpp index 6995865f3..1555a8ec3 100644 --- a/src/ripple/protocol/impl/Sign.cpp +++ b/src/ripple/protocol/impl/Sign.cpp @@ -36,8 +36,7 @@ sign (STObject& st, HashPrefix const& prefix, bool verify (STObject const& st, HashPrefix const& prefix, - PublicKey const& pk, bool mustBeFullyCanonical, - SF_Blob const& sigField) + PublicKey const& pk, SF_Blob const& sigField) { auto const sig = get(st, sigField); if (! sig) diff --git a/src/test/overlay/manifest_test.cpp b/src/test/overlay/manifest_test.cpp index 4330193ae..cd6dd8010 100644 --- a/src/test/overlay/manifest_test.cpp +++ b/src/test/overlay/manifest_test.cpp @@ -114,11 +114,11 @@ public: st[sfSigningPubKey] = spk; sign(st, HashPrefix::manifest, stype, ssk); - BEAST_EXPECT(verify(st, HashPrefix::manifest, spk, true)); + BEAST_EXPECT(verify(st, HashPrefix::manifest, spk)); sign(st, HashPrefix::manifest, type, sk, sfMasterSignature); BEAST_EXPECT(verify( - st, HashPrefix::manifest, pk, true, sfMasterSignature)); + st, HashPrefix::manifest, pk, sfMasterSignature)); if (broken) {