]> git.sesse.net Git - freerainbowtables/commitdiff
merged paths
authorMartin Westergaard <admin@freerainbowtables.com>
Mon, 1 Nov 2010 18:38:05 +0000 (19:38 +0100)
committerMartin Westergaard <admin@freerainbowtables.com>
Mon, 1 Nov 2010 18:38:05 +0000 (19:38 +0100)
49 files changed:
BOINC software/BOINC client apps/chain_checker/chain_checker.cpp [deleted file]
BOINC software/BOINC client apps/chain_checker/chain_checker.h [deleted file]
BOINC software/BOINC client apps/chain_checker/chain_checker.sln [deleted file]
BOINC software/BOINC client apps/chain_checker/chain_checker.suo [deleted file]
BOINC software/BOINC client apps/chain_checker/chain_checker.vcproj [deleted file]
BOINC software/BOINC client apps/chain_checker/charset.txt [deleted file]
BOINC software/BOINC client apps/distrrtgen_flash/Makefile [deleted file]
BOINC software/BOINC client apps/distrrtgen_flash/charset.txt [deleted file]
BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.cpp [deleted file]
BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.h [deleted file]
BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.ncb [deleted file]
BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.sln [deleted file]
BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.suo [deleted file]
BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.vcproj [deleted file]
BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.vcproj.MWJ-PC.mwj.user [deleted file]
BOINC software/BOINC client apps/index_calculator/charset.txt [deleted file]
BOINC software/BOINC client apps/index_calculator/index_calculator.cpp [deleted file]
BOINC software/BOINC client apps/index_calculator/index_calculator.h [deleted file]
BOINC software/BOINC client apps/index_calculator/index_calculator.suo [deleted file]
BOINC software/BOINC client apps/index_calculator/index_calculator.vcproj [deleted file]
Client Applications/converti2/converti2.cpp
Client Applications/converti2/converti2.sln [deleted file]
Client Applications/converti2/converti2.vcproj [deleted file]
Client Applications/converti2/converti2.vcxproj [new file with mode: 0644]
Client Applications/converti2/converti2.vcxproj.filters [new file with mode: 0644]
Client Applications/converti2/converti2.vcxproj.user [new file with mode: 0644]
Client Applications/rcracki_mt/BaseRTReader.cpp [deleted file]
Client Applications/rcracki_mt/BaseRTReader.h [deleted file]
Client Applications/rcracki_mt/CrackEngine.cpp
Client Applications/rcracki_mt/RTI2Reader.cpp [deleted file]
Client Applications/rcracki_mt/RTI2Reader.h [deleted file]
Client Applications/rcracki_mt/rcracki_mt.sln [deleted file]
Client Applications/rcracki_mt/rcracki_mt.suo [deleted file]
Client Applications/rcracki_mt/rcracki_mt.vcproj [deleted file]
Client Applications/rti2rto/rti2rto.cpp
Client Applications/rti2rto/rti2rto.sln [deleted file]
Client Applications/rti2rto/rti2rto.suo [deleted file]
Client Applications/rti2rto/rti2rto.vcproj [deleted file]
Client Applications/win_build/clientapps.sln [new file with mode: 0644]
Client Applications/win_build/clientapps.suo [new file with mode: 0644]
Common/rt api/BaseRTReader.h
Common/rt api/MemoryPool.cpp
Common/rt api/RTI2Reader.cpp
Common/rt api/RTI2Reader.h
Common/rt api/RTIReader.cpp
Common/rt api/RTIReader.h
Common/rt api/RTReader.cpp
Common/rt api/RTReader.h
Common/rt api/md4.h

diff --git a/BOINC software/BOINC client apps/chain_checker/chain_checker.cpp b/BOINC software/BOINC client apps/chain_checker/chain_checker.cpp
deleted file mode 100644 (file)
index 041ff6e..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-
-// Modified by Martin Westergaard for the chain check usage
-#ifdef _WIN32
-#include "boinc_win.h"
-#else
-#include "config.h"
-#include <cstdio>
-#include <cctype>
-#include <ctime>
-#include <cstring>
-#include <cstdlib>
-#include <csignal>
-#include <unistd.h>
-#endif
-
-#include <string>
-#include <fstream>
-
-#include "str_util.h"
-#include "util.h"
-#include "filesys.h"
-#include "boinc_api.h"
-#include "Public.h"
-// Rainbowcrack code
-#include "ChainWalkContext.h"
-#include "chain_checker.h"
-
-typedef unsigned int uint32;
-
-
-using std::string;
-
-int main(int argc, char **argv) {
-    int retval;
-    char output_path[512], chkpt_path[512];
-       string sHashRoutineName, sCharsetName, sHash;
-       uint32 nPlainLenMin, nPlainLenMax, nRainbowTableIndex;
-    FILE* state, *infile, *outfile;    
-    retval = boinc_init();
-    if (retval) {
-        fprintf(stderr, "boinc_init returned %d\n", retval);
-        exit(retval);
-    }
-       
-       if(argc < 7)
-       {
-               std::cerr << "Not enough parameters";
-               return -1;
-       }
-
-       // Initialize the args
-       sHashRoutineName = argv[1];
-       sCharsetName = argv[2];
-       nPlainLenMin = atoi(argv[3]);
-       nPlainLenMax = atoi(argv[4]);
-       nRainbowTableIndex = atoi(argv[5]);
-       sHash = argv[6];
-
-
-       // Setup the ChainWalkContext
-       if (!CChainWalkContext::SetHashRoutine(sHashRoutineName))
-       {
-               std::cerr << "hash routine " << sHashRoutineName << " not supported" << std::endl;
-               return 1;
-       }
-
-       if (!CChainWalkContext::SetPlainCharset(sCharsetName, nPlainLenMin, nPlainLenMax))
-       {       
-               std::cerr << "charset " << sCharsetName << " not supported" << std::endl;
-               return 2;
-       }
-       
-       if (!CChainWalkContext::SetRainbowTableIndex(nRainbowTableIndex))
-       {
-               std::cerr << "invalid rainbow table index " << nRainbowTableIndex << std::endl;
-               return 3;
-       }
-
-       
-       // Open the file containing the chains we have to check.
-    boinc_resolve_filename("chains", output_path, sizeof(output_path));
-       infile = boinc_fopen(output_path, "rb");    
-       if (infile == NULL)
-       {
-               std::cerr << "failed to open " << output_path << std::endl;
-               return 4;
-       }
-
-       // Open the resulting file. This will *maybe* contain the password (if found)
-       boinc_resolve_filename("result", output_path, sizeof(output_path));
-       outfile = boinc_fopen(output_path, "wb");       
-       if (outfile == NULL)
-       {
-               std::cerr << "failed to create " << output_path << std::endl;
-               return 5;
-       }
-
-       // Read the chains from the input file
-       int len = GetFileLen(infile); 
-       int numchains = len / 12;  // Each chain is 12 bytes. 8 bytes startpoint and 4 bytes for the guessed position
-       fseek(infile, 0, SEEK_SET);
-       ChainCheckChain *pChain = new ChainCheckChain[numchains];
-       int totalread = 0, read;
-       for(int i = 0; i < numchains; i++)
-       {
-               int read = fread(&pChain[i].nIndexS, sizeof(pChain[i].nIndexS), 1, infile);
-               if(read != 1)
-               {
-                       std::cerr << "Error reading chaincheck file" << std::endl;
-                       return 6;
-               }
-               read = fread(&pChain[i].nGuessedPos, sizeof(pChain[i].nGuessedPos), 1, infile);
-               if(read != 1)
-               {
-                       std::cerr << "Error reading chaincheck file" << std::endl;
-                       return 7;
-               }
-
-       }
-       fclose(infile);
-
-
-       // Start checking the chains for false alarms
-       CChainWalkContext cwc;  
-       int found = 0;
-       for(int i = 0; i < numchains; i++)
-       {
-               cwc.SetIndex(pChain[i].nIndexS);        
-               int nPos;
-               for (nPos = 0; nPos < pChain[i].nGuessedPos; nPos++)
-               {
-                       cwc.IndexToPlain();
-                       cwc.PlainToHash();
-                       cwc.HashToIndex(nPos);
-               }
-               cwc.IndexToPlain();
-               cwc.PlainToHash();
-               std::string sHashme = cwc.GetHash();
-               // Check if this is a matching chain
-               if(sHashme.compare(sHash) == 0)
-               {
-                       fwrite(cwc.GetPlain().c_str(), 1, cwc.GetPlain().length(), outfile);
-                       std::cout << "Password is " << cwc.GetPlain() << std::endl;
-                       found = 1;
-                       break; // Password is found. Lets break out.
-               }
-               // This chain didn't contain the password, so we update the progress
-               boinc_fraction_done((double)i / (double)numchains); 
-               
-       }
-       if(found == 0)
-               fwrite("0x00", 4, 1, outfile);
-       // Last step: Clean up
-       fclose(outfile);    
-    boinc_fraction_done(1);
-    boinc_finish(0);
-}
-
-#ifdef _WIN32
-int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR Args, int WinMode) {
-    LPSTR command_line;
-    char* argv[100];
-    int argc;
-
-    command_line = GetCommandLine();
-    argc = parse_command_line( command_line, argv );
-    return main(argc, argv);
-}
-#endif
-
-const char *BOINC_RCSID_33ac47a071 = "$Id: chain_checker.cpp 2008-11-28 Martin Westergaard $";
-
diff --git a/BOINC software/BOINC client apps/chain_checker/chain_checker.h b/BOINC software/BOINC client apps/chain_checker/chain_checker.h
deleted file mode 100644 (file)
index d385ee6..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "boinc_api.h"
-
-struct UC_SHMEM {
-    double update_time;
-    double fraction_done;
-    double cpu_time;
-    BOINC_STATUS status;
-    int countdown;
-        // graphics app sets this to 5 repeatedly,
-        // main program decrements it once/sec.
-        // If it's zero, don't bother updating shmem
-};
diff --git a/BOINC software/BOINC client apps/chain_checker/chain_checker.sln b/BOINC software/BOINC client apps/chain_checker/chain_checker.sln
deleted file mode 100644 (file)
index efe9687..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chain_checker", "chain_checker.vcproj", "{74C09EAC-2EA2-4548-9B61-0FEE56147DFE}"
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Win32 = Debug|Win32
-               Release|Win32 = Release|Win32
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {74C09EAC-2EA2-4548-9B61-0FEE56147DFE}.Debug|Win32.ActiveCfg = Debug|Win32
-               {74C09EAC-2EA2-4548-9B61-0FEE56147DFE}.Debug|Win32.Build.0 = Debug|Win32
-               {74C09EAC-2EA2-4548-9B61-0FEE56147DFE}.Release|Win32.ActiveCfg = Release|Win32
-               {74C09EAC-2EA2-4548-9B61-0FEE56147DFE}.Release|Win32.Build.0 = Release|Win32
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-EndGlobal
diff --git a/BOINC software/BOINC client apps/chain_checker/chain_checker.suo b/BOINC software/BOINC client apps/chain_checker/chain_checker.suo
deleted file mode 100644 (file)
index d24e681..0000000
Binary files a/BOINC software/BOINC client apps/chain_checker/chain_checker.suo and /dev/null differ
diff --git a/BOINC software/BOINC client apps/chain_checker/chain_checker.vcproj b/BOINC software/BOINC client apps/chain_checker/chain_checker.vcproj
deleted file mode 100644 (file)
index 423716c..0000000
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="9,00"
-       Name="chain_checker"
-       ProjectGUID="{74C09EAC-2EA2-4548-9B61-0FEE56147DFE}"
-       RootNamespace="chain_checker"
-       Keyword="Win32Proj"
-       TargetFrameworkVersion="196613"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="/boinc/lib;/boinc/api;&quot;/boinc/zip&quot;;&quot;/boinc/client/win&quot;;&quot;/boinc/&quot;;../distrrtgen;../../rt api"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               EnableEnhancedInstructionSet="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib ole32.lib delayimp.lib ..\lib_debug\libboinc_staticcrt.lib ..\lib_debug\libboincapi_staticcrt.lib c:/openssl/lib/libeay32.lib"
-                               LinkIncremental="2"
-                               IgnoreAllDefaultLibraries="true"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="2"
-                               EnableIntrinsicFunctions="true"
-                               FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="/boinc/lib;/boinc/api;&quot;/boinc/zip&quot;;&quot;/boinc/client/win&quot;;&quot;/boinc/&quot;;../distrrtgen;../../rt api"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MT"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="false"
-                               EnableEnhancedInstructionSet="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbc32.lib odbccp32.lib libcmt.lib libcpmt.lib ..\lib_release\libboinc_staticcrt.lib ..\lib_release\libboincapi_staticcrt.lib c:/openssl/lib/libeay32.lib"
-                               LinkIncremental="1"
-                               IgnoreAllDefaultLibraries="true"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               RandomizedBaseAddress="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath=".\chain_checker.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\ChainWalkContext.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\des_enc.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\des_setkey.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\ecb_enc.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\HashAlgorithm.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\HashRoutine.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\md4.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\md5.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\Public.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath=".\chain_checker.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\ChainWalkContext.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\des.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\des_locl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\HashAlgorithm.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\HashRoutine.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\md4.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\md5.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\podd.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\Public.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\sk.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\spr.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-               <File
-                       RelativePath=".\ReadMe.txt"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/BOINC software/BOINC client apps/chain_checker/charset.txt b/BOINC software/BOINC client apps/chain_checker/charset.txt
deleted file mode 100644 (file)
index d1e0179..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-# charset configuration file for DistrRTgen v3.2 by Martin Westergaard (martinwj2005@gmail.com)
-
-byte                        = []
-alpha                       = [ABCDEFGHIJKLMNOPQRSTUVWXYZ]
-alpha-space                 = [ABCDEFGHIJKLMNOPQRSTUVWXYZ ]
-alpha-numeric               = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]
-alpha-numeric-space         = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ]
-alpha-numeric-symbol14      = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=]
-alpha-numeric-symbol14-space= [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+= ]
-all                         = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/]
-all-space                   = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
-alpha-numeric-symbol32-space = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
-lm-frt-cp437                = [ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`{|}~\80\8e\8f\90\92\99\9a\9b\9c\9d\9e\9f¥àáâãäæçèéêëî]
-lm-frt-cp850                = [ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`{|}~\80\8e\8f\90\92\99\9a\9c\9d\9f¥µ¶·½¾ÇÏÑÒÓÔÕÖ×ØÞàáâãåæèéêëíï]
-lm-frt-cp437-850            = [ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`{|}~\80\8e\8f\90\92\99\9a\9b\9c\9d\9e\9f¥µ¶·½¾ÇÏÑÒÓÔÕÖ×ØÞàáâãäåæçèéêëíîï]
-
-numeric                     = [0123456789]
-numeric-space               = [0123456789 ]
-loweralpha                  = [abcdefghijklmnopqrstuvwxyz]
-loweralpha-space            = [abcdefghijklmnopqrstuvwxyz ]
-loweralpha-numeric          = [abcdefghijklmnopqrstuvwxyz0123456789]
-loweralpha-numeric-space    = [abcdefghijklmnopqrstuvwxyz0123456789 ]
-loweralpha-numeric-symbol14 = [abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_+=]
-loweralpha-numeric-all             = [abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/]
-loweralpha-numeric-symbol32-space= [abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
-
-mixalpha                    = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]
-mixalpha-space              = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ]
-mixalpha-numeric            = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]
-mixalpha-numeric-space      = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ]
-mixalpha-numeric-symbol14   = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=]
-mixalpha-numeric-all        = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/]
-mixalpha-numeric-symbol32-space  = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
-mixalpha-numeric-all-space  = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
-
-                                                                                                                                                                                                                                                                                                                                                                                                                                    
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                            
\ No newline at end of file
diff --git a/BOINC software/BOINC client apps/distrrtgen_flash/Makefile b/BOINC software/BOINC client apps/distrrtgen_flash/Makefile
deleted file mode 100644 (file)
index 0963011..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# This should work on Linux.  Modify as needed for other platforms.
-
-BOINC_DIR = /home/frt/server_stable
-BOINC_API_DIR = $(BOINC_DIR)/api
-BOINC_LIB_DIR = $(BOINC_DIR)/lib
-
-CXXFLAGS = -g \
-    -DAPP_GRAPHICS \
-    -I$(BOINC_DIR) \
-    -I$(BOINC_LIB_DIR) \
-    -I$(BOINC_API_DIR) \
-    -L$(BOINC_API_DIR) \
-    -L$(BOINC_LIB_DIR) \
-    -L /usr/X11R6/lib \
-    -L.
-
-
-PROGS = distrrtgen \
-
-all: $(PROGS)
-
-libstdc++.a:
-       ln -s `g++ -print-file-name=libstdc++.a`
-
-clean:
-       /bin/rm -f $(PROGS) *.o
-
-distclean:
-       /bin/rm -f $(PROGS) *.o libstdc++.a
-
-distrrtgen: distrrtgen.o libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
-       $(CXX) Public.cpp ChainWalkContext.cpp HashAlgorithm.cpp HashRoutine.cpp md5.cpp $(CXXFLAGS) -o distrrtgen distrrtgen.o libstdc++.a -pthread -lboinc_api -lboinc -lssl -O3
diff --git a/BOINC software/BOINC client apps/distrrtgen_flash/charset.txt b/BOINC software/BOINC client apps/distrrtgen_flash/charset.txt
deleted file mode 100644 (file)
index 6e749fa..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-# charset configuration file for DistrRTgen v3.2 by Martin Westergaard (martinwj2005@gmail.com)
-
-byte                        = []
-alpha                       = [ABCDEFGHIJKLMNOPQRSTUVWXYZ]
-alpha-space                 = [ABCDEFGHIJKLMNOPQRSTUVWXYZ ]
-alpha-numeric               = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]
-alpha-numeric-space         = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ]
-alpha-numeric-symbol14      = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=]
-alpha-numeric-symbol14-space= [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+= ]
-all                         = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/]
-all-space                   = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
-alpha-numeric-symbol32-space = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
-lm-frt-cp437                = [ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`{|}~\80\8e\8f\90\92\99\9a\9b\9c\9d\9e\9f¥àáâãäæçèéêëî]
-lm-frt-cp850                = [ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`{|}~\80\8e\8f\90\92\99\9a\9c\9d\9f¥µ¶·½¾ÇÏÑÒÓÔÕÖ×ØÞàáâãåæèéêëíï]
-lm-frt-cp437-850            = [ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`{|}~\80\8e\8f\90\92\99\9a\9b\9c\9d\9e\9f¥µ¶·½¾ÇÏÑÒÓÔÕÖ×ØÞàáâãäåæçèéêëíîï]
-
-numeric                     = [0123456789]
-numeric-space               = [0123456789 ]
-loweralpha                  = [abcdefghijklmnopqrstuvwxyz]
-loweralpha-space            = [abcdefghijklmnopqrstuvwxyz ]
-loweralpha-numeric          = [abcdefghijklmnopqrstuvwxyz0123456789]
-loweralpha-numeric-space    = [abcdefghijklmnopqrstuvwxyz0123456789 ]
-loweralpha-numeric-symbol14 = [abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_+=]
-loweralpha-numeric-all             = [abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/]
-loweralpha-numeric-symbol32-space= [abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
-
-mixalpha                    = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]
-mixalpha-space              = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ]
-mixalpha-numeric            = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]
-mixalpha-numeric-space      = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ]
-mixalpha-numeric-symbol14   = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=]
-mixalpha-numeric-all        = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/]
-mixalpha-numeric-symbol32-space  = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
-mixalpha-numeric-all-space  = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
diff --git a/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.cpp b/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.cpp
deleted file mode 100644 (file)
index bfd0ca4..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-
-// This program serves as both
-// - An example BOINC application, illustrating the use of the BOINC API
-// - A program for testing various features of BOINC
-//
-// NOTE: this file exists as both
-// boinc/apps/upper_case.C
-// and
-// boinc_samples/example_app/uc2.C
-// If you update one, please update the other!
-
-// The program converts a mixed-case file to upper case:
-// read "in", convert to upper case, write to "out"
-//
-// command line options
-// -run_slow: sleep 1 second after each character
-// -cpu_time N: use about N CPU seconds after copying files
-// -early_exit: exit(10) after 30 chars
-// -early_crash: crash after 30 chars
-//
-
-#ifdef _WIN32
-
-#else
-#include <cstdio>
-#include <cctype>
-#include <ctime>
-#include <cstring>
-#include <cstdlib>
-#include <csignal>
-#include <unistd.h>
-#endif
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <time.h>
-#include "Public.h"
-// Rainbowcrack code
-#include "ChainWalkContext.h"
-typedef unsigned int uint32;
-//typedef unsigned __int64 uint64;
-
-
-using std::string;
-
-/*
-bool early_exit = false;
-bool early_crash = false;
-bool early_sleep = false;
-double cpu_time = 20, comp_result;
-*/
-int main(int argc, char **argv) {    
-    int retval;
-    double fd;
-       
-
-       if(argc < 10)
-       {
-               fprintf(stderr, "Not enough parameters");
-               return -1;
-       }
-       string sHashRoutineName, sCharsetName, sSalt, sCheckPoints;
-       uint32 nRainbowChainCount, nPlainLenMin, nPlainLenMax, nRainbowTableIndex, nRainbowChainLen;
-       uint64 nChainStart;
-       sHashRoutineName = argv[1];
-       sCharsetName = argv[2];
-       nPlainLenMin = atoi(argv[3]);
-       nPlainLenMax = atoi(argv[4]);
-       nRainbowTableIndex = atoi(argv[5]);
-       nRainbowChainLen = atoi(argv[6]);
-       nRainbowChainCount = atoi(argv[7]);
-#ifdef _WIN32
-
-       nChainStart = _atoi64(argv[8]);
-
-#else
-       nChainStart = atoll(argv[8]);
-#endif
-       sCheckPoints = argv[9];
-       vector<int> vCPPositions;
-       char *cp = strtok((char *)sCheckPoints.c_str(), ",");
-       while(cp != NULL)
-       {
-               vCPPositions.push_back(atoi(cp));
-               cp = strtok(NULL, ",");
-       }
-       if(argc == 11)
-       {
-               sSalt = argv[10];
-       }
-       //std::cout << "Starting ChainGenerator" << std::endl;
-       // Setup CChainWalkContext
-       //std::cout << "ChainGenerator started." << std::endl;
-
-       if (!CChainWalkContext::SetHashRoutine(sHashRoutineName))
-       {
-               fprintf(stderr, "hash routine %s not supported\n", sHashRoutineName.c_str());
-               return 1;
-       }
-       //std::cout << "Hash routine validated" << std::endl;
-
-       if (!CChainWalkContext::SetPlainCharset(sCharsetName, nPlainLenMin, nPlainLenMax))
-       {       
-               std::cerr << "charset " << sCharsetName << " not supported" << std::endl;
-               return 2;
-       }
-       //std::cout << "Plain charset validated" << std::endl;
-
-       if (!CChainWalkContext::SetRainbowTableIndex(nRainbowTableIndex))
-       {
-               std::cerr << "invalid rainbow table index " << nRainbowTableIndex << std::endl;
-               return 3;
-       }
-       //std::cout << "Rainbowtable index validated" << std::endl;
-
-       if(sHashRoutineName == "mscache")// || sHashRoutineName == "lmchall" || sHashRoutineName == "halflmchall")
-       {
-               // Convert username to unicode
-               const char *szSalt = sSalt.c_str();
-               int salt_length = strlen(szSalt);
-               unsigned char cur_salt[256];
-               for (int i=0; i<salt_length; i++)
-               {
-                       cur_salt[i*2] = szSalt[i];
-                       cur_salt[i*2+1] = 0x00;
-               }
-               CChainWalkContext::SetSalt(cur_salt, salt_length*2);
-       }
-       else if(sHashRoutineName == "halflmchall")
-       { // The salt is hardcoded into the hash routine
-       //      CChainWalkContext::SetSalt((unsigned char*)&salt, 8);
-       }
-       else if(sHashRoutineName == "oracle")
-       {
-               CChainWalkContext::SetSalt((unsigned char *)sSalt.c_str(), sSalt.length());
-       }
-       //std::cout << "Opening chain file" << std::endl;
-
-       
-       
-       // Check existing chains
-       size_t nReturn;
-       CChainWalkContext cwc;
-       uint64 nIndex[2];
-       time_t tStart = time(NULL);
-//     std::cout << "Starting to generate chains" << std::endl;
-       for(int nCurrentCalculatedChains = 0; nCurrentCalculatedChains < nRainbowChainCount; nCurrentCalculatedChains++)
-       {               
-               int cpcheck = 0;
-               unsigned short checkpoint = 0;
-               fd = (double)nCurrentCalculatedChains / (double)nRainbowChainCount;
-               cwc.SetIndex(nChainStart++); // use a given index now!
-               nIndex[0] = cwc.GetIndex();
-               
-               for (int nPos = 0; nPos < nRainbowChainLen - 1; nPos++)
-               {
-               //      std::cout << "IndexToPlain()" << std::endl;
-                       cwc.IndexToPlain();
-               //      std::cout << "PlainToHash()" << std::endl;
-                       cwc.PlainToHash();
-               //      std::cout << "HashToIndex()" << std::endl;
-                       cwc.HashToIndex(nPos);
-                       if(cpcheck < vCPPositions.size() && nPos == vCPPositions[cpcheck])
-                       {
-                               
-                               checkpoint |= (1 << cpcheck) & (unsigned short)cwc.GetIndex() << cpcheck;
-                               cpcheck++;
-                       }
-               }
-               //std::cout << "GetIndex()" << std::endl;
-
-               nIndex[1] = cwc.GetIndex();
-               // Write chain to disk
-       }
-       //std::cout << "Generation completed" << std::endl;
-
-    
-       // main loop - read characters, convert to UC, write
-    //
-
-}
-
diff --git a/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.h b/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.h
deleted file mode 100644 (file)
index d360617..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "boinc_api.h"
-
-struct UC_SHMEM {
-    double update_time;
-    double fraction_done;
-    double cpu_time;
-    BOINC_STATUS status;
-    int countdown;
-        // graphics app sets this to 5 repeatedly,
-        // main program decrements it once/sec.
-        // If it's zero, don't bother updating shmem
-};
diff --git a/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.ncb b/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.ncb
deleted file mode 100644 (file)
index 4b3076b..0000000
Binary files a/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.ncb and /dev/null differ
diff --git a/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.sln b/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.sln
deleted file mode 100644 (file)
index 24b2d5b..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-
-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}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "index_calculator", "..\index_calculator\index_calculator.vcproj", "{C7A957CF-9FDC-4C72-9C3E-7C029E915D1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rti2rto", "..\..\standalone\rti2rto\rti2rto.vcproj", "{E0FBC06A-C902-4468-A614-CBF9F591AA7C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convertrti2", "..\..\standalone\converti2\converti2.vcproj", "{066FD6F1-5990-47AD-B095-7AE0029CF5AE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsearch", "..\..\standalone\rsearch\rsearch.vcproj", "{40F12861-0A31-4E0E-8324-24F897271C8E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtperfectp", "..\..\standalone\rtperfectp\rtperfectp.vcproj", "{9725038C-A07B-40DD-87CD-3A119021A244}"
-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}"
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Win32 = Debug|Win32
-               Release|Win32 = Release|Win32
-       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}.Release|Win32.ActiveCfg = Release|Win32
-               {A3BDF5F8-4D0A-4B27-B1D9-7E77CBDA86C7}.Release|Win32.Build.0 = Release|Win32
-               {C7A957CF-9FDC-4C72-9C3E-7C029E915D1E}.Debug|Win32.ActiveCfg = Debug|Win32
-               {C7A957CF-9FDC-4C72-9C3E-7C029E915D1E}.Debug|Win32.Build.0 = Debug|Win32
-               {C7A957CF-9FDC-4C72-9C3E-7C029E915D1E}.Release|Win32.ActiveCfg = Release|Win32
-               {C7A957CF-9FDC-4C72-9C3E-7C029E915D1E}.Release|Win32.Build.0 = Release|Win32
-               {E0FBC06A-C902-4468-A614-CBF9F591AA7C}.Debug|Win32.ActiveCfg = Debug|Win32
-               {E0FBC06A-C902-4468-A614-CBF9F591AA7C}.Debug|Win32.Build.0 = Debug|Win32
-               {E0FBC06A-C902-4468-A614-CBF9F591AA7C}.Release|Win32.ActiveCfg = Release|Win32
-               {E0FBC06A-C902-4468-A614-CBF9F591AA7C}.Release|Win32.Build.0 = Release|Win32
-               {066FD6F1-5990-47AD-B095-7AE0029CF5AE}.Debug|Win32.ActiveCfg = Debug|Win32
-               {066FD6F1-5990-47AD-B095-7AE0029CF5AE}.Debug|Win32.Build.0 = Debug|Win32
-               {066FD6F1-5990-47AD-B095-7AE0029CF5AE}.Release|Win32.ActiveCfg = Release|Win32
-               {066FD6F1-5990-47AD-B095-7AE0029CF5AE}.Release|Win32.Build.0 = Release|Win32
-               {40F12861-0A31-4E0E-8324-24F897271C8E}.Debug|Win32.ActiveCfg = Debug|Win32
-               {40F12861-0A31-4E0E-8324-24F897271C8E}.Debug|Win32.Build.0 = Debug|Win32
-               {40F12861-0A31-4E0E-8324-24F897271C8E}.Release|Win32.ActiveCfg = Release|Win32
-               {40F12861-0A31-4E0E-8324-24F897271C8E}.Release|Win32.Build.0 = Release|Win32
-               {9725038C-A07B-40DD-87CD-3A119021A244}.Debug|Win32.ActiveCfg = Debug|Win32
-               {9725038C-A07B-40DD-87CD-3A119021A244}.Debug|Win32.Build.0 = Debug|Win32
-               {9725038C-A07B-40DD-87CD-3A119021A244}.Release|Win32.ActiveCfg = Release|Win32
-               {9725038C-A07B-40DD-87CD-3A119021A244}.Release|Win32.Build.0 = Release|Win32
-               {966DA4B4-E13C-449D-9A93-303C6FEA25C4}.Debug|Win32.ActiveCfg = Debug|Win32
-               {966DA4B4-E13C-449D-9A93-303C6FEA25C4}.Debug|Win32.Build.0 = Debug|Win32
-               {966DA4B4-E13C-449D-9A93-303C6FEA25C4}.Release|Win32.ActiveCfg = Release|Win32
-               {966DA4B4-E13C-449D-9A93-303C6FEA25C4}.Release|Win32.Build.0 = Release|Win32
-               {74C09EAC-2EA2-4548-9B61-0FEE56147DFE}.Debug|Win32.ActiveCfg = Debug|Win32
-               {74C09EAC-2EA2-4548-9B61-0FEE56147DFE}.Debug|Win32.Build.0 = Debug|Win32
-               {74C09EAC-2EA2-4548-9B61-0FEE56147DFE}.Release|Win32.ActiveCfg = Release|Win32
-               {74C09EAC-2EA2-4548-9B61-0FEE56147DFE}.Release|Win32.Build.0 = Release|Win32
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-EndGlobal
diff --git a/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.suo b/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.suo
deleted file mode 100644 (file)
index 426c9d9..0000000
Binary files a/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.suo and /dev/null differ
diff --git a/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.vcproj b/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.vcproj
deleted file mode 100644 (file)
index d4e339c..0000000
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="9,00"
-       Name="distrrtgen"
-       ProjectGUID="{A3BDF5F8-4D0A-4B27-B1D9-7E77CBDA86C7}"
-       RootNamespace="distrrtgen"
-       Keyword="Win32Proj"
-       TargetFrameworkVersion="196613"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="0"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../../Common/rt api"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib ole32.lib delayimp.lib "
-                               LinkIncremental="0"
-                               IgnoreAllDefaultLibraries="true"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="0"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="2"
-                               EnableIntrinsicFunctions="true"
-                               FavorSizeOrSpeed="1"
-                               WholeProgramOptimization="true"
-                               AdditionalIncludeDirectories="/boinc/lib;/boinc/api;/boinc/zip;/boinc/client/win;/boinc/;&quot;C:\Users\mwj\git\Common\rt api&quot;"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="true"
-                               EnableEnhancedInstructionSet="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbc32.lib odbccp32.lib libcmt.lib libcpmt.lib ..\lib_release\libboinc_staticcrt.lib ..\lib_release\libboincapi_staticcrt.lib"
-                               LinkIncremental="0"
-                               IgnoreAllDefaultLibraries="true"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               RandomizedBaseAddress="1"
-                               DataExecutionPrevention="0"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath="..\..\..\Common\rt api\ChainWalkContext.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\des_enc.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\des_setkey.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\distrrtgen.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\ecb_enc.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\HashAlgorithm.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\HashRoutine.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\md4.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\md5.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\Public.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath="..\..\..\Common\rt api\ChainWalkContext.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\des.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\des_locl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\distrrtgen.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\HashAlgorithm.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\HashRoutine.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\md4.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\md5.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\podd.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\Public.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\sk.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\Common\rt api\spr.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.vcproj.MWJ-PC.mwj.user b/BOINC software/BOINC client apps/distrrtgen_flash/distrrtgen.vcproj.MWJ-PC.mwj.user
deleted file mode 100644 (file)
index 15b19f6..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-       ProjectType="Visual C++"
-       Version="9,00"
-       ShowAllFiles="false"
-       >
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       >
-                       <DebugSettings
-                               Command="$(TargetPath)"
-                               WorkingDirectory=""
-                               CommandArguments=""
-                               Attach="false"
-                               DebuggerType="3"
-                               Remote="1"
-                               RemoteMachine="MWJ-PC"
-                               RemoteCommand=""
-                               HttpUrl=""
-                               PDBPath=""
-                               SQLDebugging=""
-                               Environment=""
-                               EnvironmentMerge="true"
-                               DebuggerFlavor=""
-                               MPIRunCommand=""
-                               MPIRunArguments=""
-                               MPIRunWorkingDirectory=""
-                               ApplicationCommand=""
-                               ApplicationArguments=""
-                               ShimCommand=""
-                               MPIAcceptMode=""
-                               MPIAcceptFilter=""
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       >
-                       <DebugSettings
-                               Command="$(TargetPath)"
-                               WorkingDirectory=""
-                               CommandArguments=""
-                               Attach="false"
-                               DebuggerType="3"
-                               Remote="1"
-                               RemoteMachine="MWJ-PC"
-                               RemoteCommand=""
-                               HttpUrl=""
-                               PDBPath=""
-                               SQLDebugging=""
-                               Environment=""
-                               EnvironmentMerge="true"
-                               DebuggerFlavor=""
-                               MPIRunCommand=""
-                               MPIRunArguments=""
-                               MPIRunWorkingDirectory=""
-                               ApplicationCommand=""
-                               ApplicationArguments=""
-                               ShimCommand=""
-                               MPIAcceptMode=""
-                               MPIAcceptFilter=""
-                       />
-               </Configuration>
-       </Configurations>
-</VisualStudioUserFile>
diff --git a/BOINC software/BOINC client apps/index_calculator/charset.txt b/BOINC software/BOINC client apps/index_calculator/charset.txt
deleted file mode 100644 (file)
index 6e749fa..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-# charset configuration file for DistrRTgen v3.2 by Martin Westergaard (martinwj2005@gmail.com)
-
-byte                        = []
-alpha                       = [ABCDEFGHIJKLMNOPQRSTUVWXYZ]
-alpha-space                 = [ABCDEFGHIJKLMNOPQRSTUVWXYZ ]
-alpha-numeric               = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]
-alpha-numeric-space         = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ]
-alpha-numeric-symbol14      = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=]
-alpha-numeric-symbol14-space= [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+= ]
-all                         = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/]
-all-space                   = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
-alpha-numeric-symbol32-space = [ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
-lm-frt-cp437                = [ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`{|}~\80\8e\8f\90\92\99\9a\9b\9c\9d\9e\9f¥àáâãäæçèéêëî]
-lm-frt-cp850                = [ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`{|}~\80\8e\8f\90\92\99\9a\9c\9d\9f¥µ¶·½¾ÇÏÑÒÓÔÕÖ×ØÞàáâãåæèéêëíï]
-lm-frt-cp437-850            = [ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`{|}~\80\8e\8f\90\92\99\9a\9b\9c\9d\9e\9f¥µ¶·½¾ÇÏÑÒÓÔÕÖ×ØÞàáâãäåæçèéêëíîï]
-
-numeric                     = [0123456789]
-numeric-space               = [0123456789 ]
-loweralpha                  = [abcdefghijklmnopqrstuvwxyz]
-loweralpha-space            = [abcdefghijklmnopqrstuvwxyz ]
-loweralpha-numeric          = [abcdefghijklmnopqrstuvwxyz0123456789]
-loweralpha-numeric-space    = [abcdefghijklmnopqrstuvwxyz0123456789 ]
-loweralpha-numeric-symbol14 = [abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_+=]
-loweralpha-numeric-all             = [abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/]
-loweralpha-numeric-symbol32-space= [abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
-
-mixalpha                    = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]
-mixalpha-space              = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ]
-mixalpha-numeric            = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]
-mixalpha-numeric-space      = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ]
-mixalpha-numeric-symbol14   = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=]
-mixalpha-numeric-all        = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/]
-mixalpha-numeric-symbol32-space  = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
-mixalpha-numeric-all-space  = [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_+=~`[]{}|\:;"'<>,.?/ ]
diff --git a/BOINC software/BOINC client apps/index_calculator/index_calculator.cpp b/BOINC software/BOINC client apps/index_calculator/index_calculator.cpp
deleted file mode 100644 (file)
index 04041be..0000000
+++ /dev/null
@@ -1,225 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-
-
-#ifdef _WIN32
-#include "boinc_win.h"
-#else
-#include "config.h"
-#include <cstdio>
-#include <cctype>
-#include <ctime>
-#include <cstring>
-#include <cstdlib>
-#include <csignal>
-#include <unistd.h>
-#endif
-
-#include <string>
-#include <fstream>
-
-#include "str_util.h"
-#include "util.h"
-#include "filesys.h"
-#include "boinc_api.h"
-#include "Public.h"
-// Rainbowcrack code
-#include "ChainWalkSet.h"
-#include "ChainWalkContext.h"
-typedef unsigned int uint32;
-//typedef unsigned __int64 uint64;
-
-
-using std::string;
-
-int main(int argc, char **argv) {
-    int i;
-    int c, nchars = 0, retval, n;
-    double fsize, fd;
-    char output_path[512], chkpt_path[512];
-    FILE* state, *infile;      
-    retval = boinc_init();
-    if (retval) {
-        fprintf(stderr, "boinc_init returned %d\n", retval);
-        exit(retval);
-    }
-       
-
-    // get size of input file (used to compute fraction done)
-    //
-    //file_size(input_path, fsize);
-
-    // See if there's a valid checkpoint file.
-    // If so seek input file and truncate output file
-    //
-
-
-       if(argc < 8)
-       {
-               std::cerr << "Not enough parameters";
-               return -1;
-       }
-       string sHashRoutineName, sCharsetName, sHash;
-       uint32 nRainbowChainCount, nPlainLenMin, nPlainLenMax, nRainbowTableIndex, nRainbowChainLen;
-       uint64 nChainStart;
-       sHashRoutineName = argv[1];
-       sCharsetName = argv[2];
-       nPlainLenMin = atoi(argv[3]);
-       nPlainLenMax = atoi(argv[4]);
-       nRainbowTableIndex = atoi(argv[5]);
-       nRainbowChainLen = atoi(argv[6]);
-       sHash = argv[7];
-       //std::cout << "Starting ChainGenerator" << std::endl;
-       // Setup CChainWalkContext
-       //std::cout << "ChainGenerator started." << std::endl;
-
-       if (!CChainWalkContext::SetHashRoutine(sHashRoutineName))
-       {
-               std::cerr << "hash routine " << sHashRoutineName << " not supported" << std::endl;
-               return 1;
-       }
-       //std::cout << "Hash routine validated" << std::endl;
-
-       if (!CChainWalkContext::SetPlainCharset(sCharsetName, nPlainLenMin, nPlainLenMax))
-       {       
-               std::cerr << "charset " << sCharsetName << " not supported" << std::endl;
-               return 2;
-       }
-       //std::cout << "Plain charset validated" << std::endl;
-
-       if (!CChainWalkContext::SetRainbowTableIndex(nRainbowTableIndex))
-       {
-               std::cerr << "invalid rainbow table index " << nRainbowTableIndex << std::endl;
-               return 3;
-       }
-       //std::cout << "Rainbowtable index validated" << std::endl;
-/*
-       if(sHashRoutineName == "mscache")// || sHashRoutineName == "lmchall" || sHashRoutineName == "halflmchall")
-       {
-               // Convert username to unicode
-               const char *szSalt = sSalt.c_str();
-               int salt_length = strlen(szSalt);
-               unsigned char cur_salt[256];
-               for (int i=0; i<salt_length; i++)
-               {
-                       cur_salt[i*2] = szSalt[i];
-                       cur_salt[i*2+1] = 0x00;
-               }
-               CChainWalkContext::SetSalt(cur_salt, salt_length*2);
-       }*/
-       else if(sHashRoutineName == "halflmchall")
-       { // The salt is hardcoded into the hash routine
-       //      CChainWalkContext::SetSalt((unsigned char*)&salt, 8);
-       }
-       /*
-       else if(sHashRoutineName == "oracle")
-       {
-               CChainWalkContext::SetSalt((unsigned char *)sSalt.c_str(), sSalt.length());
-       }
-       */
-       //std::cout << "Opening chain file" << std::endl;
-
-       
-       // Open file
-    boinc_resolve_filename("result", output_path, sizeof(output_path));
-       FILE *outfile = boinc_fopen(output_path, "wb");
-       
-       if (outfile == NULL)
-       {
-               std::cerr << "failed to create " << output_path << std::endl;
-               return 4;
-       }
-       unsigned char TargetHash[255];
-       int nHashLen = 0;
-       ParseHash(sHash, TargetHash, nHashLen);
-       CChainWalkSet m_cws;
-       CChainWalkContext cwc;
-
-       bool fNewlyGenerated;
-       uint64* pStartPosIndexE = m_cws.RequestWalk(TargetHash,
-                                                                                               nHashLen,
-                                                                                               sHashRoutineName,
-                                                                                               sCharsetName,
-                                                                                               nPlainLenMin,
-                                                                                               nPlainLenMax,
-                                                                                               nRainbowTableIndex,
-                                                                                               nRainbowChainLen,
-                                                                                               fNewlyGenerated);
-       int nPos;
-       double nTargetChains = pow((double)nRainbowChainLen - 2, 2) / 2 - (nRainbowChainLen - 2);
-       if (fNewlyGenerated)
-       {
-               time_t tStart = time(NULL);
-               for (nPos = nRainbowChainLen - 2; nPos >= 0; nPos--)
-               {
-                       if(time(NULL) - tStart > 1)
-                       {
-                               time(&tStart);
-                               double nCurrentChains = pow(((double)nRainbowChainLen - 2 - (double)nPos), 2) / 2 - (nRainbowChainLen - 2);
-                               double fResult = ((double)((double)(nCurrentChains) / nTargetChains));
-                               if(fResult < 0)
-                                       fResult = 0;
-                               boinc_fraction_done(fResult);
-                       }
-                       
-                       cwc.SetHash(TargetHash);
-                       cwc.HashToIndex(nPos);
-                       int i;
-                       for (i = nPos + 1; i <= nRainbowChainLen - 2; i++)
-                       {
-                               cwc.IndexToPlain();
-                               cwc.PlainToHash();
-                               cwc.HashToIndex(i);
-                       }
-                       uint64 index = cwc.GetIndex();
-                       if(fwrite(&index, 8, 1, outfile) != 1)
-                       {
-                               fprintf(stderr, "unable to write to outfile");
-                               return 9;
-                       }
-                               //nChainWalkStep += nRainbowChainLen - 2 - nPos;
-               }
-//                     printf("ok\n");                 
-               double nCurrentChains = pow(((double)nRainbowChainLen - 2 - (double)nPos), 2) / 2 - (nRainbowChainLen - 2);
-               double fResult = ((double)((double)(nCurrentChains) / nTargetChains));
-               boinc_fraction_done(fResult);
-       }
-       
-       
-       fclose(outfile);
-    
-       // main loop - read characters, convert to UC, write
-    //
-
-    boinc_fraction_done(1);
-    boinc_finish(0);
-}
-
-#ifdef _WIN32
-int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR Args, int WinMode) {
-    LPSTR command_line;
-    char* argv[100];
-    int argc;
-
-    command_line = GetCommandLine();
-    argc = parse_command_line( command_line, argv );
-    return main(argc, argv);
-}
-#endif
-
-const char *BOINC_RCSID_33ac47a071 = "$Id: upper_case.C 12135 2007-02-21 20:04:14Z davea $";
-
diff --git a/BOINC software/BOINC client apps/index_calculator/index_calculator.h b/BOINC software/BOINC client apps/index_calculator/index_calculator.h
deleted file mode 100644 (file)
index d360617..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "boinc_api.h"
-
-struct UC_SHMEM {
-    double update_time;
-    double fraction_done;
-    double cpu_time;
-    BOINC_STATUS status;
-    int countdown;
-        // graphics app sets this to 5 repeatedly,
-        // main program decrements it once/sec.
-        // If it's zero, don't bother updating shmem
-};
diff --git a/BOINC software/BOINC client apps/index_calculator/index_calculator.suo b/BOINC software/BOINC client apps/index_calculator/index_calculator.suo
deleted file mode 100644 (file)
index 393645d..0000000
Binary files a/BOINC software/BOINC client apps/index_calculator/index_calculator.suo and /dev/null differ
diff --git a/BOINC software/BOINC client apps/index_calculator/index_calculator.vcproj b/BOINC software/BOINC client apps/index_calculator/index_calculator.vcproj
deleted file mode 100644 (file)
index c372b13..0000000
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="9,00"
-       Name="index_calculator"
-       ProjectGUID="{C7A957CF-9FDC-4C72-9C3E-7C029E915D1E}"
-       RootNamespace="index_calculator"
-       Keyword="Win32Proj"
-       TargetFrameworkVersion="196613"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="/boinc/lib;/boinc/api;&quot;/boinc/zip&quot;;&quot;/boinc/client/win&quot;;&quot;/boinc/&quot;;../distrrtgen;&quot;../../rt api&quot;"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib ole32.lib delayimp.lib ..\lib_debug\libboinc_staticcrt.lib ..\lib_debug\libboincapi_staticcrt.lib c:/openssl/lib/libeay32.lib"
-                               LinkIncremental="0"
-                               IgnoreAllDefaultLibraries="true"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               RandomizedBaseAddress="1"
-                               DataExecutionPrevention="0"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="2"
-                               EnableIntrinsicFunctions="true"
-                               FavorSizeOrSpeed="1"
-                               WholeProgramOptimization="true"
-                               AdditionalIncludeDirectories="/boinc/lib;/boinc/api;&quot;/boinc/zip&quot;;&quot;/boinc/client/win&quot;;&quot;/boinc/&quot;;../distrrtgen;&quot;../../rt api&quot;"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="true"
-                               EnableEnhancedInstructionSet="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbc32.lib odbccp32.lib libcmt.lib libcpmt.lib ..\lib_release\libboinc_staticcrt.lib ..\lib_release\libboincapi_staticcrt.lib c:/openssl/lib/libeay32.lib"
-                               LinkIncremental="1"
-                               IgnoreAllDefaultLibraries="true"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="0"
-                               EnableCOMDATFolding="0"
-                               LinkTimeCodeGeneration="0"
-                               RandomizedBaseAddress="1"
-                               DataExecutionPrevention="0"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath="..\..\rt api\ChainWalkContext.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\ChainWalkSet.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\des_enc.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\des_setkey.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\ecb_enc.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\HashAlgorithm.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\HashRoutine.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\index_calculator.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\md4.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\md5.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\Public.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath="..\..\rt api\ChainWalkContext.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\ChainWalkSet.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\des.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\des_locl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\HashAlgorithm.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\HashRoutine.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\index_calculator.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\md4.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\md5.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\podd.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\Public.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\sk.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\spr.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
index db703e92d243a16dd46cbd0fa6475758f49fc0c9..1d8d5e79619444325b3bea2cda1c423df42190a3 100644 (file)
@@ -1,8 +1,7 @@
 #include <string>
 #include <vector>
 #ifdef _WIN32
-       #include <io.h>
-       #include <conio.h>
+#include <io.h>
 #else
        #include <sys/types.h>
        #include <sys/stat.h>
 #include <time.h>
 #include <math.h>
 #include <vector>
-
+#include <conio.h>
+#include <sstream>
 #include "Public.h"
 #include "MemoryPool.h"
+#include "RTIReader.h"
+#include "RTReader.h"
 
 using namespace std;
 
@@ -246,13 +248,10 @@ void GetTableList(string sWildCharPathName, vector<string>& vPathName)
 
        _finddata_t fd;
        long handle = _findfirst(sWildCharPathName.c_str(), &fd);
-       if (handle != -1)
-       {
-               do
-               {
+       if (handle != -1) {
+               do      {
                        string sName = fd.name;
-                       if (sName != "." && sName != ".." && !(fd.attrib & _A_SUBDIR))
-                       {
+                       if (sName != "." && sName != ".." && !(fd.attrib & _A_SUBDIR))  {
                                string sPathName = sPath + sName;
                                vPathName.push_back(sPathName);
                        }
@@ -290,108 +289,93 @@ void ConvertRainbowTable(string sPathName, string sResultFileName, unsigned int
        int nIndex = sPathName.find_last_of('/');
 #endif
        string sFileName;
-       if (nIndex != -1)
+       if (nIndex != -1) {
                sFileName = sPathName.substr(nIndex + 1);
-       else
+       }
+       else {
                sFileName = sPathName;
-       // Info
-       printf("%s:\n", sFileName.c_str());
-       FILE* file = fopen(sPathName.c_str(), "rb");
-       FILE* fileR = fopen(sResultFileName.c_str(), "wb");
+       }
        unsigned int distribution[64] = {0};
        unsigned int numProcessedChains = 0;
-       
-       if (file != NULL && fileR != NULL)
-       {
+       FILE* fileR;
+       BaseRTReader *reader = NULL;
+       if(sPathName.substr(sPathName.length() - 2, sPathName.length()) == "rt")
+               reader = (BaseRTReader*)new RTReader(sPathName);
+       else if(sPathName.substr(sPathName.length() - 3, sPathName.length()) == "rti")
+               reader = (BaseRTReader*)new RTIReader(sPathName);
+       if(reader == NULL) {
+               printf("%s is not a supported file (Only RT and RTI is supported)\n", sPathName.c_str());
+               return;
+       }
+       // Info
+       printf("%s:\n", sFileName.c_str());
+       if(showDistribution == 0) {
+               fileR = fopen(sResultFileName.c_str(), "wb");
+       }
+       if (fileR != NULL || showDistribution == 1) {
                // File length check
-               UINT4 nFileLen = GetFileLen(file);
-               UINT4 nTotalChainCount = 0;
-               if(hascp == 0) nTotalChainCount = nFileLen / 16;
-               else nTotalChainCount = nFileLen / 18;
-               if ((hascp == 0 && nFileLen % 16 != 0) || (hascp == 1 && nFileLen % 18 != 0))
-               {
-                       printf("file length mismatch\n");
-               }
-               else
-               {
+
+               int size = reader->GetChainsLeft() * sizeof(RainbowChain);
                        static CMemoryPool mp;
                        unsigned int nAllocatedSize;
-                       RainbowChainCP* pChain = (RainbowChainCP*)mp.Allocate(nFileLen, nAllocatedSize);
-                       
+                       RainbowChain* pChain = (RainbowChain*)mp.Allocate(size, nAllocatedSize);                        
                        unsigned int chainrowsize = ceil((float)(rti_startptlength + rti_endptlength + rti_cplength) / 8) * 8 ; // The size in bits (in whole bytes)
                        unsigned int chainrowsizebytes = chainrowsize / 8;
 
-
-                       if (pChain != NULL)
-                       {
-                               nAllocatedSize = nAllocatedSize / sizeof(RainbowChainCP) * sizeof(RainbowChainCP);
-                               fseek(file, 0, SEEK_SET);
+                       if (pChain != NULL)     {
+                               nAllocatedSize = nAllocatedSize / sizeof(RainbowChain) * sizeof(RainbowChain);
+                               unsigned int nChains = nAllocatedSize / sizeof(RainbowChain);
                                uint64 curPrefix = 0, prefixStart = 0;
                                vector<IndexRow> indexes;
-                               UINT4 nRainbowChainCountRead = 0;
-                               while (true)    // Chunk read loop
-                               {
+                               unsigned int chainsLeft;
+                               while((chainsLeft = reader->GetChainsLeft()) > 0) {
+                                       
 /*                                     if (ftell(file) == nFileLen)
                                                break;*/
-                                       UINT4 nReadThisRound;
-                                       memset(pChain, 0x00, nAllocatedSize);
-                                       printf("reading...\n");
+                                       printf("%u chains left to read\n", chainsLeft);
+                                       int nReadThisRound;
                                        clock_t t1 = clock();
-                                       for(nReadThisRound = 0; nReadThisRound < nAllocatedSize / sizeof(RainbowChainCP) && nRainbowChainCountRead < nTotalChainCount; nReadThisRound++)
-                                       {                                               
-                                               if(fread(&pChain[nReadThisRound], 16, 1, file) != 1) 
-                                               { 
-                                                       printf("Error reading file\n"); exit(1);
-                                               }
-                                               if(hascp == 1)
-                                               {
-                                                       if(fread(&pChain[nReadThisRound].nCheckPoint, 2, 1, file) != 1) 
-                                                       { 
-                                                               printf("Error reading file\n"); exit(2);
-                                                       }
-                                               }
-                                               nRainbowChainCountRead++;
-                                       }
+                                       printf("reading...\n");
+#ifdef _MEMORYDEBUG
+                       printf("Grabbing %i chains from file\n", nChains);
+#endif
+                                       reader->ReadChains(nChains, pChain);
+#ifdef _MEMORYDEBUG
+                       printf("Recieved %i chains from file\n", nChains);
+#endif
                                        clock_t t2 = clock();
                                        float fTime = 1.0f * (t2 - t1) / CLOCKS_PER_SEC;
-                                       int nDataRead = nRainbowChainCountRead * 16;
-                                       if(hascp == 1) nDataRead += nRainbowChainCountRead * 2; // Add the index readings too
-                                       printf("%u bytes read, disk access time: %.2f s\n", nDataRead , fTime);
+                                       printf("reading time: %.2f s\n", fTime);                
+                                       printf("converting %i chains...\n", nChains);
                                        t1 = clock();
-
-                                       for(UINT4 i = 0; i < nReadThisRound; i++)
-                                       {
-                                               if(showDistribution == 1)
-                                               {
+                                       for(int i = 0; i < nChains; i++)        {
+                                               if(showDistribution == 1) {
                                                        distribution[GetMaxBits(pChain[i].nIndexS)-1]++;
                                                }
                                                else
                                                {
                                                        uint64 chainrow = pChain[i].nIndexS; // Insert the complete start point                                                          
                                                        chainrow |= ((uint64)pChain[i].nIndexE & (0xffffffff >> (32 - rti_endptlength))) << rti_startptlength; // 
-                                                       if(hascp == 1 && rti_cplength > 0) 
-                                                       {
+/*                                                     if(hascp == 1 && rti_cplength > 0) {
                                                                chainrow |= (uint64)pChain[i].nCheckPoint << rti_startptlength + rti_endptlength;
-                                                       }
+                                                       }*/
                                                        fwrite(&chainrow, 1, chainrowsizebytes, fileR);                 
                                                        uint64 prefix = pChain[i].nIndexE >> rti_endptlength;
                                                        if(i == 0) curPrefix = prefix;
-                                                       if(prefix != curPrefix && numProcessedChains - prefixStart > 0)
-                                                       {
-                                                                       if(prefix < curPrefix)
-                                                                       {
-                                                                               printf("**** Error writeChain(): Prefix is smaller than previous prefix. %llu < %llu****\n", prefix, curPrefix);
-                                                                               exit(1);                                                                        
-                                                                       }
-                                                                       //unsigned char index[11] = {0}; // [0 - 10]
-                                                                       unsigned int numchains = numProcessedChains - prefixStart;
-                                                                       IndexRow index;
-                                                                       index.prefix = curPrefix;
+                                                       if(prefix != curPrefix && numProcessedChains - prefixStart > 0) {
+                                                               if(prefix < curPrefix) {
+                                                                       printf("**** Error writeChain(): Prefix is smaller than previous prefix. %llu < %llu****\n", prefix, curPrefix);
+                                                                       exit(1);                                                                        
+                                                               }
+                                                               //unsigned char index[11] = {0}; // [0 - 10]
+                                                               unsigned int numchains = numProcessedChains - prefixStart;
+                                                               IndexRow index;
+                                                               index.prefix = curPrefix;
 //                                                                             index.prefixstart = prefixStart;
-                                                                       index.numchains = numchains;
-                                                                       indexes.push_back(index);
-                                                                       prefixStart = numProcessedChains;
-                                                                       curPrefix = prefix; 
+                                                               index.numchains = numchains;
+                                                               indexes.push_back(index);
+                                                               prefixStart = numProcessedChains;
+                                                               curPrefix = prefix; 
                                                        }
                                                }
                                                numProcessedChains++;
@@ -399,14 +383,11 @@ void ConvertRainbowTable(string sPathName, string sResultFileName, unsigned int
                                        t2 = clock();
                                        fTime = 1.0f * (t2 - t1) / CLOCKS_PER_SEC;
                                        printf("conversion time: %.2f s\n", fTime);             
-                                       if(nRainbowChainCountRead == nTotalChainCount)
-                                               break;
-                                       if(showDistribution == 1)
-                                       {
-                                               for(int i = 0; i < 64; i++)
-                                               {
+                                       if(showDistribution == 1) {
+                                               for(int i = 0; i < 64; i++)     {
                                                        printf("%u - %u\n", (i+1), distribution[i]);
                                                }
+                                               delete reader;
                                                return;
                                        }
 
@@ -444,29 +425,29 @@ void ConvertRainbowTable(string sPathName, string sResultFileName, unsigned int
                                fwrite(&rti_endptlength, 1, 1, pFileIndex);
                                fwrite(&rti_cplength, 1, 1, pFileIndex);
 //                                     fwrite(&m_rti_index_indexlength , 1, 1, pFileIndex);
+
                                fwrite(&m_rti_index_numchainslength, 1, 1, pFileIndex);
-                               for(UINT4 i = 0; i < rti_cppos.size(); i++)
-                               {
+                               for(UINT4 i = 0; i < rti_cppos.size(); i++)     {
                                        fwrite(&rti_cppos[i], 1, 4, pFileIndex); // The position of the checkpoints
                                }
 //                                     fwrite(&m_rti_index_prefixlength, 1, 1, pFileIndex);
                                int zero = 0;
                                fwrite(&indexes[0].prefix, 1, 8, pFileIndex); // Write the first prefix
                                unsigned int lastPrefix = 0;
-                               for(UINT4 i = 0; i < indexes.size(); i++)
-                               {
-                                       if(i == 0)
+                               for(UINT4 i = 0; i < indexes.size(); i++)       {
+                                       if(i == 0) {
                                                lastPrefix = indexes[0].prefix;
+                                       }
+                                       unsigned int indexrow = 0;
                                        // Checks how big a distance there is between the current and the next prefix. eg cur is 3 and next is 10 = 7.
                                        unsigned int diffSize = indexes[i].prefix - lastPrefix; 
-                                       if(i > 0 && diffSize > 1)
-                                       {
+                                       if(i > 0 && diffSize > 1) {
                                                //indexrow |= indexes[i].prefixstart;
                                                //printf("Diffsize is %u\n", diffSize);
 
                                                // then write the distance amount of 00's
                                                if(diffSize > 1000) {
-                                                       printf("WARNING! The distance to the next prefix is %i. Do you want to continue writing %i bytes of 0x00? Press y to continue", diffSize, diffSize);
+                                                       printf("WARNING! The distance to the next prefix is %i. Do you want to continue writing %i bytes of 0x00? Press y to continue", diffSize, (diffSize*m_indexrowsizebytes));
                                                        #ifdef _WIN32
                                                        if ( _getch() != 'y' ) {
                                                        #else
@@ -486,17 +467,20 @@ void ConvertRainbowTable(string sPathName, string sResultFileName, unsigned int
                                }
                                fclose(pFileIndex);
                        }
-                       else printf("memory allocation fail\n");
-
-                       
-                                       // Already finished?
-
-               }
-               fclose(file);
+                       else {
+                               printf("memory allocation fail\n");
+                       }                       
+                       // Already finished?
        }
-       else
+       else {
                printf("can't open file\n");
-
+       }
+       if(reader != NULL)
+               delete reader;
+       if(fileR != NULL) {
+               fclose(fileR);
+       }
+               
 }
 
 int main(int argc, char* argv[])
@@ -507,76 +491,63 @@ int main(int argc, char* argv[])
        int usecp = 0;// How many bits to use from the index
        int hascp = 0; 
        vector<unsigned int> cppositions;
-       if (argc == 1)
-       {
+       if (argc == 1) {
                Usage();                
                return 0;
        }
-       else if(argc > 2)
-       {
+       else if(argc > 2) {
                for (; argi < argc; argi++)
                {
-                       if (strcmp(argv[argi], "-d") == 0 && (argsUsed & 0x8) == 0)
-                       {
+                       if(strcmp(argv[argi], "-d") == 0 && (argsUsed & 0x8) == 0) {
                                // Enable verbose mode
                                argsUsed |= 0x8;                                
                                showDistribution = 1;
                        }                       
-                       else if (strncmp(argv[argi], "-sptl=", 6) == 0 && (argsUsed & 0x1) == 0)
-                       {
+                       else if (strncmp(argv[argi], "-sptl=", 6) == 0 && (argsUsed & 0x1) == 0) {
                                // Maximum index for starting point
                                argsUsed |= 0x1;
                                sptl = 0;
-                               for (i = 6; argv[argi][i] >= '0' && argv[argi][i] <= '9'; i++)
-                               {
+                               for (i = 6; argv[argi][i] >= '0' && argv[argi][i] <= '9'; i++) {
                                        sptl *= 10;
                                        sptl += ((int) argv[argi][i]) - 0x30;
                                }
-                               if (argv[argi][i] != '\0')
-                               {
+                               if (argv[argi][i] != '\0') {
                                        printf("Error: Invalid number.\n\n");
                                        Usage();
                                        return 1;
                                }
-                               if (i > 23) // i - 3 > 20
-                               {
+                               if (i > 23) { // i - 3 > 20                             
                                        printf("Error: Number is too large.\n\n");
                                        Usage();
                                        return 1;
                                }                       
                        }
 
-                       else if (strncmp(argv[argi], "-eptl=", 6) == 0 && (argsUsed & 0x2) == 0)
-                       {
+                       else if (strncmp(argv[argi], "-eptl=", 6) == 0 && (argsUsed & 0x2) == 0) {
                                // Maximum index for ending points
                                argsUsed |= 0x2;
                                eptl = 0;
-                               for (i = 6; argv[argi][i] >= '0' && argv[argi][i] <= '9'; i++)
-                               {
+                               for (i = 6; argv[argi][i] >= '0' && argv[argi][i] <= '9'; i++) {
                                        eptl *= 10;
                                        eptl += ((int) argv[argi][i]) - 0x30;
                                }
-                               if (argv[argi][i] != '\0')
-                               {
+                               if (argv[argi][i] != '\0') {
                                        printf("Error: Invalid number.\n\n");
                                        Usage();
                                        return 1;
                                }
-                               if (i > 23) // i - 3 > 20
-                               {
+                               if (i > 23) { // i - 3 > 20                             
                                        printf("Error: Number is too large.\n\n");
                                        Usage();
                                        return 1;
                                }                       
                        }
-                       else if(strncmp(argv[argi], "-usecp=", 7) == 0 && (argsUsed & 0x4) == 0)
-                       {
+                       else if(strncmp(argv[argi], "-usecp=", 7) == 0 && (argsUsed & 0x4) == 0) {
                                argsUsed |= 0x4;
                                hascp = 1;
                                usecp = 0;
                                unsigned int cppos = 0;
-                               for(i = 7; argv[argi][i] != ' ' && argv[argi][i] != '\n' && argv[argi][i] != 0;)
-                               {
+                               for(i = 7; argv[argi][i] != ' ' && argv[argi][i] != '\n' && argv[argi][i] != 0;) {
                                        if(cppositions.size() > 0) i++;
                                        for (; argv[argi][i] >= '0' && argv[argi][i] <= '9'; i++)
                                        {
@@ -590,19 +561,19 @@ int main(int argc, char* argv[])
                                                cppos = 0;
                                        //}
                                }
-                               if (argv[argi][i] != '\0')
-                               {
+                               if (argv[argi][i] != '\0') {
                                        printf("Error: Invalid number.\n\n");
                                        Usage();
                                        return 1;
                                }
-                               if (usecp > 16) // i - 3 > 20
-                               {
+                               if (usecp > 16) { // i - 3 > 20
                                        printf("Error: Number is too large.\n\n");
                                        Usage();
                                        return 1;
                                }                               
-                               else printf("Using %i bits of the checkpoints\n", usecp);
+                               else {
+                                       printf("Using %i bits of the checkpoints\n", usecp);
+                               }
                        }
 
                }               
@@ -614,26 +585,36 @@ int main(int argc, char* argv[])
 #else
        GetTableList(argc, argv, vPathName);
 #endif
-       if (vPathName.size() == 0)
-       {
+       if (vPathName.size() == 0) {
                printf("no rainbow table found\n");
                return 0;
        }
-       for (UINT4 i = 0; i < vPathName.size(); i++)
-       {
+       for (UINT4 i = 0; i < vPathName.size(); i++) {
                string sResultFile;
                int n = vPathName[i].find_last_of('\\');
-               if (n != -1)
-                       sResultFile = vPathName[i].substr(n+1, vPathName[i].length()) + "i2";
-               else 
-                       sResultFile = vPathName[i] + "i2"; // Resulting file is .rt, not .rti
-               printf("Using %i of 64 bits. sptl: %i, eptl: %i, cp: %i. Chains will be %i bytes in size\n", (sptl + eptl + usecp), sptl, eptl, usecp, ((sptl + eptl + usecp) / 8));
-               if(sptl + eptl + usecp > 64)
-               {
+               if (n != -1) {
+                       if(vPathName[i].substr(vPathName[i].length() - 3, vPathName[i].length()) == "rti")      {
+                               sResultFile = vPathName[i].substr(n+1, vPathName[i].length()) + "2";                            
+                       }
+                       else {
+                               sResultFile = vPathName[i].substr(n+1, vPathName[i].length()) + "i2";
+                       }
+               }
+               else {
+                       if(vPathName[i].substr(vPathName[i].length() - 3, vPathName[i].length()) == "rti")      {
+                               sResultFile = vPathName[i] + "2";                               
+                       } else {
+                               sResultFile = vPathName[i] + "i2"; // Resulting file is .rt, not .rti
+                       }
+               }
+               if(usecp == 0 && showDistribution == 0) {
+                       printf("Using %i of 64 bits. sptl: %i, eptl: %i, cp: %i. Chains will be %i bytes in size\n", (sptl + eptl + usecp), sptl, eptl, usecp, ((sptl + eptl + usecp) / 8));
+               }
+               if(sptl + eptl + usecp > 64) {
                        exit(1);
                }
                ConvertRainbowTable(vPathName[i], sResultFile, sptl, eptl, showDistribution, hascp, usecp, cppositions);
                printf("\n");
        }
        return 0;
-}
+}
\ No newline at end of file
diff --git a/Client Applications/converti2/converti2.sln b/Client Applications/converti2/converti2.sln
deleted file mode 100644 (file)
index d4e3874..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "converti2", "converti2.vcproj", "{066FD6F1-5990-47AD-B095-7AE0029CF5AE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rcracki_mt", "..\rcracki_mt\rcracki_mt.vcproj", "{D484ABA1-C117-4AB1-B361-22E5EA62FA00}"
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Win32 = Debug|Win32
-               Release|Win32 = Release|Win32
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {066FD6F1-5990-47AD-B095-7AE0029CF5AE}.Debug|Win32.ActiveCfg = Debug|Win32
-               {066FD6F1-5990-47AD-B095-7AE0029CF5AE}.Debug|Win32.Build.0 = Debug|Win32
-               {066FD6F1-5990-47AD-B095-7AE0029CF5AE}.Release|Win32.ActiveCfg = Release|Win32
-               {066FD6F1-5990-47AD-B095-7AE0029CF5AE}.Release|Win32.Build.0 = Release|Win32
-               {D484ABA1-C117-4AB1-B361-22E5EA62FA00}.Debug|Win32.ActiveCfg = Debug|Win32
-               {D484ABA1-C117-4AB1-B361-22E5EA62FA00}.Debug|Win32.Build.0 = Debug|Win32
-               {D484ABA1-C117-4AB1-B361-22E5EA62FA00}.Release|Win32.ActiveCfg = Release|Win32
-               {D484ABA1-C117-4AB1-B361-22E5EA62FA00}.Release|Win32.Build.0 = Release|Win32
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-EndGlobal
diff --git a/Client Applications/converti2/converti2.vcproj b/Client Applications/converti2/converti2.vcproj
deleted file mode 100644 (file)
index 0103995..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="9,00"
-       Name="converti2"
-       ProjectGUID="{066FD6F1-5990-47AD-B095-7AE0029CF5AE}"
-       RootNamespace="convertrti2"
-       Keyword="Win32Proj"
-       TargetFrameworkVersion="131072"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../Common/rt api"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               LinkIncremental="2"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="1"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="../../Common/rt api"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath=".\converti2.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Common\rt api\MemoryPool.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Common\rt api\Public.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath="..\..\Common\rt api\MemoryPool.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Common\rt api\Public.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/Client Applications/converti2/converti2.vcxproj b/Client Applications/converti2/converti2.vcxproj
new file mode 100644 (file)
index 0000000..90f75b9
--- /dev/null
@@ -0,0 +1,105 @@
+<?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">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{066FD6F1-5990-47AD-B095-7AE0029CF5AE}</ProjectGuid>
+    <RootNamespace>convertrti2</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../Common/rt api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>../../Common/rt api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Common\rt api\BaseRTReader.cpp" />
+    <ClCompile Include="..\..\Common\rt api\RTIReader.cpp" />
+    <ClCompile Include="..\..\Common\rt api\RTReader.cpp" />
+    <ClCompile Include="converti2.cpp" />
+    <ClCompile Include="..\..\Common\rt api\MemoryPool.cpp" />
+    <ClCompile Include="..\..\Common\rt api\Public.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Common\rt api\BaseRTReader.h" />
+    <ClInclude Include="..\..\Common\rt api\MemoryPool.h" />
+    <ClInclude Include="..\..\Common\rt api\Public.h" />
+    <ClInclude Include="..\..\Common\rt api\RTIReader.h" />
+    <ClInclude Include="..\..\Common\rt api\RTReader.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Client Applications/converti2/converti2.vcxproj.filters b/Client Applications/converti2/converti2.vcxproj.filters
new file mode 100644 (file)
index 0000000..e0c08d7
--- /dev/null
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="converti2.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\rt api\MemoryPool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\rt api\Public.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\rt api\BaseRTReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\rt api\RTIReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\rt api\RTReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Common\rt api\MemoryPool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\rt api\Public.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\rt api\RTIReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\rt api\RTReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\rt api\BaseRTReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Client Applications/converti2/converti2.vcxproj.user b/Client Applications/converti2/converti2.vcxproj.user
new file mode 100644 (file)
index 0000000..8e3e8c4
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerCommandArguments>C:\Users\mwj\Desktop\tables\*.rti -d</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Client Applications/rcracki_mt/BaseRTReader.cpp b/Client Applications/rcracki_mt/BaseRTReader.cpp
deleted file mode 100644 (file)
index 9b797ec..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * rcracki_mt is a multithreaded implementation and fork of the original 
- * RainbowCrack
- *
- * Copyright 2010 Martin Westergaard Jørgensen <martinwj2005@gmail.com>
- * Copyright 2010 Daniël Niggebrugge <niggebrugge@fox-it.com>
- * Copyright 2010 James Nobis <frt@quelrod.net>
- *
- * This file is part of rcracki_mt.
- *
- * rcracki_mt is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * rcracki_mt is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with rcracki_mt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "BaseRTReader.h"
diff --git a/Client Applications/rcracki_mt/BaseRTReader.h b/Client Applications/rcracki_mt/BaseRTReader.h
deleted file mode 100644 (file)
index 17a93ac..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * rcracki_mt is a multithreaded implementation and fork of the original 
- * RainbowCrack
- *
- * Copyright 2010 Martin Westergaard Jørgensen <martinwj2005@gmail.com>
- * Copyright 2010 Daniël Niggebrugge <niggebrugge@fox-it.com>
- * Copyright 2010 James Nobis <frt@quelrod.net>
- *
- * This file is part of rcracki_mt.
- *
- * rcracki_mt is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * rcracki_mt is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with rcracki_mt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __BASERTREADER_H__
-#define __BASERTREADER_H__
-
-#include "Public.h"
-#include <string>
-
-#if defined(_WIN32) && !defined(__GNUC__)
-       #include <io.h>
-#endif
-
-using namespace std;
-
-class BaseRTReader
-{
-public:
-       virtual int ReadChains(unsigned int &numChains, RainbowChainO *pData) = 0;
-       virtual unsigned int GetChainsLeft() = 0;
-       
-};
-
-#endif
index 7640a6310211340cdd4aef3b69aa75ccd34bbbae..0a4b1818bb9eb889771e94017cc28fb0ee9302c2 100644 (file)
@@ -1044,7 +1044,12 @@ void CCrackEngine::SearchRainbowTable(string sPathName, CHashSet& hs)
                                }
 
                                static CMemoryPool mp(bytesForChainWalkSet, debug, maxMem);
-                               RainbowChainO* pChain = (RainbowChainO*)mp.Allocate(nFileLen, nAllocatedSize);
+                               RainbowChainO* pChain = NULL;
+                               if(doRti2Format) {
+                                       pChain = (RainbowChainO*)mp.Allocate(pReader->GetChainsLeft() * 16, nAllocatedSize);
+                               } else {
+                                       pChain = (RainbowChainO*)mp.Allocate(nFileLen, nAllocatedSize);
+                               }
                                #ifdef _WIN32
                                        if (debug) printf("Allocated %I64u bytes, filelen %lu\n", nAllocatedSize, (unsigned long)nFileLen);
                                #else
@@ -1064,13 +1069,15 @@ void CCrackEngine::SearchRainbowTable(string sPathName, CHashSet& hs)
 
                                                // Load table chunk
                                                if (debug) printf("reading...\n");
-                                               unsigned int nDataRead = 0, nDataToRead = 0;
+                                               unsigned int nDataRead = 0;
                                                gettimeofday( &tv, NULL );
                                                if ( doRti2Format )
                                                {
-                                                       nDataToRead = nAllocatedSize / 16;
-                                                       nDataRead = nDataToRead;
-                                                       pReader->ReadChains(nDataRead, pChain);
+                                                       nDataRead = nAllocatedSize / 16;
+                                                       if(pReader->GetChainsLeft() <= 0) // No more data
+                                                               break; 
+                                                       pReader->ReadChains(nDataRead, (RainbowChain*)pChain);
+
                                                        nDataRead *= 8; // Convert from chains read to bytes
                                                }
                                                else
@@ -1086,6 +1093,10 @@ void CCrackEngine::SearchRainbowTable(string sPathName, CHashSet& hs)
 
                                                int nRainbowChainCountRead = nDataRead / 16;
 
+                                               if(doRti2Format) {
+                                                       nRainbowChainCountRead = nDataRead / 8;
+                                               }
+
                                                // Verify table chunk
                                                if (!fVerified)
                                                {
@@ -1136,13 +1147,6 @@ void CCrackEngine::SearchRainbowTable(string sPathName, CHashSet& hs)
                                                // Already finished?
                                                if (!hs.AnyHashLeftWithLen(CChainWalkContext::GetHashLen()))
                                                        break;
-
-                                               // finished the current table
-                                               if( doRti2Format && nDataToRead > (nDataRead / 8) )
-                                               {
-                                                       delete pReader;
-                                                       break;
-                                               }
                                        }
                                }
                                else
diff --git a/Client Applications/rcracki_mt/RTI2Reader.cpp b/Client Applications/rcracki_mt/RTI2Reader.cpp
deleted file mode 100644 (file)
index 692c73e..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * rcracki_mt is a multithreaded implementation and fork of the original 
- * RainbowCrack
- *
- * Copyright 2010 Martin Westergaard Jørgensen <martinwj2005@gmail.com>
- * Copyright 2010 Daniël Niggebrugge <niggebrugge@fox-it.com>
- * Copyright 2010 James Nobis <frt@quelrod.net>
- *
- * This file is part of rcracki_mt.
- *
- * rcracki_mt is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * rcracki_mt is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with rcracki_mt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "RTI2Reader.h"
-
-#include <math.h>
-
-RTI2Header *RTI2Reader::m_pHeader = NULL;
-RTI2Reader::RTI2Reader(string Filename)
-{
-       //m_pIndexPos = NULL, m_pChainPos = NULL;;
-       m_pIndex = NULL;
-       m_pFile = fopen(Filename.c_str(), "rb");
-       if(m_pFile == NULL)
-       {
-               printf("Unable to open file %s", Filename.c_str());
-               exit(1);
-       }
-       FILE *pFileIndex = fopen(Filename.append(".index").c_str(), "rb");
-       if(pFileIndex == NULL)
-       {
-               printf("Unable to open file %s", Filename.append(".index").c_str());
-               exit(1);
-       }
-       m_chainPosition = 0;
-
-       unsigned int len = GetFileLen(pFileIndex);
-       fseek(pFileIndex, 0, SEEK_SET);
-
-       m_pIndex = new unsigned char[len];
-       if(fread(m_pIndex, 1, len, pFileIndex) != len)
-       {
-               printf("Error while reading index file");
-               exit(1);
-       }
-       fclose(pFileIndex);
-       m_pHeader = new RTI2Header();   
-       memcpy(m_pHeader, m_pIndex, sizeof(RTI2Header));
-       m_pHeader->m_cppos = (unsigned int*)(m_pIndex + 8);
-       m_pHeader->prefixstart = *(uint64*)(m_pIndex + 8 + (m_pHeader->rti_cplength * 4));
-       m_chainsizebytes = (UINT4)ceil((float)(m_pHeader->rti_startptlength + m_pHeader->rti_endptlength + m_pHeader->rti_cplength) / 8); // Get the size of each chain in bytes
-       m_indexrowsizebytes = (UINT4)ceil((float)m_pHeader->rti_index_numchainslength / 8);
-       // Check the filesize
-       fseek(m_pFile, 0, SEEK_END);
-       len = ftell(m_pFile);
-       fseek(m_pFile, 0, SEEK_SET);
-       if(len % m_chainsizebytes > 0)
-       {
-               printf("Invalid filesize %u\n", len);
-               return;
-       }
-       
-
-}
-
-RTI2Reader::~RTI2Reader(void)
-{
-       if(m_pIndex != NULL) delete m_pIndex;
-       if(m_pFile != NULL) fclose(m_pFile);
-
-}
-
-unsigned int RTI2Reader::GetChainsLeft()
-{
-       int len = GetFileLen(m_pFile);
-       return len / m_chainsizebytes - m_chainPosition;
-}
-
-int RTI2Reader::ReadChains(unsigned int &numChains, RainbowChainO *pData)
-{
-       if(strncmp(m_pHeader->header, "RTI2", 4) != 0)
-       {
-               numChains = 0;
-               return -1;
-       }
-       unsigned char *pNumChains = m_pIndex + (m_pHeader->rti_cplength * 4) + 16; // Pointer into the index containing info about how many numbers are in the first chain prefix
-       unsigned int i = 0;
-       unsigned int indexRow = 0; // Current offset into the index
-       unsigned int curRowPosition = 0;
-       
-       while(true) // Fast forward to current position
-       {
-               // ALERT: Possible problem here if m_indexrowsizebytes > 1 as pNumChains is a unsigned char.
-               unsigned int NumChainsInRow = (unsigned int)*(pNumChains + indexRow * m_indexrowsizebytes);
-               if(m_indexrowsizebytes > 1)
-               {
-                       //XXX Have to find a solution to this problem
-                       printf( "FATAL: m_indexrowsizebytes > 1: %d\n", m_indexrowsizebytes ); 
-                       exit(2);
-               }
-               if(i + NumChainsInRow > m_chainPosition)
-               {
-                       curRowPosition = m_chainPosition - i;
-                       break; // The current position is somewhere within this prefix
-               }
-               indexRow++;             
-               i += NumChainsInRow;
-       }
-       
-       uint64 chainrow = 0; // Buffer to store a single read chain
-       unsigned int chainsProcessed = 0; // Number of chains processed
-
-       // XXX: same problem with unsigned char here.
-       unsigned int NumChainsInRow = *(pNumChains + indexRow);
-       while(chainsProcessed < numChains && fread(&chainrow, 1, m_chainsizebytes, m_pFile) == m_chainsizebytes)
-       {
-               if(curRowPosition >= NumChainsInRow)
-               { // Skip to next index row position
-                       indexRow++;
-                       curRowPosition = 0;
-                       NumChainsInRow = *(pNumChains + indexRow);
-               }
-               while(NumChainsInRow == 0) // We skip forward until we hit a index with > 0 chains
-               {
-                       indexRow++;
-                       NumChainsInRow = *(pNumChains + indexRow);
-                       curRowPosition = 0;
-               }
-               // Load the starting point from the data
-               pData[chainsProcessed].nIndexS = chainrow << ( 64 - m_pHeader->rti_startptlength );
-               pData[chainsProcessed].nIndexS = pData[chainsProcessed].nIndexS >> ( 64 - m_pHeader->rti_startptlength );
-
-               // Load the ending point prefix 
-               pData[chainsProcessed].nIndexE = ( m_pHeader->prefixstart + indexRow ) << m_pHeader->rti_endptlength;
-               // Append the ending point suffix
-#if defined(_WIN32) && !defined(__GNUC__)
-               pData[chainsProcessed].nIndexE |= (chainrow & (0xFFFFFFFFFFFFFFFFI64 >> m_pHeader->rti_cplength)) >> m_pHeader->rti_startptlength;
-#else
-               pData[chainsProcessed].nIndexE |= (chainrow & (0xFFFFFFFFFFFFFFFFllu >> m_pHeader->rti_cplength)) >> m_pHeader->rti_startptlength;
-#endif
-               //pData[chainsProcessed].nCheckPoint = (chainrow >> m_pHeader->rti_startptlength + m_pHeader->rti_endptlength);
-               curRowPosition++;
-               chainsProcessed++;
-       }
-       numChains = chainsProcessed;
-       m_chainPosition += numChains;
-       return 0;
-}
diff --git a/Client Applications/rcracki_mt/RTI2Reader.h b/Client Applications/rcracki_mt/RTI2Reader.h
deleted file mode 100644 (file)
index cd36e7d..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * rcracki_mt is a multithreaded implementation and fork of the original 
- * RainbowCrack
- *
- * Copyright 2010 Martin Westergaard Jørgensen <martinwj2005@gmail.com>
- * Copyright 2010 Daniël Niggebrugge <niggebrugge@fox-it.com>
- * Copyright 2010 James Nobis <frt@quelrod.net>
- *
- * This file is part of rcracki_mt.
- *
- * rcracki_mt is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * rcracki_mt is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with rcracki_mt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RTI2READER_H__
-#define __RTI2READER_H__
-
-#include "Public.h"
-#include <string>
-
-#if defined(_WIN32) && !defined(__GNUC__)
-       #include <io.h>
-#endif
-
-#include <vector>
-#include "BaseRTReader.h"
-
-using namespace std;
-
-typedef struct 
-{
-       char header[4];
-       unsigned char rti_startptlength, rti_endptlength, rti_cplength, rti_index_numchainslength;
-       uint64 prefixstart;
-       unsigned int *m_cppos;
-} RTI2Header;
-
-class RTI2Reader : BaseRTReader
-{
-private:
-       FILE *m_pFile;
-       UINT4 m_chainPosition;
-       unsigned char *m_pPos, *m_pChainPos;
-       static RTI2Header *m_pHeader;
-       unsigned char *m_pIndex;
-       UINT4 m_chainsizebytes;
-       UINT4 m_indexrowsizebytes;
-       
-
-public:
-       RTI2Reader(string Filename);
-       ~RTI2Reader(void);
-       int ReadChains(unsigned int &numChains, RainbowChainO *pData);
-       unsigned int GetChainsLeft();
-       static RTI2Header *GetHeader() { return m_pHeader; }
-};
-
-
-#endif
diff --git a/Client Applications/rcracki_mt/rcracki_mt.sln b/Client Applications/rcracki_mt/rcracki_mt.sln
deleted file mode 100644 (file)
index 41e564e..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rcracki_mt", "rcracki_mt.vcproj", "{966DA4B4-E13C-449D-9A93-303C6FEA25C4}"
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Win32 = Debug|Win32
-               Release|Win32 = Release|Win32
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {966DA4B4-E13C-449D-9A93-303C6FEA25C4}.Debug|Win32.ActiveCfg = Debug|Win32
-               {966DA4B4-E13C-449D-9A93-303C6FEA25C4}.Debug|Win32.Build.0 = Debug|Win32
-               {966DA4B4-E13C-449D-9A93-303C6FEA25C4}.Release|Win32.ActiveCfg = Release|Win32
-               {966DA4B4-E13C-449D-9A93-303C6FEA25C4}.Release|Win32.Build.0 = Release|Win32
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-EndGlobal
diff --git a/Client Applications/rcracki_mt/rcracki_mt.suo b/Client Applications/rcracki_mt/rcracki_mt.suo
deleted file mode 100644 (file)
index 7159e21..0000000
Binary files a/Client Applications/rcracki_mt/rcracki_mt.suo and /dev/null differ
diff --git a/Client Applications/rcracki_mt/rcracki_mt.vcproj b/Client Applications/rcracki_mt/rcracki_mt.vcproj
deleted file mode 100644 (file)
index b377639..0000000
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="9,00"
-       Name="rcracki_mt"
-       ProjectGUID="{966DA4B4-E13C-449D-9A93-303C6FEA25C4}"
-       RootNamespace="rcracki_mt"
-       Keyword="Win32Proj"
-       TargetFrameworkVersion="131072"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\..\rt api"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               LinkIncremental="2"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="1"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="..\..\rt api"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath="..\..\rt api\BaseRTReader.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\ChainWalkContext.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\ChainWalkSet.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\CrackEngine.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\des_enc.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\des_setkey.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\ecb_enc.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\HashAlgorithm.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\HashRoutine.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\HashSet.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\md4.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\md5.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\MemoryPool.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\converti2\Public.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\RainbowCrack.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\RTI2Reader.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\RTIReader.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\RTReader.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath="..\..\rt api\BaseRTReader.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\ChainWalkContext.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\ChainWalkSet.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\CrackEngine.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\des.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\des_locl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\HashAlgorithm.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\HashRoutine.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\HashSet.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\md4.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\md5.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\MemoryPool.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\converti2\Public.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\RTI2Reader.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\RTIReader.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rt api\RTReader.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
index e4ee4fc740cfd88cd60e7c0322a3f00252ad95a7..086c333f27172373569429ad44868798b3b02b58 100644 (file)
@@ -87,6 +87,7 @@ void ConvertRainbowTable(string sPathName, string sResultFileName, string sType)
                sFileName = sPathName.substr(nIndex + 1);
        else
                sFileName = sPathName;
+
        // Info
        printf("%s:\n", sFileName.c_str());
        FILE *fResult = fopen(sResultFileName.c_str(), "wb");
@@ -98,7 +99,6 @@ void ConvertRainbowTable(string sPathName, string sResultFileName, string sType)
        static CMemoryPool mp;
        unsigned int nAllocatedSize;
        BaseRTReader *reader = NULL;
-
        if(sType == "RTI2")
                reader = (BaseRTReader*)new RTI2Reader(sFileName);
        else if(sType == "RTI")
@@ -108,15 +108,27 @@ void ConvertRainbowTable(string sPathName, string sResultFileName, string sType)
                printf("Invalid table type '%s'", sType.c_str());
                return ;
        }
-
-       RainbowChainCP* pChain = (RainbowChainCP*)mp.Allocate(reader->GetChainsLeft() * sizeof(RainbowChainCP), nAllocatedSize);
+       int size = reader->GetChainsLeft() * sizeof(RainbowChain);
+#ifdef _MEMORYDEBUG
+       printf("Starting allocation of %i bytes\n", size);
+#endif
+       RainbowChain* pChain = (RainbowChain*)mp.Allocate(size, nAllocatedSize);
+#ifdef _MEMORYDEBUG
+       printf("Finished. Got %i bytes\n", nAllocatedSize);
+#endif
        if (pChain != NULL)
        {
-               nAllocatedSize = nAllocatedSize / sizeof(RainbowChainCP) * sizeof(RainbowChainCP);              // Round to boundary
-               unsigned int nChains = nAllocatedSize / sizeof(RainbowChainCP);
+               nAllocatedSize = nAllocatedSize / sizeof(RainbowChain) * sizeof(RainbowChain);          // Round to boundary
+               unsigned int nChains = nAllocatedSize / sizeof(RainbowChain);
                while(reader->GetChainsLeft() > 0)
                {
+#ifdef _MEMORYDEBUG
+                       printf("Grabbing %i chains from file\n", nChains);
+#endif
                        reader->ReadChains(nChains, pChain);
+#ifdef _MEMORYDEBUG
+                       printf("Recieved %i chains from file\n", nChains);
+#endif
                        for(UINT4 i = 0; i < nChains; i++)
                        {
                                fwrite(&pChain[i], 1, 16, fResult);
@@ -181,4 +193,4 @@ int main(int argc, char* argv[])
                printf("\n");
        }
        return 0;
-}
+}
\ No newline at end of file
diff --git a/Client Applications/rti2rto/rti2rto.sln b/Client Applications/rti2rto/rti2rto.sln
deleted file mode 100644 (file)
index a8000e5..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rti2rto", "rti2rto.vcproj", "{E0FBC06A-C902-4468-A614-CBF9F591AA7C}"
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Win32 = Debug|Win32
-               Release|Win32 = Release|Win32
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {E0FBC06A-C902-4468-A614-CBF9F591AA7C}.Debug|Win32.ActiveCfg = Debug|Win32
-               {E0FBC06A-C902-4468-A614-CBF9F591AA7C}.Debug|Win32.Build.0 = Debug|Win32
-               {E0FBC06A-C902-4468-A614-CBF9F591AA7C}.Release|Win32.ActiveCfg = Release|Win32
-               {E0FBC06A-C902-4468-A614-CBF9F591AA7C}.Release|Win32.Build.0 = Release|Win32
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-EndGlobal
diff --git a/Client Applications/rti2rto/rti2rto.suo b/Client Applications/rti2rto/rti2rto.suo
deleted file mode 100644 (file)
index 023dd88..0000000
Binary files a/Client Applications/rti2rto/rti2rto.suo and /dev/null differ
diff --git a/Client Applications/rti2rto/rti2rto.vcproj b/Client Applications/rti2rto/rti2rto.vcproj
deleted file mode 100644 (file)
index 2dc3546..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="9,00"
-       Name="rti2rto"
-       ProjectGUID="{E0FBC06A-C902-4468-A614-CBF9F591AA7C}"
-       RootNamespace="rti2rto"
-       Keyword="Win32Proj"
-       TargetFrameworkVersion="196613"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../common/rt api"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               LinkIncremental="2"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="1"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="../../common/rt api"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath="..\..\Common\rt api\BaseRTReader.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Common\rt api\MemoryPool.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Common\rt api\Public.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Common\rt api\RTI2Reader.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\rti2rto.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Common\rt api\RTIReader.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Common\rt api\RTReader.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath="..\..\Common\rt api\BaseRTReader.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Common\rt api\MemoryPool.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Common\rt api\Public.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Common\rt api\RTI2Reader.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Common\rt api\RTIReader.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\Common\rt api\RTReader.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/Client Applications/win_build/clientapps.sln b/Client Applications/win_build/clientapps.sln
new file mode 100644 (file)
index 0000000..df922d7
--- /dev/null
@@ -0,0 +1,32 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "converti2", "..\converti2\converti2.vcxproj", "{066FD6F1-5990-47AD-B095-7AE0029CF5AE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rcracki_mt", "..\rcracki_mt\rcracki_mt.vcxproj", "{966DA4B4-E13C-449D-9A93-303C6FEA25C4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rti2rto", "..\rti2rto\rti2rto.vcxproj", "{E0FBC06A-C902-4468-A614-CBF9F591AA7C}"
+EndProject
+Global
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution
+               Debug|Win32 = Debug|Win32
+               Release|Win32 = Release|Win32
+       EndGlobalSection
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution
+               {066FD6F1-5990-47AD-B095-7AE0029CF5AE}.Debug|Win32.ActiveCfg = Debug|Win32
+               {066FD6F1-5990-47AD-B095-7AE0029CF5AE}.Debug|Win32.Build.0 = Debug|Win32
+               {066FD6F1-5990-47AD-B095-7AE0029CF5AE}.Release|Win32.ActiveCfg = Release|Win32
+               {066FD6F1-5990-47AD-B095-7AE0029CF5AE}.Release|Win32.Build.0 = Release|Win32
+               {966DA4B4-E13C-449D-9A93-303C6FEA25C4}.Debug|Win32.ActiveCfg = Debug|Win32
+               {966DA4B4-E13C-449D-9A93-303C6FEA25C4}.Debug|Win32.Build.0 = Debug|Win32
+               {966DA4B4-E13C-449D-9A93-303C6FEA25C4}.Release|Win32.ActiveCfg = Release|Win32
+               {966DA4B4-E13C-449D-9A93-303C6FEA25C4}.Release|Win32.Build.0 = Release|Win32
+               {E0FBC06A-C902-4468-A614-CBF9F591AA7C}.Debug|Win32.ActiveCfg = Debug|Win32
+               {E0FBC06A-C902-4468-A614-CBF9F591AA7C}.Debug|Win32.Build.0 = Debug|Win32
+               {E0FBC06A-C902-4468-A614-CBF9F591AA7C}.Release|Win32.ActiveCfg = Release|Win32
+               {E0FBC06A-C902-4468-A614-CBF9F591AA7C}.Release|Win32.Build.0 = Release|Win32
+       EndGlobalSection
+       GlobalSection(SolutionProperties) = preSolution
+               HideSolutionNode = FALSE
+       EndGlobalSection
+EndGlobal
diff --git a/Client Applications/win_build/clientapps.suo b/Client Applications/win_build/clientapps.suo
new file mode 100644 (file)
index 0000000..6791d07
Binary files /dev/null and b/Client Applications/win_build/clientapps.suo differ
index b94114f8e432287ea9ab8dfe303dea0002693f19..5054d8fb2088d19957fbf17c2d9ac1232eb98ef0 100644 (file)
@@ -4,16 +4,17 @@
 #include "Public.h"
 #include <string>
 #ifdef WIN32
-#include <io.h>
+       #include <io.h>
 #endif
 using namespace std;
 
 class BaseRTReader
 {
 public:
-       virtual int ReadChains(unsigned int &numChains, RainbowChainCP *pData) = 0;
-       virtual unsigned int GetChainsLeft() = 0;
+       virtual int ReadChains(UINT4 &numChains, RainbowChain *pData) = 0;
+       virtual UINT4 GetChainsLeft() = 0;
        
+       virtual ~BaseRTReader()  { };
 };
 
 #endif
index 1019b4f736212ce01b987e1d9fa729da48240a36..4c8d5c98eeb810e7d06ac81ad017bf8ef12d5e61 100644 (file)
@@ -25,8 +25,10 @@ CMemoryPool::CMemoryPool()
 
 CMemoryPool::~CMemoryPool()
 {
-       if (m_pMem != NULL)
-       {
+       if (m_pMem != NULL)     {
+#ifdef _MEMORYDEBUG
+               printf("Freeing %i bytes of memory\n", m_nMemSize);
+#endif 
                delete m_pMem;
                m_pMem = NULL;
                m_nMemSize = 0;
@@ -35,21 +37,23 @@ CMemoryPool::~CMemoryPool()
 
 unsigned char* CMemoryPool::Allocate(unsigned int nFileLen, unsigned int& nAllocatedSize)
 {
-       if (nFileLen <= m_nMemSize)
-       {
+       if (nFileLen <= m_nMemSize)     {
                nAllocatedSize = nFileLen;
                return m_pMem;
        }
 
        unsigned int nTargetSize;
-       if (nFileLen < m_nMemMax)
+       if (nFileLen < m_nMemMax) {
                nTargetSize = nFileLen;
-       else
+       }
+       else {
                nTargetSize = m_nMemMax;
-
+       }
        // Free existing memory
-       if (m_pMem != NULL)
-       {
+       if (m_pMem != NULL)     {
+#ifdef _MEMORYDEBUG
+               printf("Freeing %i bytes of memory\n", m_nMemSize);
+#endif 
                delete m_pMem;
                m_pMem = NULL;
                m_nMemSize = 0;
@@ -57,21 +61,29 @@ unsigned char* CMemoryPool::Allocate(unsigned int nFileLen, unsigned int& nAlloc
 
        // Allocate new memory
        //printf("allocating %u bytes memory\n", nTargetSize);
-//     m_pMem = new unsigned char[nTargetSize];
-m_pMem = new (nothrow) unsigned char[nTargetSize];
-while (m_pMem == NULL && nTargetSize >= 512 * 1024 * 1024 )
-{
-   nTargetSize -= 16 * 1024 * 1024;
-   m_pMem = new (nothrow) unsigned char[nTargetSize];
-}
-       if (m_pMem != NULL)
-       {
+       //      m_pMem = new unsigned char[nTargetSize];
+#ifdef _MEMORYDEBUG
+               printf("Allocating %i bytes of memory - ", nTargetSize);
+#endif 
+
+       m_pMem = new (nothrow) unsigned char[nTargetSize];
+       while (m_pMem == NULL && nTargetSize >= 512 * 1024 * 1024 )     {
+#ifdef _MEMORYDEBUG
+               printf("failed!\n");
+               printf("Allocating %i bytes of memory (backup) - ", nTargetSize);
+#endif 
+          nTargetSize -= 16 * 1024 * 1024;
+          m_pMem = new (nothrow) unsigned char[nTargetSize];
+       }
+       if (m_pMem != NULL)     {
+#ifdef _MEMORYDEBUG
+               printf("success!\n");
+#endif
                m_nMemSize = nTargetSize;
                nAllocatedSize = nTargetSize;
                return m_pMem;
        }
-       else
-       {
+       else {
                nAllocatedSize = 0;
                return NULL;
        }
index 443fd1c7029d81fcc566a047cedabe25717559af..004159ceba7b65506461157d43844233f13cc008 100644 (file)
@@ -23,7 +23,11 @@ RTI2Reader::RTI2Reader(string Filename)
        unsigned int len = GetFileLen(pFileIndex);
        fseek(pFileIndex, 0, SEEK_SET);
 
-       m_pIndex = new unsigned char[len];
+       m_pIndex = new (nothrow) unsigned char[len];
+       if(m_pIndex == NULL) {
+               printf("Error allocating %u MB memory for index in RTI2Reader::RTI2Reader()", len / (1024 * 1024));
+               exit(-2);
+       }
        if(fread(m_pIndex, 1, len, pFileIndex) != len)
        {
                printf("Error while reading index file");
@@ -62,7 +66,7 @@ unsigned int RTI2Reader::GetChainsLeft()
        return len / m_chainsizebytes - m_chainPosition;
 }
 
-int RTI2Reader::ReadChains(unsigned int &numChains, RainbowChainCP *pData)
+int RTI2Reader::ReadChains(unsigned int &numChains, RainbowChain *pData)
 {
        if(strncmp(m_pHeader->header, "RTI2", 4) != 0)
        {
@@ -115,7 +119,7 @@ int RTI2Reader::ReadChains(unsigned int &numChains, RainbowChainCP *pData)
                pData[chainsProcessed].nIndexE = m_pHeader->prefixstart + indexRow << m_pHeader->rti_endptlength;
                // Append the ending point suffix
                pData[chainsProcessed].nIndexE |= (chainrow & (0xFFFFFFFFFFFFFFFF >> m_pHeader->rti_cplength)) >> m_pHeader->rti_startptlength;
-               pData[chainsProcessed].nCheckPoint = (chainrow >> m_pHeader->rti_startptlength + m_pHeader->rti_endptlength);
+               //pData[chainsProcessed].nCheckPoint = (chainrow >> m_pHeader->rti_startptlength + m_pHeader->rti_endptlength);
                curRowPosition++;
                chainsProcessed++;
        }
index fb17dd8f8e7e830a447ae0567a821fd72e5cdb77..0b1f127471e2c7886f6c5742f1bc6844da1a12ea 100644 (file)
@@ -33,7 +33,7 @@ private:
 public:
        RTI2Reader(string Filename);
        ~RTI2Reader(void);
-       int ReadChains(unsigned int &numChains, RainbowChainCP *pData);
+       int ReadChains(UINT4 &numChains, RainbowChain *pData);
        unsigned int GetChainsLeft();
        static RTI2Header *GetHeader() { return m_pHeader; }
 };
index b72dbe2d214c4fdcee088957bbe6e32ef9ec3d21..3134e918cde56d464746f00a9315ff5443ecb6c7 100644 (file)
@@ -29,11 +29,25 @@ RTIReader::RTIReader(string Filename)
                        printf("index file length mismatch (%u bytes)\n", nIndexFileLen);
                else
                {
-                       m_pIndex = new IndexChain[nIndexFileLen / 11];
+                       if(m_pIndex != NULL) {
+                               delete m_pIndex;
+                               m_pIndex = NULL;
+                       }
+#ifdef _MEMORYDEBUG
+                       printf("Allocating %u MB memory for RTIReader::m_pIndex", nIndexFileLen / 11 / (1024 * 1024));
+#endif
+                       m_pIndex = new (nothrow) IndexChain[nIndexFileLen / 11];
+                       if(m_pIndex == NULL) {
+                               printf("\nFailed allocating %i MB memory.\n", nIndexFileLen / 11 / (1024 * 1024));
+                               exit(-2);
+                       }
+#ifdef _MEMORYDEBUG
+                       printf(" - success!\n");
+#endif                 
                        memset(m_pIndex, 0x00, sizeof(IndexChain) * (nIndexFileLen / 11));
                        fseek(pFileIndex, 0, SEEK_SET);
                        int nRead = 0;
-                       int nRows;
+                       UINT4 nRows;
                        for(nRows = 0; (nRows * 11) < nIndexFileLen; nRows++)
                        {
                                if(fread(&m_pIndex[nRows].nPrefix, 5, 1, pFileIndex) != 1) break;                                                       
@@ -60,7 +74,7 @@ RTIReader::RTIReader(string Filename)
                        }
                        if(m_pIndex[m_nIndexSize - 1].nFirstChain + m_pIndex[m_nIndexSize - 1].nChainCount > nTotalChainCount) // +1 is not needed here
                        {
-                               printf("Corrupted index detected: The index is covering more than the file\n");
+                               printf("Corrupted index detected: The index is covering more than the file (%i chains of %i chains)\n", m_pIndex[m_nIndexSize - 1].nFirstChain + m_pIndex[m_nIndexSize - 1].nChainCount, nTotalChainCount);
                                exit(-1);
                        }
 
@@ -76,13 +90,13 @@ RTIReader::RTIReader(string Filename)
 
 }
 
-int RTIReader::ReadChains(unsigned int &numChains, RainbowChainCP *pData)
+int RTIReader::ReadChains(unsigned int &numChains, RainbowChain *pData)
 {      
        // We HAVE to reset the data to 0x00's or we will get in trouble
-       memset(pData, 0x00, sizeof(RainbowChainCP) * numChains);
+       memset(pData, 0x00, sizeof(RainbowChain) * numChains);
        unsigned int readChains = 0;
        unsigned int chainsleft = GetChainsLeft();
-       for(int i = 0; i < m_nIndexSize; i++)
+       for(UINT4 i = 0; i < m_nIndexSize; i++)
        {
                if(m_chainPosition + readChains > m_pIndex[i].nFirstChain + m_pIndex[i].nChainCount) // We found the matching index
                        continue;
@@ -98,15 +112,17 @@ int RTIReader::ReadChains(unsigned int &numChains, RainbowChainCP *pData)
                }
                if(readChains == numChains) break;              
        }
-       if(readChains != numChains) numChains = readChains; // Update how many chains we read
+       if(readChains != numChains) { 
+               numChains = readChains; // Update how many chains we read
+       }
        m_chainPosition += readChains;
+       printf("Chain position is now %u\n", m_chainPosition);
        return 0;
 }
 
-unsigned int RTIReader::GetChainsLeft()
-{
-       int len = GetFileLen(m_pFile) / 8 - m_chainPosition;
-       return len;
+UINT4 RTIReader::GetChainsLeft()
+{      
+       return (GetFileLen(m_pFile) / 8) - m_chainPosition;
 }
 
 RTIReader::~RTIReader(void)
index 6d53e80a50f5b1e68e78606a0cb7fce01c13fb2e..775ff0a6e5095e2490efb5922bbccc8a3239af16 100644 (file)
@@ -20,7 +20,7 @@ public:
        RTIReader(string Filename);
        ~RTIReader(void);
 
-       int ReadChains(unsigned int &numChains, RainbowChainCP *pData);
+       int ReadChains(unsigned int &numChains, RainbowChain *pData);
        unsigned int GetChainsLeft();
 
 };
index b0de54e09ec93cbaef5a15b77da753791c2a0b0f..7fec6672c4caea50520166bab31e9ef8f6f3297a 100644 (file)
@@ -9,14 +9,14 @@ RTReader::~RTReader(void)
 {
 }
 
-int RTReader::ReadChains(unsigned int &numChains, RainbowChainCP *pData)
+int RTReader::ReadChains(unsigned int &numChains, RainbowChain *pData)
 {
        unsigned int numRead = fread(pData, 1, 16 * numChains, m_pFile);
        numChains = numRead / 16;
+       m_chainPosition += numChains;
        return 0;
 }
-unsigned int RTReader::GetChainsLeft()
+UINT4 RTReader::GetChainsLeft()
 {
-       unsigned int len = GetFileLen(m_pFile);
-       return len / 16 - m_chainPosition;
+       return (GetFileLen(m_pFile) / 16) - m_chainPosition;
 }
index 3d189c3a74b26ab728bc75bd9b32cb0431095b0b..d78261b41b914d46c30a4f453f7312acbf26f5a3 100644 (file)
@@ -18,7 +18,7 @@ private:
 public:
        RTReader(string Filename);
        ~RTReader(void);
-       int ReadChains(unsigned int &numChains, RainbowChainCP *pData);
+       int ReadChains(unsigned int &numChains, RainbowChain *pData);
        unsigned int GetChainsLeft();
 
 };
index 249ebcd54b31f67b4b4c477fc7a1610c1739982b..f83aa1a7cf21aec91cb4be8d2ca899ae0da6c518 100644 (file)
@@ -3,6 +3,9 @@
 
 #include "global.h"
 
+
+#define MD4_DIGEST_LENGTH 16
+
 //Main function
 void MD4_NEW( unsigned char * buf, int len, unsigned char * pDigest);