* Copyright (C) Zhu Shuanglei <shuanglei@hotmail.com>
* Copyright Martin Westergaard Jørgensen <martinwj2005@gmail.com>
* Copyright 2009, 2010 Daniël Niggebrugge <niggebrugge@fox-it.com>
- * Copyright 2009, 2010 James Nobis <frt@quelrod.net>
+ * Copyright 2009, 2010, 2011 James Nobis <frt@quelrod.net>
* Copyright 2010 Yngve AAdlandsvik
*
- * This file is part of rcracki_mt.
+ * This file is part of freerainbowtables.
*
* freerainbowtables is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* along with freerainbowtables. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__GNUC__)
#pragma warning(disable : 4786)
#endif
#include <ctype.h>
-
//////////////////////////////////////////////////////////////////////
string CChainWalkContext::m_sHashRoutineName;
int CChainWalkContext::m_nPlainLenMinTotal = 0;
int CChainWalkContext::m_nPlainLenMaxTotal = 0;
int CChainWalkContext::m_nHybridCharset = 0;
+bool CChainWalkContext::isOldRtFormat = false;
+bool CChainWalkContext::isRti2RtFormat = false;
vector<stCharset> CChainWalkContext::m_vCharset;
uint64 CChainWalkContext::m_nPlainSpaceUpToX[MAX_PLAIN_LEN + 1];
uint64 CChainWalkContext::m_nPlainSpaceTotal;
stCharset tCharset;
int i;
for (i = 0x00; i <= 0xff; i++)
- tCharset.m_PlainCharset[i] = i;
+ tCharset.m_PlainCharset[i] = (unsigned char) i;
tCharset.m_nPlainCharsetLen = 256;
tCharset.m_sPlainCharsetName = sName;
tCharset.m_sPlainCharsetContent = "0x00, 0x01, ... 0xff";
return true;
}
if(sName.substr(0, 6) == "hybrid") // Hybrid charset consisting of 2 charsets
- {
m_nHybridCharset = 1;
- }
-
+ else
+ m_nHybridCharset = 0;
+
bool readCharset = false;
vector<string> vLine;
// something like lm_alpha#1-7_0_100x16_test.rt
#ifdef _WIN32
- int nIndex = sPathName.find_last_of('\\');
+ string::size_type nIndex = sPathName.find_last_of('\\');
#else
- int nIndex = sPathName.find_last_of('/');
+ string::size_type nIndex = sPathName.find_last_of('/');
#endif
- if (nIndex != -1)
+ if (nIndex != string::npos)
sPathName = sPathName.substr(nIndex + 1);
if (sPathName.size() < 3)
printf("%s is not a rainbow table\n", sPathName.c_str());
return false;
}
- /*
- if (sPathName.substr(sPathName.size() - 4) != ".rti")
+ if (sPathName.substr(sPathName.size() - 5) == ".rti2")
+ {
+ isRti2RtFormat = true;
+ }
+ else if (sPathName.substr(sPathName.size() - 4) == ".rti")
+ {
+ isOldRtFormat = false;
+ }
+ else if (sPathName.substr(sPathName.size() - 3) == ".rt")
+ {
+ isOldRtFormat = true;
+ }
+ else
{
printf("%s is not a rainbow table\n", sPathName.c_str());
return false;
}
-*/
+
// Parse
vector<string> vPart;
if (!SeperateString(sPathName, "___x_", vPart))
printf("hash routine: %s\n", m_sHashRoutineName.c_str());
printf("hash length: %d\n", m_nHashLen);
+ printf( "m_vCharset[0].m_nPlainCharSetLen: %d\n", m_vCharset[0].m_nPlainCharsetLen );
+ printf( "m_vCharset[1].m_nPlainCharSetLen: %d\n", m_vCharset[1].m_nPlainCharsetLen );
+
printf("plain charset: ");
- int i;
+ unsigned int i;
+
for (i = 0; i < m_vCharset[0].m_nPlainCharsetLen; i++)
{
if (isprint(m_vCharset[0].m_PlainCharset[i]))
m_nPlainLen = m_nPlainLenMinTotal;
uint64 nIndexOfX = m_nIndex - m_nPlainSpaceUpToX[m_nPlainLen - 1];
-// this is the generic code for non ia32 x86 platforms
-#if !defined(_M_X86) && !defined(__i386__)
+// this is the generic code for non x86/x86_64 platforms
+#if !defined(_M_X64) && !defined(_M_IX86) && !defined(__i386__) && !defined(__x86_64__)
- // 32-bit/generic version (slow for non 64-bit platforms)
+ // generic version (slow for non 64-bit platforms and gcc < 4.5.x)
for (i = m_nPlainLen - 1; i >= 0; i--)
{
int nCharsetLen = 0;
- for(uint32 j = 0; j < m_vCharset.size(); i++)
+ for(uint32 j = 0; j < m_vCharset.size(); j++)
{
nCharsetLen += m_vCharset[j].m_nPlainLenMax;
if(i < nCharsetLen) // We found the correct charset
}
}
}
-#else
+#elif defined(_M_X64) || defined(_M_IX86) || defined(__i386__) || defined(__x86_64__)
// Fast ia32 version
for (i = m_nPlainLen - 1; i >= 0; i--)
{
// 0x100000000 = 2^32
-#ifdef _M_X86
+#ifdef _M_IX86
if (nIndexOfX < 0x100000000I64)
break;
#else
if (nIndexOfX < 0x100000000llu)
break;
#endif
+
int nCharsetLen = 0;
for(uint32 j = 0; j < m_vCharset.size(); j++)
{
// m_Plain[i] = m_vCharset[j].m_PlainCharset[nIndexOfX32 % m_vCharset[j].m_nPlainCharsetLen];
// nIndexOfX32 /= m_vCharset[j].m_nPlainCharsetLen;
-// moving nPlainCharsetLen into the asm body and avoiding the extra temp
-// variable results in performance gain
-// unsigned int nPlainCharsetLen = m_vCharset[j].m_nPlainCharsetLen;
- unsigned int nTemp;
+// moving nPlainCharsetLen into the asm body and avoiding the extra temp
+// variable results in a performance gain
+// unsigned int nPlainCharsetLen = m_vCharset[j].m_nPlainCharsetLen;
+ unsigned int nTemp;
#if defined(_WIN32) && !defined(__GNUC__)
+ // VC++ still needs this
+ unsigned int nPlainCharsetLen = m_vCharset[j].m_nPlainCharsetLen;
+
__asm
{
mov eax, nIndexOfX32
xor edx, edx
- div m_vCharset[j].m_nPlainCharsetLen
+ div nPlainCharsetLen
mov nIndexOfX32, eax
mov nTemp, edx
}
m_Plain[i] = m_vCharset[j].m_PlainCharset[nTemp];
#else
- __asm__ __volatile__ ( "mov %2, %%eax;"
- "xor %%edx, %%edx;"
+ __asm__ __volatile__ ("xor %%edx, %%edx;"
"divl %3;"
- "mov %%eax, %0;"
- "mov %%edx, %1;"
- : "=m"(nIndexOfX32), "=m"(nTemp)
- : "m"(nIndexOfX32), "m"(m_vCharset[j].m_nPlainCharsetLen)
- : "%eax", "%edx"
- );
+ : "=a"(nIndexOfX32), "=d"(nTemp)
+ : "a"(nIndexOfX32), "rm"(m_vCharset[j].m_nPlainCharsetLen)
+ : );
m_Plain[i] = m_vCharset[j].m_PlainCharset[nTemp];
#endif
break;
{
return HexToStr(m_Plain, m_nPlainLen);
}
-/*
-string CChainWalkContext::GetPlainBinary()
-{
- string sRet;
- sRet += GetPlain();
- int i;
- for (i = 0; i < m_nPlainLenMax - m_nPlainLen; i++)
- sRet += ' ';
-
- sRet += "|";
-
- sRet += GetBinary();
- for (i = 0; i < m_nPlainLenMax - m_nPlainLen; i++)
- sRet += " ";
- return sRet;
-}
-*/
string CChainWalkContext::GetHash()
{
return HexToStr(m_Hash, m_nHashLen);
return false;
}
+
+bool CChainWalkContext::isOldFormat()
+{
+ return isOldRtFormat;
+}
+
+bool CChainWalkContext::isRti2Format()
+{
+ return isRti2RtFormat;
+}
projects / freerainbowtables / blobdiff