merged RTI2 and distrrtgen_linux branch

diff --git a/BOINC software/BOINC client apps/distrrtgen/Makefile b/BOINC software/BOINC client apps/distrrtgen/Makefile
index 153f289d924b66be1935d92c60139204c72415ae..d33961fc715be421dd145305e73c644acb5c4396 100644 (file)
--- a/BOINC software/BOINC client apps/distrrtgen/Makefile
+++ b/BOINC software/BOINC client apps/distrrtgen/Makefile
@@ -28,20 +28,20 @@ BOINC_DIR = /usr/share/boinc-dev
 BOINC_API_DIR = $(BOINC_DIR)/api
 BOINC_LIB_DIR = $(BOINC_DIR)/lib
 COMMON_LIB_DIR = /usr/lib
+INCLUDES = -I../../../Common/rt\ api -I$(BOINC_DIR) -I$(BOINC_LIB_DIR) -I$(BOINC_API_DIR) 
+COMMON_API_PATH = ../../../Common/rt\ api
 
 OPTIMIZATION = -O3
 
 CXXFLAGS = -g \
     -static -static-libgcc \
-    -I$(BOINC_DIR) \
-    -I$(BOINC_LIB_DIR) \
-    -I$(BOINC_API_DIR) \
         -Wall \
         -c \
         -DBOINC \
+        $(INCLUDES) \
         $(OPTIMIZATION)
 
-LFLAGS = -static -static-libgcc -Wall $(OPTIMIZATION) -L$(BOINC_API_DIR) \
+LFLAGS = -static -static-libgcc -Wall $(INCLUDES) $(OPTIMIZATION) -L$(BOINC_API_DIR) \
        -L$(BOINC_LIB_DIR) -L /usr/X11R6/lib -L.
 
 LIBS = -lboinc_api -lboinc -lpthread -lssl libstdc++.a $(COMMON_LIB_DIR)/libssl.a $(COMMON_LIB_DIR)/libpthread.a
@@ -65,32 +65,32 @@ distclean:
 
 rebuild: clean all
 
-ChainWalkContext.o: ChainWalkContext.h ChainWalkContext.cpp HashRoutine.h Public.h
-       $(CXX) $(CXXFLAGS) ChainWalkContext.cpp
+ChainWalkContext.o: $(COMMON_API_PATH)/ChainWalkContext.h $(COMMON_API_PATH)/ChainWalkContext.cpp $(COMMON_API_PATH)/HashRoutine.h $(COMMON_API_PATH)/Public.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/ChainWalkContext.cpp
 
-des_enc.o: des_enc.c des_locl.h spr.h
-       $(CXX) $(CXXFLAGS) des_enc.c
+des_enc.o: $(COMMON_API_PATH)/des_enc.c $(COMMON_API_PATH)/des_locl.h $(COMMON_API_PATH)/spr.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/des_enc.c
 
-des_setkey.o: des_setkey.c des_locl.h podd.h sk.h
-       $(CXX) $(CXXFLAGS) des_setkey.c
+des_setkey.o: $(COMMON_API_PATH)/des_setkey.c $(COMMON_API_PATH)/des_locl.h $(COMMON_API_PATH)/podd.h $(COMMON_API_PATH)/sk.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/des_setkey.c
 
-distrrtgen.o: distrrtgen.cpp distrrtgen.h ChainWalkContext.h Public.h
+distrrtgen.o: distrrtgen.cpp distrrtgen.h $(COMMON_API_PATH)/ChainWalkContext.h $(COMMON_API_PATH)/Public.h
        $(CXX) $(CXXFLAGS) distrrtgen.cpp
 
-ecb_enc.o: ecb_enc.c des_locl.h spr.h
-       $(CXX) $(CXXFLAGS) ecb_enc.c
+ecb_enc.o: $(COMMON_API_PATH)/ecb_enc.c $(COMMON_API_PATH)/des_locl.h $(COMMON_API_PATH)/spr.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/ecb_enc.c
 
-HashAlgorithm.o: HashAlgorithm.h HashAlgorithm.cpp Public.h md4.h md5.h
-       $(CXX) $(CXXFLAGS) HashAlgorithm.cpp
+HashAlgorithm.o: $(COMMON_API_PATH)/HashAlgorithm.h $(COMMON_API_PATH)/HashAlgorithm.cpp $(COMMON_API_PATH)/Public.h $(COMMON_API_PATH)/md4.h $(COMMON_API_PATH)/md5.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/HashAlgorithm.cpp
 
-HashRoutine.o: HashRoutine.h HashRoutine.cpp global.h HashAlgorithm.h
-       $(CXX) $(CXXFLAGS) HashRoutine.cpp
+HashRoutine.o: $(COMMON_API_PATH)/HashRoutine.h $(COMMON_API_PATH)/HashRoutine.cpp $(COMMON_API_PATH)/global.h $(COMMON_API_PATH)/HashAlgorithm.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/HashRoutine.cpp
 
-md4.o: md4.h md4.cpp global.h
-       $(CXX) $(CXXFLAGS) md4.cpp
+md4.o: $(COMMON_API_PATH)/md4.h $(COMMON_API_PATH)/md4.cpp $(COMMON_API_PATH)/global.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/md4.cpp
 
-md5.o: md5.h md5.cpp global.h
-       $(CXX) $(CXXFLAGS) md5.cpp
+md5.o: $(COMMON_API_PATH)/md5.h $(COMMON_API_PATH)/md5.cpp $(COMMON_API_PATH)/global.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/md5.cpp
 
-Public.o: Public.h Public.cpp global.h
-       $(CXX) $(CXXFLAGS) Public.cpp
+Public.o: $(COMMON_API_PATH)/Public.h $(COMMON_API_PATH)/Public.cpp $(COMMON_API_PATH)/global.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/Public.cpp

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 91e3519b8fc734101c63d40e00ed5cbc7d413147..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 96f76e471c2a327e163657eac2fe37ea77cc872d..0fb305ca52bef56967b6f3a473b92d8aad2f75d6 100644 (file)
--- a/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj
+++ b/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -118,7 +118,7 @@
       <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>
@@ -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/des_enc.c b/Common/rt api/des_enc.c
index 8364c746d775e2b941059003f15df63b879a0dd2..f2c99b7d64d086728dd5664180f4b12ac1616c31 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 d5dce8a273bfadc2b59811bb050624f87fe766ad..187cd269bd8d5f1f6a27dca25d743bd6981a0263 100644 (file)
--- a/Common/rt api/spr.h
+++ b/Common/rt api/spr.h
@@ -61,6 +61,7 @@
 
 #ifndef __SPR_H__
 #define __SPR_H__
+
 const DES_LONG des_SPtrans[8][64]={
 {
 /* nibble 0 */