hex_sha1 en hex_sha1_file erbij
svn path=/Slnkdwf/trunk/; revision=12544
This commit is contained in:
@@ -71,6 +71,7 @@ STDMETHODIMP CCrypto::b64_hmac_sha1(BSTR key, BSTR data, BSTR* pVal)
|
||||
CHMAC_SHA1 HMAC_SHA1 ;
|
||||
HMAC_SHA1.HMAC_SHA1((BYTE *)adata.GetBuffer(), adata.GetLength(), (BYTE *)akey.GetBuffer(), akey.GetLength(), digest) ;
|
||||
CString res = base64_encode(digest, 20, false); // no padding
|
||||
|
||||
CComBSTR bstrString(res);
|
||||
return bstrString.CopyTo(pVal);
|
||||
}
|
||||
@@ -95,3 +96,37 @@ STDMETHODIMP CCrypto::hex_hmac_sha1(BSTR key, BSTR data, BSTR* pVal)
|
||||
CComBSTR bstrString(res);
|
||||
return bstrString.CopyTo(pVal);
|
||||
}
|
||||
|
||||
STDMETHODIMP CCrypto::hex_sha1(BSTR data, BSTR* pVal)
|
||||
{
|
||||
CSHA1 sha1;
|
||||
|
||||
CString adata(data);
|
||||
sha1.Update((UINT_8*)adata.GetBuffer(), adata.GetLength());
|
||||
sha1.Final();
|
||||
|
||||
TCHAR res[41];
|
||||
sha1.ReportHash(res, CSHA1::REPORT_HEX_SHORT); // Get final hash as pre-formatted string
|
||||
|
||||
CComBSTR bstrString(res);
|
||||
bstrString.ToLower();
|
||||
|
||||
return bstrString.CopyTo(pVal);
|
||||
}
|
||||
|
||||
STDMETHODIMP CCrypto::hex_sha1_file(BSTR fname, BSTR* pVal)
|
||||
{
|
||||
CSHA1 sha1;
|
||||
if (!sha1.HashFile(CString(fname))) // Hash the contents of the file
|
||||
return myAtlReportError (GetObjectCLSID(), "\nCCrypto::hex_sha1_file('%ls')", (LPCSTR)fname);
|
||||
|
||||
sha1.Final();
|
||||
|
||||
TCHAR res[41];
|
||||
sha1.ReportHash(res, CSHA1::REPORT_HEX_SHORT); // Get final hash as pre-formatted string
|
||||
|
||||
CComBSTR bstrString(res);
|
||||
bstrString.ToLower();
|
||||
|
||||
return bstrString.CopyTo(pVal);
|
||||
}
|
||||
|
||||
@@ -49,6 +49,9 @@ public:
|
||||
|
||||
STDMETHOD(b64_hmac_sha1)(BSTR key, BSTR data, BSTR* pVal);
|
||||
STDMETHOD(hex_hmac_sha1)(BSTR key, BSTR data, BSTR* pVal);
|
||||
STDMETHOD(hex_sha1)(BSTR data, BSTR* pVal);
|
||||
STDMETHOD(hex_sha1_file)(BSTR fname, BSTR* pVal);
|
||||
|
||||
};
|
||||
|
||||
OBJECT_ENTRY_AUTO(__uuidof(Crypto), CCrypto)
|
||||
|
||||
@@ -381,6 +381,8 @@ interface IQRCode : IDispatch{
|
||||
interface ICrypto : IDispatch{
|
||||
[id(1), helpstring("method b64_hmac_sha1")] HRESULT b64_hmac_sha1([in] BSTR key, [in] BSTR data, [out,retval] BSTR* pVal);
|
||||
[id(2), helpstring("method hex_hmac_sha1")] HRESULT hex_hmac_sha1([in] BSTR key, [in] BSTR data, [out,retval] BSTR* pVal);
|
||||
[id(3), helpstring("method hex_sha1")] HRESULT hex_sha1([in] BSTR str, [out,retval] BSTR* pVal);
|
||||
[id(4), helpstring("method hex_sha1_file")] HRESULT hex_sha1_file([in] BSTR fname, [out,retval] BSTR* pVal);
|
||||
};
|
||||
[
|
||||
uuid(B6FCDE6E-141C-4601-B3AC-4DF4D5F25DF8),
|
||||
|
||||
@@ -1,47 +1,27 @@
|
||||
/*
|
||||
100% free public domain implementation of the SHA-1 algorithm
|
||||
by Dominik Reichl <dominik.reichl@t-online.de>
|
||||
Web: http://www.dominik-reichl.de/
|
||||
100% free public domain implementation of the SHA-1 algorithm
|
||||
by Dominik Reichl <dominik.reichl@t-online.de>
|
||||
Web: http://www.dominik-reichl.de/
|
||||
|
||||
Version 1.6 - 2005-02-07 (thanks to Howard Kapustein for patches)
|
||||
- You can set the endianness in your files, no need to modify the
|
||||
header file of the CSHA1 class any more
|
||||
- Aligned data support
|
||||
- Made support/compilation of the utility functions (ReportHash
|
||||
and HashFile) optional (useful, if bytes count, for example in
|
||||
embedded environments)
|
||||
|
||||
Version 1.5 - 2005-01-01
|
||||
- 64-bit compiler compatibility added
|
||||
- Made variable wiping optional (define SHA1_WIPE_VARIABLES)
|
||||
- Removed unnecessary variable initializations
|
||||
- ROL32 improvement for the Microsoft compiler (using _rotl)
|
||||
|
||||
======== Test Vectors (from FIPS PUB 180-1) ========
|
||||
|
||||
SHA1("abc") =
|
||||
A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
|
||||
|
||||
SHA1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") =
|
||||
84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
|
||||
|
||||
SHA1(A million repetitions of "a") =
|
||||
34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
|
||||
See header file for version history and test vectors.
|
||||
*/
|
||||
|
||||
// If compiling with MFC, you might want to add #include "StdAfx.h"
|
||||
#include "stdafx.h"
|
||||
|
||||
#define _CRT_SECURE_NO_WARNINGS
|
||||
#include "SHA1.h"
|
||||
|
||||
#ifdef SHA1_UTILITY_FUNCTIONS
|
||||
#define SHA1_MAX_FILE_BUFFER 8000
|
||||
#define SHA1_MAX_FILE_BUFFER (32 * 20 * 820)
|
||||
#endif
|
||||
|
||||
// Rotate x bits to the left
|
||||
// Rotate _val32 by _nBits bits to the left
|
||||
#ifndef ROL32
|
||||
#ifdef _MSC_VER
|
||||
#define ROL32(_val32, _nBits) _rotl(_val32, _nBits)
|
||||
#define ROL32(_val32,_nBits) _rotl(_val32,_nBits)
|
||||
#else
|
||||
#define ROL32(_val32, _nBits) (((_val32)<<(_nBits))|((_val32)>>(32-(_nBits))))
|
||||
#define ROL32(_val32,_nBits) (((_val32)<<(_nBits))|((_val32)>>(32-(_nBits))))
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -52,19 +32,23 @@
|
||||
#define SHABLK0(i) (m_block->l[i])
|
||||
#endif
|
||||
|
||||
#define SHABLK(i) (m_block->l[i&15] = ROL32(m_block->l[(i+13)&15] ^ m_block->l[(i+8)&15] \
|
||||
^ m_block->l[(i+2)&15] ^ m_block->l[i&15],1))
|
||||
#define SHABLK(i) (m_block->l[i&15] = ROL32(m_block->l[(i+13)&15] ^ \
|
||||
m_block->l[(i+8)&15] ^ m_block->l[(i+2)&15] ^ m_block->l[i&15],1))
|
||||
|
||||
// SHA-1 rounds
|
||||
#define _R0(v,w,x,y,z,i) { z+=((w&(x^y))^y)+SHABLK0(i)+0x5A827999+ROL32(v,5); w=ROL32(w,30); }
|
||||
#define _R1(v,w,x,y,z,i) { z+=((w&(x^y))^y)+SHABLK(i)+0x5A827999+ROL32(v,5); w=ROL32(w,30); }
|
||||
#define _R2(v,w,x,y,z,i) { z+=(w^x^y)+SHABLK(i)+0x6ED9EBA1+ROL32(v,5); w=ROL32(w,30); }
|
||||
#define _R3(v,w,x,y,z,i) { z+=(((w|x)&y)|(w&x))+SHABLK(i)+0x8F1BBCDC+ROL32(v,5); w=ROL32(w,30); }
|
||||
#define _R4(v,w,x,y,z,i) { z+=(w^x^y)+SHABLK(i)+0xCA62C1D6+ROL32(v,5); w=ROL32(w,30); }
|
||||
#define _R0(v,w,x,y,z,i) {z+=((w&(x^y))^y)+SHABLK0(i)+0x5A827999+ROL32(v,5);w=ROL32(w,30);}
|
||||
#define _R1(v,w,x,y,z,i) {z+=((w&(x^y))^y)+SHABLK(i)+0x5A827999+ROL32(v,5);w=ROL32(w,30);}
|
||||
#define _R2(v,w,x,y,z,i) {z+=(w^x^y)+SHABLK(i)+0x6ED9EBA1+ROL32(v,5);w=ROL32(w,30);}
|
||||
#define _R3(v,w,x,y,z,i) {z+=(((w|x)&y)|(w&x))+SHABLK(i)+0x8F1BBCDC+ROL32(v,5);w=ROL32(w,30);}
|
||||
#define _R4(v,w,x,y,z,i) {z+=(w^x^y)+SHABLK(i)+0xCA62C1D6+ROL32(v,5);w=ROL32(w,30);}
|
||||
|
||||
#pragma warning(push)
|
||||
// Disable compiler warning 'Conditional expression is constant'
|
||||
#pragma warning(disable: 4127)
|
||||
|
||||
CSHA1::CSHA1()
|
||||
{
|
||||
m_block = (SHA1_WORKSPACE_BLOCK *)m_workspace;
|
||||
m_block = (SHA1_WORKSPACE_BLOCK*)m_workspace;
|
||||
|
||||
Reset();
|
||||
}
|
||||
@@ -87,14 +71,13 @@ void CSHA1::Reset()
|
||||
m_count[1] = 0;
|
||||
}
|
||||
|
||||
void CSHA1::Transform(UINT_32 *state, UINT_8 *buffer)
|
||||
void CSHA1::Transform(UINT_32* pState, const UINT_8* pBuffer)
|
||||
{
|
||||
// Copy state[] to working vars
|
||||
UINT_32 a = state[0], b = state[1], c = state[2], d = state[3], e = state[4];
|
||||
UINT_32 a = pState[0], b = pState[1], c = pState[2], d = pState[3], e = pState[4];
|
||||
|
||||
memcpy(m_block, buffer, 64);
|
||||
memcpy(m_block, pBuffer, 64);
|
||||
|
||||
// 4 rounds of 20 operations each. Loop unrolled.
|
||||
// 4 rounds of 20 operations each, loop unrolled
|
||||
_R0(a,b,c,d,e, 0); _R0(e,a,b,c,d, 1); _R0(d,e,a,b,c, 2); _R0(c,d,e,a,b, 3);
|
||||
_R0(b,c,d,e,a, 4); _R0(a,b,c,d,e, 5); _R0(e,a,b,c,d, 6); _R0(d,e,a,b,c, 7);
|
||||
_R0(c,d,e,a,b, 8); _R0(b,c,d,e,a, 9); _R0(a,b,c,d,e,10); _R0(e,a,b,c,d,11);
|
||||
@@ -117,11 +100,11 @@ void CSHA1::Transform(UINT_32 *state, UINT_8 *buffer)
|
||||
_R4(e,a,b,c,d,76); _R4(d,e,a,b,c,77); _R4(c,d,e,a,b,78); _R4(b,c,d,e,a,79);
|
||||
|
||||
// Add the working vars back into state
|
||||
state[0] += a;
|
||||
state[1] += b;
|
||||
state[2] += c;
|
||||
state[3] += d;
|
||||
state[4] += e;
|
||||
pState[0] += a;
|
||||
pState[1] += b;
|
||||
pState[2] += c;
|
||||
pState[3] += d;
|
||||
pState[4] += e;
|
||||
|
||||
// Wipe variables
|
||||
#ifdef SHA1_WIPE_VARIABLES
|
||||
@@ -129,102 +112,86 @@ void CSHA1::Transform(UINT_32 *state, UINT_8 *buffer)
|
||||
#endif
|
||||
}
|
||||
|
||||
// Use this function to hash in binary data and strings
|
||||
void CSHA1::Update(UINT_8 *data, UINT_32 len)
|
||||
void CSHA1::Update(const UINT_8* pbData, UINT_32 uLen)
|
||||
{
|
||||
UINT_32 i, j;
|
||||
UINT_32 j = ((m_count[0] >> 3) & 0x3F);
|
||||
|
||||
j = (m_count[0] >> 3) & 63;
|
||||
if((m_count[0] += (uLen << 3)) < (uLen << 3))
|
||||
++m_count[1]; // Overflow
|
||||
|
||||
if((m_count[0] += len << 3) < (len << 3)) m_count[1]++;
|
||||
m_count[1] += (uLen >> 29);
|
||||
|
||||
m_count[1] += (len >> 29);
|
||||
|
||||
if((j + len) > 63)
|
||||
UINT_32 i;
|
||||
if((j + uLen) > 63)
|
||||
{
|
||||
i = 64 - j;
|
||||
memcpy(&m_buffer[j], data, i);
|
||||
memcpy(&m_buffer[j], pbData, i);
|
||||
Transform(m_state, m_buffer);
|
||||
|
||||
for(; i + 63 < len; i += 64) Transform(m_state, &data[i]);
|
||||
for( ; (i + 63) < uLen; i += 64)
|
||||
Transform(m_state, &pbData[i]);
|
||||
|
||||
j = 0;
|
||||
}
|
||||
else i = 0;
|
||||
|
||||
memcpy(&m_buffer[j], &data[i], len - i);
|
||||
if((uLen - i) != 0)
|
||||
memcpy(&m_buffer[j], &pbData[i], uLen - i);
|
||||
}
|
||||
|
||||
#ifdef SHA1_UTILITY_FUNCTIONS
|
||||
// Hash in file contents
|
||||
bool CSHA1::HashFile(char *szFileName)
|
||||
bool CSHA1::HashFile(const TCHAR* tszFileName)
|
||||
{
|
||||
unsigned long ulFileSize, ulRest, ulBlocks;
|
||||
unsigned long i;
|
||||
UINT_8 uData[SHA1_MAX_FILE_BUFFER];
|
||||
FILE *fIn;
|
||||
if(tszFileName == NULL) return false;
|
||||
|
||||
if(szFileName == NULL) return false;
|
||||
FILE* fpIn = _tfopen(tszFileName, _T("rb"));
|
||||
if(fpIn == NULL) return false;
|
||||
|
||||
fIn = fopen(szFileName, "rb");
|
||||
if(fIn == NULL) return false;
|
||||
UINT_8* pbData = new UINT_8[SHA1_MAX_FILE_BUFFER];
|
||||
if(pbData == NULL) { fclose(fpIn); return false; }
|
||||
|
||||
fseek(fIn, 0, SEEK_END);
|
||||
ulFileSize = (unsigned long)ftell(fIn);
|
||||
fseek(fIn, 0, SEEK_SET);
|
||||
|
||||
if(ulFileSize != 0)
|
||||
bool bSuccess = true;
|
||||
while(true)
|
||||
{
|
||||
ulBlocks = ulFileSize / SHA1_MAX_FILE_BUFFER;
|
||||
ulRest = ulFileSize % SHA1_MAX_FILE_BUFFER;
|
||||
}
|
||||
else
|
||||
{
|
||||
ulBlocks = 0;
|
||||
ulRest = 0;
|
||||
const size_t uRead = fread(pbData, 1, SHA1_MAX_FILE_BUFFER, fpIn);
|
||||
|
||||
if(uRead > 0)
|
||||
Update(pbData, static_cast<UINT_32>(uRead));
|
||||
|
||||
if(uRead < SHA1_MAX_FILE_BUFFER)
|
||||
{
|
||||
if(feof(fpIn) == 0) bSuccess = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for(i = 0; i < ulBlocks; i++)
|
||||
{
|
||||
fread(uData, 1, SHA1_MAX_FILE_BUFFER, fIn);
|
||||
Update((UINT_8 *)uData, SHA1_MAX_FILE_BUFFER);
|
||||
}
|
||||
|
||||
if(ulRest != 0)
|
||||
{
|
||||
fread(uData, 1, ulRest, fIn);
|
||||
Update((UINT_8 *)uData, ulRest);
|
||||
}
|
||||
|
||||
fclose(fIn); fIn = NULL;
|
||||
return true;
|
||||
fclose(fpIn);
|
||||
delete[] pbData;
|
||||
return bSuccess;
|
||||
}
|
||||
#endif
|
||||
|
||||
void CSHA1::Final()
|
||||
{
|
||||
UINT_32 i;
|
||||
UINT_8 finalcount[8];
|
||||
|
||||
for(i = 0; i < 8; i++)
|
||||
UINT_8 finalcount[8];
|
||||
for(i = 0; i < 8; ++i)
|
||||
finalcount[i] = (UINT_8)((m_count[((i >= 4) ? 0 : 1)]
|
||||
>> ((3 - (i & 3)) * 8) ) & 255); // Endian independent
|
||||
|
||||
Update((UINT_8 *)"\200", 1);
|
||||
Update((UINT_8*)"\200", 1);
|
||||
|
||||
while ((m_count[0] & 504) != 448)
|
||||
Update((UINT_8 *)"\0", 1);
|
||||
Update((UINT_8*)"\0", 1);
|
||||
|
||||
Update(finalcount, 8); // Cause a SHA1Transform()
|
||||
|
||||
for(i = 0; i < 20; i++)
|
||||
{
|
||||
m_digest[i] = (UINT_8)((m_state[i >> 2] >> ((3 - (i & 3)) * 8) ) & 255);
|
||||
}
|
||||
for(i = 0; i < 20; ++i)
|
||||
m_digest[i] = (UINT_8)((m_state[i >> 2] >> ((3 - (i & 3)) * 8)) & 0xFF);
|
||||
|
||||
// Wipe variables for security reasons
|
||||
#ifdef SHA1_WIPE_VARIABLES
|
||||
i = 0;
|
||||
memset(m_buffer, 0, 64);
|
||||
memset(m_state, 0, 20);
|
||||
memset(m_count, 0, 8);
|
||||
@@ -234,42 +201,56 @@ void CSHA1::Final()
|
||||
}
|
||||
|
||||
#ifdef SHA1_UTILITY_FUNCTIONS
|
||||
// Get the final hash as a pre-formatted string
|
||||
void CSHA1::ReportHash(char *szReport, unsigned char uReportType)
|
||||
bool CSHA1::ReportHash(TCHAR* tszReport, REPORT_TYPE rtReportType) const
|
||||
{
|
||||
unsigned char i;
|
||||
char szTemp[16];
|
||||
if(tszReport == NULL) return false;
|
||||
|
||||
if(szReport == NULL) return;
|
||||
TCHAR tszTemp[16];
|
||||
|
||||
if(uReportType == REPORT_HEX)
|
||||
if((rtReportType == REPORT_HEX) || (rtReportType == REPORT_HEX_SHORT))
|
||||
{
|
||||
sprintf(szTemp, "%02X", m_digest[0]);
|
||||
strcat(szReport, szTemp);
|
||||
_sntprintf(tszTemp, 15, _T("%02X"), m_digest[0]);
|
||||
_tcscpy(tszReport, tszTemp);
|
||||
|
||||
for(i = 1; i < 20; i++)
|
||||
const TCHAR* lpFmt = ((rtReportType == REPORT_HEX) ? _T(" %02X") : _T("%02X"));
|
||||
for(size_t i = 1; i < 20; ++i)
|
||||
{
|
||||
sprintf(szTemp, " %02X", m_digest[i]);
|
||||
strcat(szReport, szTemp);
|
||||
_sntprintf(tszTemp, 15, lpFmt, m_digest[i]);
|
||||
_tcscat(tszReport, tszTemp);
|
||||
}
|
||||
}
|
||||
else if(uReportType == REPORT_DIGIT)
|
||||
else if(rtReportType == REPORT_DIGIT)
|
||||
{
|
||||
sprintf(szTemp, "%u", m_digest[0]);
|
||||
strcat(szReport, szTemp);
|
||||
_sntprintf(tszTemp, 15, _T("%u"), m_digest[0]);
|
||||
_tcscpy(tszReport, tszTemp);
|
||||
|
||||
for(i = 1; i < 20; i++)
|
||||
for(size_t i = 1; i < 20; ++i)
|
||||
{
|
||||
sprintf(szTemp, " %u", m_digest[i]);
|
||||
strcat(szReport, szTemp);
|
||||
_sntprintf(tszTemp, 15, _T(" %u"), m_digest[i]);
|
||||
_tcscat(tszReport, tszTemp);
|
||||
}
|
||||
}
|
||||
else strcpy(szReport, "Error: Unknown report type!");
|
||||
else return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Get the raw message digest
|
||||
void CSHA1::GetHash(UINT_8 *puDest)
|
||||
#ifdef SHA1_STL_FUNCTIONS
|
||||
bool CSHA1::ReportHashStl(std::basic_string<TCHAR>& strOut, REPORT_TYPE rtReportType) const
|
||||
{
|
||||
memcpy(puDest, m_digest, 20);
|
||||
TCHAR tszOut[84];
|
||||
const bool bResult = ReportHash(tszOut, rtReportType);
|
||||
if(bResult) strOut = tszOut;
|
||||
return bResult;
|
||||
}
|
||||
#endif
|
||||
|
||||
bool CSHA1::GetHash(UINT_8* pbDest20) const
|
||||
{
|
||||
if(pbDest20 == NULL) return false;
|
||||
memcpy(pbDest20, m_digest, 20);
|
||||
return true;
|
||||
}
|
||||
|
||||
#pragma warning(pop)
|
||||
|
||||
@@ -1,32 +1,90 @@
|
||||
/*
|
||||
100% free public domain implementation of the SHA-1 algorithm
|
||||
by Dominik Reichl <dominik.reichl@t-online.de>
|
||||
Web: http://www.dominik-reichl.de/
|
||||
100% free public domain implementation of the SHA-1 algorithm
|
||||
by Dominik Reichl <dominik.reichl@t-online.de>
|
||||
Web: http://www.dominik-reichl.de/
|
||||
|
||||
Version 1.6 - 2005-02-07 (thanks to Howard Kapustein for patches)
|
||||
- You can set the endianness in your files, no need to modify the
|
||||
header file of the CSHA1 class any more
|
||||
- Aligned data support
|
||||
- Made support/compilation of the utility functions (ReportHash
|
||||
and HashFile) optional (useful, if bytes count, for example in
|
||||
embedded environments)
|
||||
Version 1.9 - 2011-11-10
|
||||
- Added Unicode test vectors.
|
||||
- Improved support for hashing files using the HashFile method that
|
||||
are larger than 4 GB.
|
||||
- Improved file hashing performance (by using a larger buffer).
|
||||
- Disabled unnecessary compiler warnings.
|
||||
- Internal variables are now private.
|
||||
|
||||
Version 1.5 - 2005-01-01
|
||||
- 64-bit compiler compatibility added
|
||||
- Made variable wiping optional (define SHA1_WIPE_VARIABLES)
|
||||
- Removed unnecessary variable initializations
|
||||
- ROL32 improvement for the Microsoft compiler (using _rotl)
|
||||
Version 1.8 - 2009-03-16
|
||||
- Converted project files to Visual Studio 2008 format.
|
||||
- Added Unicode support for HashFile utility method.
|
||||
- Added support for hashing files using the HashFile method that are
|
||||
larger than 2 GB.
|
||||
- HashFile now returns an error code instead of copying an error
|
||||
message into the output buffer.
|
||||
- GetHash now returns an error code and validates the input parameter.
|
||||
- Added ReportHashStl STL utility method.
|
||||
- Added REPORT_HEX_SHORT reporting mode.
|
||||
- Improved Linux compatibility of test program.
|
||||
|
||||
======== Test Vectors (from FIPS PUB 180-1) ========
|
||||
Version 1.7 - 2006-12-21
|
||||
- Fixed buffer underrun warning that appeared when compiling with
|
||||
Borland C Builder (thanks to Rex Bloom and Tim Gallagher for the
|
||||
patch).
|
||||
- Breaking change: ReportHash writes the final hash to the start
|
||||
of the buffer, i.e. it's not appending it to the string anymore.
|
||||
- Made some function parameters const.
|
||||
- Added Visual Studio 2005 project files to demo project.
|
||||
|
||||
SHA1("abc") =
|
||||
A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
|
||||
Version 1.6 - 2005-02-07 (thanks to Howard Kapustein for patches)
|
||||
- You can set the endianness in your files, no need to modify the
|
||||
header file of the CSHA1 class anymore.
|
||||
- Aligned data support.
|
||||
- Made support/compilation of the utility functions (ReportHash and
|
||||
HashFile) optional (useful when bytes count, for example in embedded
|
||||
environments).
|
||||
|
||||
SHA1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") =
|
||||
84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
|
||||
Version 1.5 - 2005-01-01
|
||||
- 64-bit compiler compatibility added.
|
||||
- Made variable wiping optional (define SHA1_WIPE_VARIABLES).
|
||||
- Removed unnecessary variable initializations.
|
||||
- ROL32 improvement for the Microsoft compiler (using _rotl).
|
||||
|
||||
SHA1(A million repetitions of "a") =
|
||||
34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
|
||||
Version 1.4 - 2004-07-22
|
||||
- CSHA1 now compiles fine with GCC 3.3 under MacOS X (thanks to Larry
|
||||
Hastings).
|
||||
|
||||
Version 1.3 - 2003-08-17
|
||||
- Fixed a small memory bug and made a buffer array a class member to
|
||||
ensure correct working when using multiple CSHA1 class instances at
|
||||
one time.
|
||||
|
||||
Version 1.2 - 2002-11-16
|
||||
- Borlands C++ compiler seems to have problems with string addition
|
||||
using sprintf. Fixed the bug which caused the digest report function
|
||||
not to work properly. CSHA1 is now Borland compatible.
|
||||
|
||||
Version 1.1 - 2002-10-11
|
||||
- Removed two unnecessary header file includes and changed BOOL to
|
||||
bool. Fixed some minor bugs in the web page contents.
|
||||
|
||||
Version 1.0 - 2002-06-20
|
||||
- First official release.
|
||||
|
||||
================ Test Vectors ================
|
||||
|
||||
SHA1("abc" in ANSI) =
|
||||
A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
|
||||
SHA1("abc" in Unicode LE) =
|
||||
9F04F41A 84851416 2050E3D6 8C1A7ABB 441DC2B5
|
||||
|
||||
SHA1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
|
||||
in ANSI) =
|
||||
84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
|
||||
SHA1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
|
||||
in Unicode LE) =
|
||||
51D7D876 9AC72C40 9C5B0E3F 69C60ADC 9A039014
|
||||
|
||||
SHA1(A million repetitions of "a" in ANSI) =
|
||||
34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
|
||||
SHA1(A million repetitions of "a" in Unicode LE) =
|
||||
C4609560 A108A0C6 26AA7F2B 38A65566 739353C5
|
||||
*/
|
||||
|
||||
#ifndef ___SHA1_HDR___
|
||||
@@ -36,63 +94,111 @@
|
||||
#define SHA1_UTILITY_FUNCTIONS
|
||||
#endif
|
||||
|
||||
#include <memory.h> // Needed for memset and memcpy
|
||||
#if !defined(SHA1_STL_FUNCTIONS) && !defined(SHA1_NO_STL_FUNCTIONS)
|
||||
#define SHA1_STL_FUNCTIONS
|
||||
#if !defined(SHA1_UTILITY_FUNCTIONS)
|
||||
#error STL functions require SHA1_UTILITY_FUNCTIONS.
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <memory.h>
|
||||
|
||||
#ifdef SHA1_UTILITY_FUNCTIONS
|
||||
#include <stdio.h> // Needed for file access and sprintf
|
||||
#include <string.h> // Needed for strcat and strcpy
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#ifdef SHA1_STL_FUNCTIONS
|
||||
#include <string>
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
// You can define the endian mode in your files, without modifying the SHA1
|
||||
// You can define the endian mode in your files without modifying the SHA-1
|
||||
// source files. Just #define SHA1_LITTLE_ENDIAN or #define SHA1_BIG_ENDIAN
|
||||
// in your files, before including the SHA1.h header file. If you don't
|
||||
// define anything, the class defaults to little endian.
|
||||
|
||||
#if !defined(SHA1_LITTLE_ENDIAN) && !defined(SHA1_BIG_ENDIAN)
|
||||
#define SHA1_LITTLE_ENDIAN
|
||||
#endif
|
||||
|
||||
// Same here. If you want variable wiping, #define SHA1_WIPE_VARIABLES, if
|
||||
// not, #define SHA1_NO_WIPE_VARIABLES. If you don't define anything, it
|
||||
// If you want variable wiping, #define SHA1_WIPE_VARIABLES, if not,
|
||||
// #define SHA1_NO_WIPE_VARIABLES. If you don't define anything, it
|
||||
// defaults to wiping.
|
||||
|
||||
#if !defined(SHA1_WIPE_VARIABLES) && !defined(SHA1_NO_WIPE_VARIABLES)
|
||||
#define SHA1_WIPE_VARIABLES
|
||||
#endif
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Define 8- and 32-bit variables
|
||||
#if defined(SHA1_HAS_TCHAR)
|
||||
#include <tchar.h>
|
||||
#else
|
||||
#ifdef _MSC_VER
|
||||
#include <tchar.h>
|
||||
#else
|
||||
#ifndef TCHAR
|
||||
#define TCHAR char
|
||||
#endif
|
||||
#ifndef _T
|
||||
#define _T(__x) (__x)
|
||||
#define _tmain main
|
||||
#define _tprintf printf
|
||||
#define _getts gets
|
||||
#define _tcslen strlen
|
||||
#define _tfopen fopen
|
||||
#define _tcscpy strcpy
|
||||
#define _tcscat strcat
|
||||
#define _sntprintf snprintf
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
// Define variable types
|
||||
|
||||
#ifndef UINT_8
|
||||
#ifdef _MSC_VER // Compiling with Microsoft compiler
|
||||
#define UINT_8 unsigned __int8
|
||||
#else // !_MSC_VER
|
||||
#define UINT_8 unsigned char
|
||||
#endif // _MSC_VER
|
||||
#endif
|
||||
|
||||
#ifndef UINT_32
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
#define UINT_8 unsigned __int8
|
||||
#ifdef _MSC_VER // Compiling with Microsoft compiler
|
||||
#define UINT_32 unsigned __int32
|
||||
|
||||
#else
|
||||
|
||||
#define UINT_8 unsigned char
|
||||
|
||||
#else // !_MSC_VER
|
||||
#if (ULONG_MAX == 0xFFFFFFFF)
|
||||
#define UINT_32 unsigned long
|
||||
#else
|
||||
#define UINT_32 unsigned int
|
||||
#endif
|
||||
#endif // _MSC_VER
|
||||
#endif // UINT_32
|
||||
|
||||
#endif
|
||||
#endif
|
||||
#ifndef INT_64
|
||||
#ifdef _MSC_VER // Compiling with Microsoft compiler
|
||||
#define INT_64 __int64
|
||||
#else // !_MSC_VER
|
||||
#define INT_64 long long
|
||||
#endif // _MSC_VER
|
||||
#endif // INT_64
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Declare SHA1 workspace
|
||||
#ifndef UINT_64
|
||||
#ifdef _MSC_VER // Compiling with Microsoft compiler
|
||||
#define UINT_64 unsigned __int64
|
||||
#else // !_MSC_VER
|
||||
#define UINT_64 unsigned long long
|
||||
#endif // _MSC_VER
|
||||
#endif // UINT_64
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
// Declare SHA-1 workspace
|
||||
|
||||
typedef union
|
||||
{
|
||||
UINT_8 c[64];
|
||||
UINT_8 c[64];
|
||||
UINT_32 l[16];
|
||||
} SHA1_WORKSPACE_BLOCK;
|
||||
|
||||
@@ -100,49 +206,58 @@ class CSHA1
|
||||
{
|
||||
public:
|
||||
#ifdef SHA1_UTILITY_FUNCTIONS
|
||||
// Two different formats for ReportHash(...)
|
||||
enum
|
||||
// Different formats for ReportHash
|
||||
enum REPORT_TYPE
|
||||
{
|
||||
REPORT_HEX = 0,
|
||||
REPORT_DIGIT = 1
|
||||
REPORT_DIGIT = 1,
|
||||
REPORT_HEX_SHORT = 2
|
||||
};
|
||||
#endif
|
||||
|
||||
// Constructor and Destructor
|
||||
// Constructor and destructor
|
||||
CSHA1();
|
||||
~CSHA1();
|
||||
|
||||
UINT_32 m_state[5];
|
||||
UINT_32 m_count[2];
|
||||
UINT_32 __reserved1[1];
|
||||
UINT_8 m_buffer[64];
|
||||
UINT_8 m_digest[20];
|
||||
UINT_32 __reserved2[3];
|
||||
|
||||
void Reset();
|
||||
|
||||
// Update the hash value
|
||||
void Update(UINT_8 *data, UINT_32 len);
|
||||
// Hash in binary data and strings
|
||||
void Update(const UINT_8* pbData, UINT_32 uLen);
|
||||
|
||||
#ifdef SHA1_UTILITY_FUNCTIONS
|
||||
bool HashFile(char *szFileName);
|
||||
// Hash in file contents
|
||||
bool HashFile(const TCHAR* tszFileName);
|
||||
#endif
|
||||
|
||||
// Finalize hash and report
|
||||
// Finalize hash, call before using ReportHash(Stl)
|
||||
void Final();
|
||||
|
||||
// Report functions: as pre-formatted and raw data
|
||||
#ifdef SHA1_UTILITY_FUNCTIONS
|
||||
void ReportHash(char *szReport, unsigned char uReportType = REPORT_HEX);
|
||||
bool ReportHash(TCHAR* tszReport, REPORT_TYPE rtReportType = REPORT_HEX) const;
|
||||
#endif
|
||||
void GetHash(UINT_8 *puDest);
|
||||
|
||||
#ifdef SHA1_STL_FUNCTIONS
|
||||
bool ReportHashStl(std::basic_string<TCHAR>& strOut, REPORT_TYPE rtReportType =
|
||||
REPORT_HEX) const;
|
||||
#endif
|
||||
|
||||
// Get the raw message digest (20 bytes)
|
||||
bool GetHash(UINT_8* pbDest20) const;
|
||||
|
||||
private:
|
||||
// Private SHA-1 transformation
|
||||
void Transform(UINT_32 *state, UINT_8 *buffer);
|
||||
void Transform(UINT_32* pState, const UINT_8* pBuffer);
|
||||
|
||||
// Member variables
|
||||
UINT_32 m_state[5];
|
||||
UINT_32 m_count[2];
|
||||
UINT_32 m_reserved0[1]; // Memory alignment padding
|
||||
UINT_8 m_buffer[64];
|
||||
UINT_8 m_digest[20];
|
||||
UINT_32 m_reserved1[3]; // Memory alignment padding
|
||||
|
||||
UINT_8 m_workspace[64];
|
||||
SHA1_WORKSPACE_BLOCK *m_block; // SHA1 pointer to the byte array above
|
||||
SHA1_WORKSPACE_BLOCK* m_block; // SHA1 pointer to the byte array above
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif // ___SHA1_HDR___
|
||||
|
||||
Reference in New Issue
Block a user