ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split DH from utils, remove utils from project

Browse Source
This commit is contained in:
Vinnie Falco
2013-05-27 10:41:50 -07:00
parent e842548a29
commit 92bdcba096
33 changed files with 44 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/ripple_basics/ripple_basics.cpp
View File

@@ -65,13 +65,14 @@
#include "containers/ripple_RangeSet.cpp"
#include "utility/ripple_Log.cpp"
#include "utility/ripple_UptimeTimer.cpp"
#include "utility/ripple_StringUtilities.cpp"
#include "utility/ripple_ByteOrder.cpp"
#include "utility/ripple_DiffieHellmanUtil.cpp"
#include "utility/ripple_StringUtilities.cpp"
#include "utility/ripple_Sustain.cpp"
#include "utility/ripple_ThreadName.cpp"
#include "utility/ripple_Time.cpp"
#include "utility/ripple_UptimeTimer.cpp"
#ifdef WIN32
#include <windows.h> // for ripple_RandomNumbers.cpp

7
modules/ripple_basics/ripple_basics.h
View File

@@ -90,6 +90,8 @@ namespace boost {
#include <boost/format.hpp>
#include <boost/lexical_cast.hpp>
// VFALCO: TODO, remove this dependency!!!
#include <openssl/dh.h> // for DiffieHellmanUtil
#include "../ripple_json/ripple_json.h"
@@ -103,12 +105,13 @@ namespace boost {
#include "containers/ripple_TaggedCache.h"
#include "utility/ripple_ByteOrder.h"
#include "utility/ripple_StringUtilities.h"
#include "utility/ripple_UptimeTimer.h"
#include "utility/ripple_DiffieHellmanUtil.h"
#include "utility/ripple_PlatformMacros.h"
#include "utility/ripple_RandomNumbers.h"
#include "utility/ripple_StringUtilities.h"
#include "utility/ripple_Sustain.h"
#include "utility/ripple_ThreadName.h"
#include "utility/ripple_Time.h"
#include "utility/ripple_UptimeTimer.h"
#endif

31
modules/ripple_basics/utility/ripple_DiffieHellmanUtil.cpp Normal file
View File

@@ -0,0 +1,31 @@
std::string DH_der_gen(int iKeyLength)
{
DH* dh = 0;
int iCodes;
std::string strDer;
do {
dh = DH_generate_parameters(iKeyLength, DH_GENERATOR_5, NULL, NULL);
iCodes = 0;
DH_check(dh, &iCodes);
} while (iCodes & (DH_CHECK_P_NOT_PRIME|DH_CHECK_P_NOT_SAFE_PRIME|DH_UNABLE_TO_CHECK_GENERATOR|DH_NOT_SUITABLE_GENERATOR));
strDer.resize(i2d_DHparams(dh, NULL));
unsigned char* next = reinterpret_cast<unsigned char *>(&strDer[0]);
(void) i2d_DHparams(dh, &next);
return strDer;
}
DH* DH_der_load(const std::string& strDer)
{
const unsigned char *pbuf = reinterpret_cast<const unsigned char *>(&strDer[0]);
return d2i_DHparams(NULL, &pbuf, strDer.size());
}
// vim:ts=4

11
modules/ripple_basics/utility/ripple_DiffieHellmanUtil.h Normal file
View File

@@ -0,0 +1,11 @@
#ifndef RIPPLE_DIFFIEHELLMANUTIL_H
#define RIPPLE_DIFFIEHELLMANUTIL_H
extern DH* DH_der_load (const std::string& strDer);
extern std::string DH_der_gen (int iKeyLength);
#endif
// vim:ts=4

6
modules/ripple_basics/utility/ripple_PlatformMacros.h
View File

@@ -49,4 +49,10 @@
#endif
// VFALCO: TODO, Clean this junk up
#define nothing() do {} while (0)
#define fallthru() do {} while (0)
#define NUMBER(x) (sizeof(x)/sizeof((x)[0]))
#define isSetBit(x,y) (!!((x) & (y)))
#endif

1
modules/ripple_ledger/ripple_ledger.cpp
View File

@@ -120,7 +120,6 @@
#include "src/cpp/ripple/TransactionQueue.h"
#include "src/cpp/ripple/Transactor.h"
#include "src/cpp/ripple/TrustSetTransactor.h"
#include "src/cpp/ripple/utils.h"
#include "src/cpp/ripple/ValidationCollection.h"
#include "src/cpp/ripple/Wallet.h"
#include "src/cpp/ripple/WalletAddTransactor.h"

1
modules/ripple_mess/ripple_mess.cpp
View File

@@ -65,7 +65,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
#include "src/cpp/ripple/SHAMapDiff.cpp" // no log
#include "src/cpp/ripple/SHAMapNodes.cpp" // no log
#include "src/cpp/ripple/SHAMapSync.cpp"
#include "src/cpp/ripple/utils.cpp" // no log
#include "ripple.pb.cc"