Merge pull request #2886 from gavinandresen/rpctiming
Make RPC password resistant to timing attacks
This commit is contained in:
commit
a0bb001431
3 changed files with 27 additions and 1 deletions
|
@ -476,7 +476,7 @@ bool HTTPAuthorized(map<string, string>& mapHeaders)
|
|||
return false;
|
||||
string strUserPass64 = strAuth.substr(6); boost::trim(strUserPass64);
|
||||
string strUserPass = DecodeBase64(strUserPass64);
|
||||
return strUserPass == strRPCUserColonPass;
|
||||
return TimingResistantEqual(strUserPass, strRPCUserColonPass);
|
||||
}
|
||||
|
||||
//
|
||||
|
|
|
@ -291,4 +291,15 @@ BOOST_AUTO_TEST_CASE(util_seed_insecure_rand)
|
|||
}
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(util_TimingResistantEqual)
|
||||
{
|
||||
BOOST_CHECK(TimingResistantEqual(std::string(""), std::string("")));
|
||||
BOOST_CHECK(!TimingResistantEqual(std::string("abc"), std::string("")));
|
||||
BOOST_CHECK(!TimingResistantEqual(std::string(""), std::string("abc")));
|
||||
BOOST_CHECK(!TimingResistantEqual(std::string("a"), std::string("aa")));
|
||||
BOOST_CHECK(!TimingResistantEqual(std::string("aa"), std::string("a")));
|
||||
BOOST_CHECK(TimingResistantEqual(std::string("abc"), std::string("abc")));
|
||||
BOOST_CHECK(!TimingResistantEqual(std::string("abc"), std::string("aba")));
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_SUITE_END()
|
||||
|
|
15
src/util.h
15
src/util.h
|
@ -437,6 +437,21 @@ static inline uint32_t insecure_rand(void)
|
|||
*/
|
||||
void seed_insecure_rand(bool fDeterministic=false);
|
||||
|
||||
/**
|
||||
* Timing-attack-resistant comparison.
|
||||
* Takes time proportional to length
|
||||
* of first argument.
|
||||
*/
|
||||
template <typename T>
|
||||
bool TimingResistantEqual(const T& a, const T& b)
|
||||
{
|
||||
if (b.size() == 0) return a.size() == 0;
|
||||
size_t accumulator = a.size() ^ b.size();
|
||||
for (size_t i = 0; i < a.size(); i++)
|
||||
accumulator |= a[i] ^ b[i%b.size()];
|
||||
return accumulator == 0;
|
||||
}
|
||||
|
||||
/** Median filter over a stream of values.
|
||||
* Returns the median of the last N numbers
|
||||
*/
|
||||
|
|
Loading…
Add table
Reference in a new issue