Merge branch 'origin/rti2'

diff --git a/BOINC software/BOINC client apps/distrrtgen/distrrtgen.sln b/BOINC software/BOINC client apps/distrrtgen/distrrtgen.sln
index 24b2d5bcd0e414e360fd49b5e4daeb5c96a3f456..69698534b3abece5102bb12291b2dcf0f0e6f08e 100644 (file)
--- a/BOINC software/BOINC client apps/distrrtgen/distrrtgen.sln
+++ b/BOINC software/BOINC client apps/distrrtgen/distrrtgen.sln
@@ -1,9 +1,9 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "distrrtgen", "distrrtgen.vcproj", "{A3BDF5F8-4D0A-4B27-B1D9-7E77CBDA86C7}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "distrrtgen", "distrrtgen.vcxproj", "{A3BDF5F8-4D0A-4B27-B1D9-7E77CBDA86C7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "index_calculator", "..\index_calculator\index_calculator.vcproj", "{C7A957CF-9FDC-4C72-9C3E-7C029E915D1E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "index_calculator", "..\index_calculator\index_calculator.vcxproj", "{C7A957CF-9FDC-4C72-9C3E-7C029E915D1E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rti2rto", "..\..\standalone\rti2rto\rti2rto.vcproj", "{E0FBC06A-C902-4468-A614-CBF9F591AA7C}"
 EndProject
@@ -15,7 +15,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtperfectp", "..\..\standal
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rcracki", "..\..\standalone\rcracki\rcracki.vcproj", "{966DA4B4-E13C-449D-9A93-303C6FEA25C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chain_checker", "..\chain_checker\chain_checker.vcproj", "{74C09EAC-2EA2-4548-9B61-0FEE56147DFE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chain_checker", "..\chain_checker\chain_checker.vcxproj", "{74C09EAC-2EA2-4548-9B61-0FEE56147DFE}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/BOINC software/BOINC client apps/distrrtgen/distrrtgen.suo b/BOINC software/BOINC client apps/distrrtgen/distrrtgen.suo
index cb8fc8fceb57d6cdbac3297ffc6cd299d84a2d64..5691790d8d898d68a6cb0177e31086b15ff71ae7 100644 (file)
Binary files a/BOINC software/BOINC client apps/distrrtgen/distrrtgen.suo and b/BOINC software/BOINC client apps/distrrtgen/distrrtgen.suo differ

diff --git a/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj b/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj
index 538bc6240fba3be134b72d82d1c968084ca43296..d45c6d122673c8ccedacb258a881f3794e5a819a 100644 (file)
--- a/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj
+++ b/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj
@@ -114,11 +114,11 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>C:\Users\mwj\git\Common\rt api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_MT;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>C:\Users\mwj\Desktop\frt\rti2\Common\rt api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>BOINC;WIN32;NDEBUG;_MT;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
@@ -126,7 +126,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;libcmt.lib;libcpmt.lib;libboinc_staticcrt.lib;libboincapi_staticcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;libcmt.lib;libcpmt.lib;C:\lib\boinc\Win32\Release\2010\libboinc_staticcrt.lib;C:\lib\boinc\Win32\Release\2010\libboincapi_staticcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -213,6 +213,7 @@
     <ClInclude Include="..\..\..\Common\rt api\ChainWalkContext.h" />
     <ClInclude Include="..\..\..\Common\rt api\des.h" />
     <ClInclude Include="..\..\..\Common\rt api\des_locl.h" />
+    <ClInclude Include="..\..\..\Common\rt api\global.h" />
     <ClInclude Include="distrrtgen.h" />
     <ClInclude Include="..\..\..\Common\rt api\HashAlgorithm.h" />
     <ClInclude Include="..\..\..\Common\rt api\HashRoutine.h" />

diff --git a/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj.filters b/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj.filters
index 7253c31589e035e42241033376e54bd596c3305c..8dc6044f14f853be95db8359b57148eb833ae71c 100644 (file)
--- a/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj.filters
+++ b/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj.filters
@@ -83,5 +83,8 @@
     <ClInclude Include="..\..\..\Common\rt api\spr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Common\rt api\global.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/Client Applications/converti2/converti2.suo b/Client Applications/converti2/converti2.suo
index d24f654f1b2fc9a7db14eb69e0ba308469741148..969775df93c826044223479c653332e27dce4f7c 100644 (file)
Binary files a/Client Applications/converti2/converti2.suo and b/Client Applications/converti2/converti2.suo differ

diff --git a/Common/rt api/Public.cpp b/Common/rt api/Public.cpp
index 66e8ce46638521020d0dc13b4f76bd3c3e171403..57c9fe13674062b8737d325ef93ce44671c1e3ba 100644 (file)
--- a/Common/rt api/Public.cpp
+++ b/Common/rt api/Public.cpp
@@ -125,6 +125,9 @@ bool GetHybridCharsets(string sCharset, vector<tCharset>& vCharset)
 bool boinc_ReadLinesFromFile(string sPathName, vector<string>& vLine)
 {
        vLine.clear();
+       vLine.push_back("loweralpha-space            = [abcdefghijklmnopqrstuvwxyz ]");
+       vLine.push_back("loweralpha                  = [abcdefghijklmnopqrstuvwxyz]");
+/*
        char input_path[512];
        boinc_resolve_filename(sPathName.c_str(), input_path, sizeof(input_path));
        FILE *file = boinc_fopen(input_path, "rb");
@@ -166,7 +169,7 @@ bool boinc_ReadLinesFromFile(string sPathName, vector<string>& vLine)
        }
        else
                return false;
-
+               */
        return true;
 }
 #endif 

diff --git a/Common/rt api/des_enc.c b/Common/rt api/des_enc.c
index a2dd9131cb7dbe0e7ab85356a7daa6266048fc77..75c2de543b538270ecfa7fa72aedf517ebcb2af0 100644 (file)
--- a/Common/rt api/des_enc.c
+++ b/Common/rt api/des_enc.c
@@ -63,6 +63,8 @@
 #include "spr.h"
 
 extern const DES_LONG des_SPtrans[8][64];
+
+
 void des_encrypt1(DES_LONG *data, des_key_schedule ks, int enc)
 {
        register DES_LONG l,r,t,u;

diff --git a/Common/rt api/ecb_enc.c b/Common/rt api/ecb_enc.c
index 4a6093d389f1f7a97d5bc54343bed5960e1a4d0e..63d209aa90e55ab169d1db1cd7164ef81b65de54 100644 (file)
--- a/Common/rt api/ecb_enc.c
+++ b/Common/rt api/ecb_enc.c
@@ -51,11 +51,13 @@
 
 #include <stdio.h>
 #include "des_locl.h"
-#include "spr.h"
+//#include "spr.h"
 
 /* char *libdes_version="libdes v 3.24 - 20-Apr-1996 - eay"; */ /* wrong */
 /* char *DES_version="DES part of SSLeay 0.6.4 30-Aug-1996"; */
 
+extern const DES_LONG des_SPtrans[8][64];
+
 char *des_options(void)
         {
         static int init=1;

diff --git a/Common/rt api/sk.h b/Common/rt api/sk.h
index 209dca61448b0d705a8fc1aeebe14f8966939746..b91473aaa8b7f5706f8ba47a3ab2f88da32ffcdd 100644 (file)
--- a/Common/rt api/sk.h
+++ b/Common/rt api/sk.h
@@ -47,7 +47,6 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-
 static const DES_LONG des_skb[8][64]={
 {
 /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */

diff --git a/Common/rt api/spr.h b/Common/rt api/spr.h
index 4fd00b6179b0214266e880fd922f62a53d5701cc..187cd269bd8d5f1f6a27dca25d743bd6981a0263 100644 (file)
--- a/Common/rt api/spr.h
+++ b/Common/rt api/spr.h
@@ -59,6 +59,9 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef __SPR_H__
+#define __SPR_H__
+
 const DES_LONG des_SPtrans[8][64]={
 {
 /* nibble 0 */
@@ -205,3 +208,5 @@ const DES_LONG des_SPtrans[8][64]={
 0x00000080L, 0x20820000L, 0x00820080L, 0x00000000L,
 0x20000000L, 0x20800080L, 0x00020000L, 0x00820080L,
 }};
+
+#endif
\ No newline at end of file