ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master (0.90.1) into develop (1.0.0-b2):

Browse Source 
The merge also updates the RELEASENOTES.md with the release
notes for the 0.90.1 which were accidentally not included
in that release.
This commit is contained in:
Nikolaos D. Bougalis
2018-03-23 16:21:35 -07:00
parent 881cd4cfad 067dbf299c
commit 2b8893dfca
49 changed files with 437 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ripple/protocol/STValidation.h
View File

@@ -71,15 +71,24 @@ public:
bool checkSignature)
: STObject(getFormat(), sit, sfValidation)
{
mNodeID =
lookupNodeID(PublicKey(makeSlice(getFieldVL(sfSigningPubKey))));
assert(mNodeID.isNonZero());
auto const spk = getFieldVL(sfSigningPubKey);
if (checkSignature && !isValid())
if (publicKeyType(makeSlice(spk)) != KeyType::secp256k1)
{
JLOG(debugLog().error()) << "Invalid validation" << getJson(0);
Throw<std::runtime_error>("Invalid validation");
JLOG (debugLog().error())
<< "Invalid public key in validation" << getJson (0);
Throw<std::runtime_error> ("Invalid public key in validation");
}
if (checkSignature && !isValid ())
{
JLOG (debugLog().error())
<< "Invalid signature in validation" << getJson (0);
Throw<std::runtime_error> ("Invalid signature in validation");
}
mNodeID = lookupNodeID(PublicKey(makeSlice(spk)));
assert(mNodeID.isNonZero());
}
/** Construct a new STValidation
@@ -130,9 +139,6 @@ public:
NetClock::time_point
getSeenTime() const;
std::uint32_t
getFlags() const;
PublicKey
getSignerPublic() const;