From: Martin Westergaard Date: Sat, 30 Oct 2010 15:50:43 +0000 (+0200) Subject: merged RTI2 and distrrtgen_linux branch X-Git-Url: https://git.sesse.net/?p=freerainbowtables;a=commitdiff_plain;h=2fc61ff60954ebd5d560acfe3dc9653064ce40b5;hp=39d038a035dee3da1d308f252d54479b0caa5256 merged RTI2 and distrrtgen_linux branch --- diff --git a/BOINC software/BOINC client apps/distrrtgen/createlinks.bat b/BOINC software/BOINC client apps/distrrtgen/createlinks.bat deleted file mode 100644 index 213689b..0000000 --- a/BOINC software/BOINC client apps/distrrtgen/createlinks.bat +++ /dev/null @@ -1,21 +0,0 @@ -mklink /H ChainWalkContext.cpp "../../../Common/rt api/ChainWalkContext.cpp" -mklink /H ChainWalkContext.h "../../../Common/rt api/ChainWalkContext.h" -mklink /H des.h "../../../Common/rt api/des.h" -mklink /H des_enc.c "../../../Common/rt api/des_enc.c" -mklink /H des_locl.h "../../../Common/rt api/des_locl.h" -mklink /H des_setkey.c "../../../Common/rt api/des_setkey.c" -mklink /H ecb_enc.c "../../../Common/rt api/ecb_enc.c" -mklink /H global.h "../../../Common/rt api/global.h" -mklink /H HashAlgorithm.h "../../../Common/rt api/HashAlgorithm.h" -mklink /H HashAlgorithm.cpp "../../../Common/rt api/HashAlgorithm.cpp" -mklink /H HashRoutine.cpp "../../../Common/rt api/HashRoutine.cpp" -mklink /H HashRoutine.h "../../../Common/rt api/HashRoutine.h" -mklink /H md4.cpp "../../../Common/rt api/md4.cpp" -mklink /H md4.h "../../../Common/rt api/md4.h" -mklink /H md5.cpp "../../../Common/rt api/md5.cpp" -mklink /H md5.h "../../../Common/rt api/md5.h" -mklink /H podd.h "../../../Common/rt api/podd.h" -mklink /H Public.cpp "../../../Common/rt api/Public.cpp" -mklink /H Public.h "../../../Common/rt api/Public.h" -mklink /H sk.h "../../../Common/rt api/sk.h" -mklink /H spr.h "../../../Common/rt api/spr.h" diff --git a/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj b/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj index d45c6d1..0fb305c 100644 --- a/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj +++ b/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj @@ -1,4 +1,4 @@ - + @@ -89,8 +89,8 @@ Disabled - /boinc/lib;/boinc/api;/boinc/zip;/boinc/client/win;/boinc/;../../rt api;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_MT;_CONSOLE;%(PreprocessorDefinitions) + ../../../common/rt api;%(AdditionalIncludeDirectories) + BOINC;WIN32;_DEBUG;_MT;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -114,7 +114,7 @@ true Speed true - C:\Users\mwj\Desktop\frt\rti2\Common\rt api;%(AdditionalIncludeDirectories) + ..\..\..\Common\rt api;%(AdditionalIncludeDirectories) BOINC;WIN32;NDEBUG;_MT;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded true diff --git a/BOINC software/BOINC client apps/win_build/boinc_apps.sln b/BOINC software/BOINC client apps/win_build/boinc_apps.sln new file mode 100644 index 0000000..ac2739c --- /dev/null +++ b/BOINC software/BOINC client apps/win_build/boinc_apps.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "distrrtgen", "..\distrrtgen\distrrtgen.vcxproj", "{A3BDF5F8-4D0A-4B27-B1D9-7E77CBDA86C7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A3BDF5F8-4D0A-4B27-B1D9-7E77CBDA86C7}.Debug|Win32.ActiveCfg = Debug|Win32 + {A3BDF5F8-4D0A-4B27-B1D9-7E77CBDA86C7}.Debug|Win32.Build.0 = Debug|Win32 + {A3BDF5F8-4D0A-4B27-B1D9-7E77CBDA86C7}.Debug|x64.ActiveCfg = Debug|x64 + {A3BDF5F8-4D0A-4B27-B1D9-7E77CBDA86C7}.Debug|x64.Build.0 = Debug|x64 + {A3BDF5F8-4D0A-4B27-B1D9-7E77CBDA86C7}.Release|Win32.ActiveCfg = Release|Win32 + {A3BDF5F8-4D0A-4B27-B1D9-7E77CBDA86C7}.Release|Win32.Build.0 = Release|Win32 + {A3BDF5F8-4D0A-4B27-B1D9-7E77CBDA86C7}.Release|x64.ActiveCfg = Release|x64 + {A3BDF5F8-4D0A-4B27-B1D9-7E77CBDA86C7}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Common/rt api/Public.cpp b/Common/rt api/Public.cpp index 57c9fe1..834dea7 100644 --- a/Common/rt api/Public.cpp +++ b/Common/rt api/Public.cpp @@ -125,10 +125,38 @@ bool GetHybridCharsets(string sCharset, vector& vCharset) bool boinc_ReadLinesFromFile(string sPathName, vector& vLine) { vLine.clear(); - vLine.push_back("loweralpha-space = [abcdefghijklmnopqrstuvwxyz ]"); + vLine.push_back("byte = []"); + vLine.push_back("alpha = [ABCDEFGHIJKLMNOPQRSTUVWXYZ]"); + vLine.push_back("alpha-space = [ABCDEFGHIJKLMNOPQRSTUVWXYZ ]"); + vLine.push_back("alpha-numeric = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]"); + vLine.push_back("alpha-numeric-space = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ]"); + vLine.push_back("alpha-numeric-symbol14 = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\x21\x40\x23\x24\x25\x5E\x26\x2A\x28\x29\x2D\x5F\x2B\x3D]"); + vLine.push_back("alpha-numeric-symbol14-space= [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\x21\x40\x23\x24\x25\x5E\x26\x2A\x28\x29\x2D\x5F\x2B\x3D\x20]"); + vLine.push_back("all = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\x21\x40\x23\x24\x25\x5E\x26\x2A\x28\x29\x2D\x5F\x2B\x3D\x7E\x60\x5B\x5D\x7B\x7D\x7C\x5C\x3A\x3B\x22\x27\x3C\x3E\x2C\x2E\x3F\x2F]"); + vLine.push_back("all-space = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\x21\x40\x23\x24\x25\x5E\x26\x2A\x28\x29\x2D\x5F\x2B\x3D\x7E\x60\x5B\x5D\x7B\x7D\x7C\x5C\x3A\x3B\x22\x27\x3C\x3E\x2C\x2E\x3F\x2F\x20]"); + vLine.push_back("alpha-numeric-symbol32-space = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\x21\x40\x23\x24\x25\x5E\x26\x2A\x28\x29\x2D\x5F\x2B\x3D\x7E\x60\x5B\x5D\x7B\x7D\x7C\x5C\x3A\x3B\x22\x27\x3C\x3E\x2C\x2E\x3F\x2F\x20]"); + vLine.push_back("lm-frt-cp437 = [\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2A\x2B\x2C\x2D\x2E\x2F\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3A\x3B\x3C\x3D\x3E\x3F\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4A\x4B\x4C\x4D\x4E\x4F\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5A\x5B\x5C\x5D\x5E\x5F\x60\x7B\x7C\x7D\x7E\x80\x8E\x8F\x90\x92\x99\x9A\x9B\x9C\x9D\x9E\x9F\xA5\xE0\xE1\xE2\xE3\xE4\xE6\xE7\xE8\xE9\xEA\xEB\xEE]"); + vLine.push_back("lm-frt-cp850 = [\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2A\x2B\x2C\x2D\x2E\x2F\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3A\x3B\x3C\x3D\x3E\x3F\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4A\x4B\x4C\x4D\x4E\x4F\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5A\x5B\x5C\x5D\x5E\x5F\x60\x7B\x7C\x7D\x7E\x80\x8E\x8F\x90\x92\x99\x9A\x9C\x9D\x9F\xA5\xB5\xB6\xB7\xBD\xBE\xC7\xCF\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xDE\xE0\xE1\xE2\xE3\xE5\xE6\xE8\xE9\xEA\xEB\xED\xEF]"); + vLine.push_back("lm-frt-cp437-850 = [\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2A\x2B\x2C\x2D\x2E\x2F\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3A\x3B\x3C\x3D\x3E\x3F\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4A\x4B\x4C\x4D\x4E\x4F\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5A\x5B\x5C\x5D\x5E\x5F\x60\x7B\x7C\x7D\x7E\x80\x8E\x8F\x90\x92\x99\x9A\x9B\x9C\x9D\x9E\x9F\xA5\xB5\xB6\xB7\xBD\xBE\xC7\xCF\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xDE\xE0\xE1\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xEA\xEB\xED\xEE\xEF]"); + vLine.push_back("numeric = [0123456789]"); + vLine.push_back("numeric-space = [0123456789 ]"); vLine.push_back("loweralpha = [abcdefghijklmnopqrstuvwxyz]"); -/* - char input_path[512]; + vLine.push_back("loweralpha-space = [abcdefghijklmnopqrstuvwxyz ]"); + vLine.push_back("loweralpha-numeric = [abcdefghijklmnopqrstuvwxyz0123456789]"); + vLine.push_back("loweralpha-numeric-space = [abcdefghijklmnopqrstuvwxyz0123456789 ]"); + vLine.push_back("loweralpha-numeric-symbol14 = [abcdefghijklmnopqrstuvwxyz0123456789\x21\x40\x23\x24\x25\x5E\x26\x2A\x28\x29\x2D\x5F\x2B\x3D]"); + vLine.push_back("loweralpha-numeric-all = [abcdefghijklmnopqrstuvwxyz0123456789\x21\x40\x23\x24\x25\x5E\x26\x2A\x28\x29\x2D\x5F\x2B\x3D\x7E\x60\x5B\x5D\x7B\x7D\x7C\x5C\x3A\x3B\x22\x27\x3C\x3E\x2C\x2E\x3F\x2F]"); + vLine.push_back("loweralpha-numeric-symbol32-space= [abcdefghijklmnopqrstuvwxyz0123456789\x21\x40\x23\x24\x25\x5E\x26\x2A\x28\x29\x2D\x5F\x2B\x3D\x7E\x60\x5B\x5D\x7B\x7D\x7C\x5C\x3A\x3B\x22\x27\x3C\x3E\x2C\x2E\x3F\x2F\x20]"); + vLine.push_back("mixalpha = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]"); + vLine.push_back("mixalpha-space = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ]"); + vLine.push_back("mixalpha-numeric = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]"); + vLine.push_back("mixalpha-numeric-space = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ]"); + vLine.push_back("mixalpha-numeric-symbol14 = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\x21\x40\x23\x24\x25\x5E\x26\x2A\x28\x29\x2D\x5F\x2B\x3D]"); + vLine.push_back("mixalpha-numeric-all = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\x21\x40\x23\x24\x25\x5E\x26\x2A\x28\x29\x2D\x5F\x2B\x3D\x7E\x60\x5B\x5D\x7B\x7D\x7C\x5C\x3A\x3B\x22\x27\x3C\x3E\x2C\x2E\x3F\x2F]"); + vLine.push_back("mixalpha-numeric-symbol32-space = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\x21\x40\x23\x24\x25\x5E\x26\x2A\x28\x29\x2D\x5F\x2B\x3D\x7E\x60\x5B\x5D\x7B\x7D\x7C\x5C\x3A\x3B\x22\x27\x3C\x3E\x2C\x2E\x3F\x2F\x20]"); + vLine.push_back("mixalpha-numeric-all-space = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\x21\x40\x23\x24\x25\x5E\x26\x2A\x28\x29\x2D\x5F\x2B\x3D\x7E\x60\x5B\x5D\x7B\x7D\x7C\x5C\x3A\x3B\x22\x27\x3C\x3E\x2C\x2E\x3F\x2F\x20]"); + +/* char input_path[512]; boinc_resolve_filename(sPathName.c_str(), input_path, sizeof(input_path)); FILE *file = boinc_fopen(input_path, "rb"); if (!file) { diff --git a/Common/rt api/des_enc.c b/Common/rt api/des_enc.c index 75c2de5..f2c99b7 100644 --- a/Common/rt api/des_enc.c +++ b/Common/rt api/des_enc.c @@ -60,7 +60,7 @@ */ #include "des_locl.h" -#include "spr.h" +//#include "spr.h" extern const DES_LONG des_SPtrans[8][64];