Rename and move DeterministicKeys into ripple_data

This commit is contained in:
Vinnie Falco
2013-05-29 16:01:36 -07:00
parent 2c525b03c6
commit 4fc2d3b274
5 changed files with 14 additions and 19 deletions

View File

@@ -1,16 +1,8 @@
#include <openssl/ec.h>
#include <openssl/bn.h>
#include <openssl/ecdsa.h>
#include <openssl/pem.h>
#include <openssl/err.h>
// #define EC_DEBUG // #define EC_DEBUG
// Functions to add CKey support for deterministic EC keys // Functions to add CKey support for deterministic EC keys
#include <boost/test/unit_test.hpp>
// <-- seed // <-- seed
uint128 CKey::PassPhraseToKey(const std::string& passPhrase) uint128 CKey::PassPhraseToKey(const std::string& passPhrase)
{ {

View File

@@ -38,7 +38,7 @@
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
// CKeyECIES // CKeyECIES, CKeyDeterministic
#include <openssl/ec.h> #include <openssl/ec.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/ecdsa.h> #include <openssl/ecdsa.h>
@@ -48,6 +48,9 @@
#include <vector> #include <vector>
#include <cassert> #include <cassert>
// CKeyDeterministic
#include <openssl/err.h>
#include <boost/test/unit_test.hpp>
#include "ripple_data.h" #include "ripple_data.h"
@@ -66,6 +69,7 @@
#include "crypto/ripple_CBigNum.cpp" #include "crypto/ripple_CBigNum.cpp"
#include "crypto/ripple_CKey.cpp" #include "crypto/ripple_CKey.cpp"
#include "crypto/ripple_CKeyDeterministic.cpp"
#include "crypto/ripple_CKeyECIES.cpp" #include "crypto/ripple_CKeyECIES.cpp"
#include "crypto/ripple_Base58.cpp" #include "crypto/ripple_Base58.cpp"
#include "crypto/ripple_Base58Data.cpp" #include "crypto/ripple_Base58Data.cpp"

View File

@@ -40,7 +40,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
#include "src/cpp/ripple/Amount.cpp" #include "src/cpp/ripple/Amount.cpp"
#include "src/cpp/ripple/AmountRound.cpp" #include "src/cpp/ripple/AmountRound.cpp"
#include "src/cpp/ripple/DeterministicKeys.cpp"
#include "src/cpp/ripple/HashedObject.cpp" #include "src/cpp/ripple/HashedObject.cpp"
#include "src/cpp/ripple/PackedMessage.cpp" // no log #include "src/cpp/ripple/PackedMessage.cpp" // no log
#include "src/cpp/ripple/ParameterTable.cpp" // no log #include "src/cpp/ripple/ParameterTable.cpp" // no log

View File

@@ -257,6 +257,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="modules\ripple_data\crypto\ripple_CKeyDeterministic.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="modules\ripple_data\crypto\ripple_CKeyECIES.cpp"> <ClCompile Include="modules\ripple_data\crypto\ripple_CKeyECIES.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -738,12 +744,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\DeterministicKeys.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\FeatureTable.cpp"> <ClCompile Include="src\cpp\ripple\FeatureTable.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

View File

@@ -486,9 +486,6 @@
<ClCompile Include="src\cpp\ripple\AmountRound.cpp"> <ClCompile Include="src\cpp\ripple\AmountRound.cpp">
<Filter>1. Modules\ripple_mess\types</Filter> <Filter>1. Modules\ripple_mess\types</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\DeterministicKeys.cpp">
<Filter>1. Modules\ripple_mess\types</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\HashedObject.cpp"> <ClCompile Include="src\cpp\ripple\HashedObject.cpp">
<Filter>1. Modules\ripple_mess\types</Filter> <Filter>1. Modules\ripple_mess\types</Filter>
</ClCompile> </ClCompile>
@@ -786,6 +783,9 @@
<ClCompile Include="modules\ripple_data\crypto\ripple_CKeyECIES.cpp"> <ClCompile Include="modules\ripple_data\crypto\ripple_CKeyECIES.cpp">
<Filter>1. Modules\ripple_data\crypto</Filter> <Filter>1. Modules\ripple_data\crypto</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="modules\ripple_data\crypto\ripple_CKeyDeterministic.cpp">
<Filter>1. Modules\ripple_data\types</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="database\sqlite3ext.h"> <ClInclude Include="database\sqlite3ext.h">