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

Use the OpenSSL RNG for randomness that needs to be secure.

Browse Source
This commit is contained in:
JoelKatz
2012-08-05 00:54:28 -07:00
parent 3e3d367c98
commit ed8635c98d
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/SNTPClient.cpp
View File

@@ -3,6 +3,8 @@
#include <boost/bind.hpp>
#include <boost/make_shared.hpp>
#include <openssl/rand.h>
#include "utils.h"
#include "Log.h"
@@ -63,9 +65,9 @@ void SNTPClient::resolveComplete(const boost::system::error_code& error, boost::
}
query.mReceivedReply = false;
query.mLocalTimeSent = now;
query.mQueryMagic = rand();
RAND_bytes(reinterpret_cast<unsigned char *>(&query.mQueryNonce), sizeof(query.mQueryNonce));
reinterpret_cast<uint32*>(SNTPQueryData)[NTP_OFF_XMITTS_INT] = time(NULL) + NTP_UNIX_OFFSET;
reinterpret_cast<uint32*>(SNTPQueryData)[NTP_OFF_XMITTS_FRAC] = query.mQueryMagic;
reinterpret_cast<uint32*>(SNTPQueryData)[NTP_OFF_XMITTS_FRAC] = query.mQueryNonce;
mSocket.async_send_to(boost::asio::buffer(SNTPQueryData, 48), *sel,
boost::bind(&SNTPClient::sendComplete, this,
boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred));
@@ -91,8 +93,8 @@ void SNTPClient::receivePacket(const boost::system::error_code& error, std::size
Log(lsWARNING) << "SNTP: Late response";
else if (bytes_xferd < 48)
Log(lsWARNING) << "SNTP: Short reply (" << bytes_xferd << ") " << mReceiveBuffer.size();
else if (reinterpret_cast<uint32*>(&mReceiveBuffer[0])[NTP_OFF_ORGTS_FRAC] != query->second.mQueryMagic)
Log(lsWARNING) << "SNTP: Reply had wrong magic number";
else if (reinterpret_cast<uint32*>(&mReceiveBuffer[0])[NTP_OFF_ORGTS_FRAC] != query->second.mQueryNonce)
Log(lsWARNING) << "SNTP: Reply had wrong nonce";
else
processReply();
}

2
src/SNTPClient.h
View File

@@ -13,7 +13,7 @@ class SNTPQuery
public:
bool mReceivedReply;
time_t mLocalTimeSent;
int mQueryMagic;
int mQueryNonce;
SNTPQuery(time_t j = (time_t) -1) : mReceivedReply(false), mLocalTimeSent(j) { ; }
};