From 4fc2d3b274dde5a1fc2e1643330f937bf1c54656 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Wed, 29 May 2013 16:01:36 -0700
Subject: [PATCH] Rename and move DeterministicKeys into ripple_data

---
 .../ripple_data/crypto/ripple_CKeyDeterministic.cpp  |  8 --------
 modules/ripple_data/ripple_data.cpp                  |  6 +++++-
 modules/ripple_mess/ripple_mess.cpp                  |  1 -
 newcoin.vcxproj                                      | 12 ++++++------
 newcoin.vcxproj.filters                              |  6 +++---
 5 files changed, 14 insertions(+), 19 deletions(-)
 rename src/cpp/ripple/DeterministicKeys.cpp => modules/ripple_data/crypto/ripple_CKeyDeterministic.cpp (97%)

diff --git a/src/cpp/ripple/DeterministicKeys.cpp b/modules/ripple_data/crypto/ripple_CKeyDeterministic.cpp
similarity index 97%
rename from src/cpp/ripple/DeterministicKeys.cpp
rename to modules/ripple_data/crypto/ripple_CKeyDeterministic.cpp
index 2adfa17c0..48584a48e 100644
--- a/src/cpp/ripple/DeterministicKeys.cpp
+++ b/modules/ripple_data/crypto/ripple_CKeyDeterministic.cpp
@@ -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
 
 // Functions to add CKey support for deterministic EC keys
 
-#include <boost/test/unit_test.hpp>
-
 // <-- seed
 uint128 CKey::PassPhraseToKey(const std::string& passPhrase)
 {
diff --git a/modules/ripple_data/ripple_data.cpp b/modules/ripple_data/ripple_data.cpp
index 31b444d31..a5efc4bc7 100644
--- a/modules/ripple_data/ripple_data.cpp
+++ b/modules/ripple_data/ripple_data.cpp
@@ -38,7 +38,7 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/foreach.hpp>
 
-// CKeyECIES
+// CKeyECIES, CKeyDeterministic
 #include <openssl/ec.h>
 #include <openssl/bn.h>
 #include <openssl/ecdsa.h>
@@ -48,6 +48,9 @@
 #include <vector>
 #include <cassert>
 
+// CKeyDeterministic
+#include <openssl/err.h>
+#include <boost/test/unit_test.hpp>
 
 
 #include "ripple_data.h"
@@ -66,6 +69,7 @@
 
 #include "crypto/ripple_CBigNum.cpp"
 #include "crypto/ripple_CKey.cpp"
+#include "crypto/ripple_CKeyDeterministic.cpp"
 #include "crypto/ripple_CKeyECIES.cpp"
 #include "crypto/ripple_Base58.cpp"
 #include "crypto/ripple_Base58Data.cpp"
diff --git a/modules/ripple_mess/ripple_mess.cpp b/modules/ripple_mess/ripple_mess.cpp
index 6e3486236..d5ab387f3 100644
--- a/modules/ripple_mess/ripple_mess.cpp
+++ b/modules/ripple_mess/ripple_mess.cpp
@@ -40,7 +40,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 
 #include "src/cpp/ripple/Amount.cpp"
 #include "src/cpp/ripple/AmountRound.cpp"
-#include "src/cpp/ripple/DeterministicKeys.cpp"
 #include "src/cpp/ripple/HashedObject.cpp"
 #include "src/cpp/ripple/PackedMessage.cpp" // no log
 #include "src/cpp/ripple/ParameterTable.cpp" // no log
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index afc68d059..767555648 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -257,6 +257,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </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">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|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)'=='Release|x64'">true</ExcludedFromBuild>
     </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">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 187e811e0..87d677b97 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -486,9 +486,6 @@
     <ClCompile Include="src\cpp\ripple\AmountRound.cpp">
       <Filter>1. Modules\ripple_mess\types</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\DeterministicKeys.cpp">
-      <Filter>1. Modules\ripple_mess\types</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\ripple\HashedObject.cpp">
       <Filter>1. Modules\ripple_mess\types</Filter>
     </ClCompile>
@@ -786,6 +783,9 @@
     <ClCompile Include="modules\ripple_data\crypto\ripple_CKeyECIES.cpp">
       <Filter>1. Modules\ripple_data\crypto</Filter>
     </ClCompile>
+    <ClCompile Include="modules\ripple_data\crypto\ripple_CKeyDeterministic.cpp">
+      <Filter>1. Modules\ripple_data\types</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="database\sqlite3ext.h">