From 2ed2b944bdb2ba851327b710c317289dbc5a281e Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 29 Jul 2015 07:10:23 +0000 Subject: [PATCH] Include : aggiornamenti e aggiunte. --- EInAPI.h | 1 + EXeExecutor.h | 1 + EgtBase64.h | 115 ++++++++++++++++++++++++++++++++++ EgtCrc32.h | 161 ++++++++++++++++++++++++++++++++++++++++++++++++ SELkBase64.h | 20 ------ SELkCrc32.h | 22 ------- SELkKeyProc.h | 7 ++- SELkLockId.h | 37 +++++++++++ SELkMachineId.h | 11 +--- 9 files changed, 322 insertions(+), 53 deletions(-) create mode 100644 EgtBase64.h create mode 100644 EgtCrc32.h delete mode 100644 SELkBase64.h delete mode 100644 SELkCrc32.h create mode 100644 SELkLockId.h diff --git a/EInAPI.h b/EInAPI.h index aa97ef3..fb38dbf 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -43,6 +43,7 @@ EIN_EXPORT BOOL __stdcall EgtSetCommandLogger( const wchar_t* wsLogFile) ; EIN_EXPORT void __stdcall EgtEnableCommandLogger( void) ; EIN_EXPORT void __stdcall EgtDisableCommandLogger( void) ; EIN_EXPORT BOOL __stdcall EgtGetVersionInfo( wchar_t*& wsVer) ; +EIN_EXPORT BOOL __stdcall EgtGetKeyInfo( wchar_t*& wsKey) ; EIN_EXPORT BOOL __stdcall EgtGetOsInfo( wchar_t*& wsOs) ; EIN_EXPORT BOOL __stdcall EgtGetCpuInfo( wchar_t*& wsCpu) ; EIN_EXPORT BOOL __stdcall EgtGetMemoryInfo( wchar_t*& wsMem) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index c5436a3..ab8b948 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -44,6 +44,7 @@ EXE_EXPORT bool ExeSetCommandLogger( const std::string& sLogFile) ; EXE_EXPORT void ExeEnableCommandLogger( void) ; EXE_EXPORT void ExeDisableCommandLogger( void) ; EXE_EXPORT bool ExeGetVersionInfo( std::string& sVer, const char* szNewLine) ; +EXE_EXPORT bool ExeGetKeyInfo( std::string& sKey) ; EXE_EXPORT bool ExeGetOsInfo( std::string& sOs) ; EXE_EXPORT bool ExeGetCpuInfo( std::string& sCpu) ; EXE_EXPORT bool ExeGetMemoryInfo( std::string& sMem) ; diff --git a/EgtBase64.h b/EgtBase64.h new file mode 100644 index 0000000..eabfc63 --- /dev/null +++ b/EgtBase64.h @@ -0,0 +1,115 @@ +//---------------------------------------------------------------------------- +// EgalTech 2014-2015 +//---------------------------------------------------------------------------- +// File : EgtBase64.h Data : 28.07.15 Versione : 1.6g8 +// Contenuto : Funzioni per codifica/decodifica Base64. +// +// +// +// Modifiche : 10.09.14 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + +#include + + +//--------------------- Base64 Encoding/Decoding Tables ----------------------- +static char EncB64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" ; +static char DecB64[] = "|$$$}rstuvwxyz{$$$$$$$>?@ABCDEFGHIJKLMNOPQRSTUVW$$$$$$XYZ[\\]^_`abcdefghijklmnopq" ; + +//----------------------------------------------------------------------------- +// encodeblock - encode 3 8-bit binary bytes as 4 '6-bit' characters +//----------------------------------------------------------------------------- +inline void +encodeblock( unsigned char in[], std::string& sB64Dest, int len) +{ + sB64Dest.push_back( EncB64[ in[0] >> 2 ]) ; + sB64Dest.push_back( EncB64[ ((in[0] & 0x03) << 4) | ((in[1] & 0xf0) >> 4) ]) ; + sB64Dest.push_back( (unsigned char) (len > 1 ? EncB64[ ((in[1] & 0x0f) << 2) | + ((in[2] & 0xc0) >> 6) ] : '=')) ; + sB64Dest.push_back( (unsigned char) (len > 2 ? EncB64[ in[2] & 0x3f ] : '=')) ; +} + +//----------------------------------------------------------------------------- +// encode - base64 encode a stream, adding padding if needed +//----------------------------------------------------------------------------- +inline bool +B64Encode( const std::string& sSou, std::string& sB64Dest) +{ + // sorgente e dstinazione devono essere diversi + if ( &sSou == &sB64Dest) + return false ; + // eseguo conversione + sB64Dest.clear() ; + sB64Dest.reserve( (int) ( ceil( sSou.length() / 3.) * 4)) ; + unsigned char in[3] ; + for ( size_t j = 0 ; j < sSou.length() ;) { + int len = 0 ; + for ( size_t i = 0 ; i < 3 ; i++) { + if ( j < sSou.length()) { + in[i] = (unsigned char) sSou[j] ; + ++ len ; + ++ j ; + } + else + in[i] = 0 ; + } + if ( len > 0) + encodeblock( in, sB64Dest, len) ; + } + return true ; +} + +//----------------------------------------------------------------------------- +// decodeblock - decode 4 '6-bit' characters into 3 8-bit binary bytes +//----------------------------------------------------------------------------- +inline void +decodeblock( char in[], std::string& sDest) +{ + sDest.push_back( ( in[0] << 2 | in[1] >> 4)) ; + sDest.push_back( ( in[1] << 4 | in[2] >> 2)) ; + sDest.push_back( ( in[2] << 6 | in[3] >> 0)) ; +} + +//----------------------------------------------------------------------------- +inline bool +B64Decode( const std::string& sB64Sou, std::string& sDest) +{ + // sorgente e dstinazione devono essere diversi + if ( &sB64Sou == &sDest) + return false ; + // eseguo conversione + sDest.clear() ; + sDest.reserve( sB64Sou.length()) ; + int phase = 0 ; + char in[4] = { '\0', '\0', '\0', '\0'} ; + for ( size_t i = 0 ; i < sB64Sou.length() ; ++ i) { + int c = (int) sB64Sou[i] ; + if ( c == '=') { + decodeblock( in, sDest) ; + if ( in[3] == '\0') + sDest.pop_back() ; + if ( in[2] == '\0') + sDest.pop_back() ; + break ; + } + int nVal ; + char* p = strchr( EncB64, c) ; + if ( p != nullptr) + nVal = char( p - EncB64) ; + in[phase] = (( c < 43 || c > 122) ? -1 : (int) DecB64[ c - 43]) ; + if ( in[phase] != 0 ) + in[phase] = ((in[phase] == (int)'$') ? -1 : in[phase] - 62) ; + if ( in[phase] != -1 ) { + phase = (phase + 1) % 4 ; + if ( phase == 0) { + decodeblock( in, sDest) ; + in[0] = in[1] = in[2] = in[3] = '\0' ; + } + } + } + return true ; +} diff --git a/EgtCrc32.h b/EgtCrc32.h new file mode 100644 index 0000000..085a734 --- /dev/null +++ b/EgtCrc32.h @@ -0,0 +1,161 @@ +//---------------------------------------------------------------------------- +// EgalTech 2014-2015 +//---------------------------------------------------------------------------- +// File : EgtCrc32.h Data : 28.07.15 Versione : 1.6g8 +// Contenuto : Funzioni per calcolo CRC32. +// +// +// +// Modifiche : 08.09.14 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + +#include + + +//---------------------------------------------------------------------------- +inline unsigned int +GetCrc32( unsigned int current_remainder, size_t count, const void* p) +{ + /* + CRC32_TABLE[] is a table for a byte-wise 32-bit CRC calculation + using the generator polynomial: + x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1. + */ + static unsigned int CRC32_TABLE[256] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, + 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, + 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, + 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, + 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, + 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, + 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, + 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, + 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, + 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, + 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, + 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, + 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, + 0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, + 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, + 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, + 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, + 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, + 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, + 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, + 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, + 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, + 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, + 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, + 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, + 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, + 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, + 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, + 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, + 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, + 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, + 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, + 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, + 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, + 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, + 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, + 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, + 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, + 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, + 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, + 0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, + 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, + 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, + 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, + 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, + 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, + 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, + 0x2d02ef8d + }; + + if ( count > 0 && p != nullptr) { + + const unsigned char* b = (const unsigned char*) p ; + + current_remainder ^= 0xffffffff ; + while ( count >= 8) { + current_remainder = CRC32_TABLE[((int)current_remainder ^ (*b++)) & 0xff] ^ (current_remainder >> 8) ; + current_remainder = CRC32_TABLE[((int)current_remainder ^ (*b++)) & 0xff] ^ (current_remainder >> 8) ; + current_remainder = CRC32_TABLE[((int)current_remainder ^ (*b++)) & 0xff] ^ (current_remainder >> 8) ; + current_remainder = CRC32_TABLE[((int)current_remainder ^ (*b++)) & 0xff] ^ (current_remainder >> 8) ; + current_remainder = CRC32_TABLE[((int)current_remainder ^ (*b++)) & 0xff] ^ (current_remainder >> 8) ; + current_remainder = CRC32_TABLE[((int)current_remainder ^ (*b++)) & 0xff] ^ (current_remainder >> 8) ; + current_remainder = CRC32_TABLE[((int)current_remainder ^ (*b++)) & 0xff] ^ (current_remainder >> 8) ; + current_remainder = CRC32_TABLE[((int)current_remainder ^ (*b++)) & 0xff] ^ (current_remainder >> 8) ; + count -= 8 ; + } + + while ( count > 0) { + current_remainder = CRC32_TABLE[((int)current_remainder ^ (*b++)) & 0xff] ^ (current_remainder >> 8) ; + -- count ; + } + + current_remainder ^= 0xffffffff ; + } + + return current_remainder ; +} + +//---------------------------------------------------------------------------- +inline void +AddCrc32ToString( std::string& sVal) +{ + // calcolo CRC32 e lo aggiungo in coda + unsigned int nCrc32 = GetCrc32( 0, sVal.length(), sVal.c_str()) ; + sVal.push_back( ( nCrc32 & 0xff000000) >> 24) ; + sVal.push_back( ( nCrc32 & 0x00ff0000) >> 16) ; + sVal.push_back( ( nCrc32 & 0x0000ff00) >> 8) ; + sVal.push_back( ( nCrc32 & 0x000000ff) >> 0) ; + // la stringa puņ contenere caratteri speciali, va condificata in base64 +} + +//---------------------------------------------------------------------------- +inline bool +TestCrc32AndRemoveFromString( std::string& sVal) +{ + // almeno 4 char + if ( sVal.length() < 4) + return false ; + // stringa con CRC32 negli ultimi 4 char + unsigned int nReadCrc32 = (unsigned char) sVal.back() ; + sVal.pop_back() ; + nReadCrc32 += (((unsigned char) sVal.back()) << 8) ; + sVal.pop_back() ; + nReadCrc32 += (((unsigned char) sVal.back()) << 16) ; + sVal.pop_back() ; + nReadCrc32 += (((unsigned char) sVal.back()) << 24) ; + sVal.pop_back() ; + unsigned int nCalcCrc32 = GetCrc32( 0, sVal.length(), sVal.c_str()) ; + // test + return ( nReadCrc32 == nCalcCrc32) ; +} + +//---------------------------------------------------------------------------- +inline bool +TestCrc32OfString( const std::string& sVal) +{ + // almeno 4 char + int nLen = (int) sVal.length() ; + if ( nLen < 4) + return false ; + // stringa con CRC32 negli ultimi 4 char + unsigned int nReadCrc32 = (unsigned char) sVal[nLen-1] ; + nReadCrc32 += (((unsigned char) sVal[nLen-2]) << 8) ; + nReadCrc32 += (((unsigned char) sVal[nLen-3]) << 16) ; + nReadCrc32 += (((unsigned char) sVal[nLen-4]) << 24) ; + unsigned int nCalcCrc32 = GetCrc32( 0, nLen - 4, sVal.c_str()) ; + // test + return ( nReadCrc32 == nCalcCrc32) ; +} diff --git a/SELkBase64.h b/SELkBase64.h deleted file mode 100644 index c892f38..0000000 --- a/SELkBase64.h +++ /dev/null @@ -1,20 +0,0 @@ -//---------------------------------------------------------------------------- -// EgalTech 2014-2014 -//---------------------------------------------------------------------------- -// File : SELkBase64.h Data : 10.09.14 Versione : 1.5i1 -// Contenuto : Dichiarazione funzioni per codifica/decodifica Base64. -// -// -// -// Modifiche : 10.09.14 DS Creazione modulo. -// -// -//---------------------------------------------------------------------------- - -#pragma once - -#include - -//----------------------------------------------------------------------------- -bool B64Encode( const std::string& sSou, std::string& sB64Dest) ; -bool B64Decode( const std::string& sB64Sou, std::string& sDest) ; diff --git a/SELkCrc32.h b/SELkCrc32.h deleted file mode 100644 index 4a847be..0000000 --- a/SELkCrc32.h +++ /dev/null @@ -1,22 +0,0 @@ -//---------------------------------------------------------------------------- -// EgalTech 2014-2014 -//---------------------------------------------------------------------------- -// File : SELkCrc32.h Data : 08.09.14 Versione : 1.5i1 -// Contenuto : Dichiarazione funzioni per calcolo CRC32. -// -// -// -// Modifiche : 08.09.14 DS Creazione modulo. -// -// -//---------------------------------------------------------------------------- - -#pragma once - -#include - -//----------------------------------------------------------------------------- -void AddCrc32ToString( std::string& sVal) ; -bool TestCrc32AndRemoveFromString( std::string& sVal) ; -bool TestCrc32OfString( const std::string& sVal) ; -unsigned int GetCrc32( unsigned int current_remainder, size_t count, const void* p) ; diff --git a/SELkKeyProc.h b/SELkKeyProc.h index d506405..325be83 100644 --- a/SELkKeyProc.h +++ b/SELkKeyProc.h @@ -1,13 +1,13 @@ //---------------------------------------------------------------------------- -// EgalTech 2014-2014 +// EgalTech 2014-2015 //---------------------------------------------------------------------------- -// File : SELkKeyProc.h Data : 10.09.14 Versione : 1.5i2 +// File : SELkKeyProc.h Data : 27.07.15 Versione : 1.6g1 // Contenuto : Dichiarazione funzioni per la gestione della chiave. // // // // Modifiche : 10.09.14 DS Creazione modulo. -// +// 27.02.15 DS Agg. gestione chiavi hardware OxySec. // //---------------------------------------------------------------------------- @@ -30,6 +30,7 @@ int GetKeyOptions( const std::string& sKey, int nProd, int nVer, int nLev, int GetCurrDay( void) ; //-------------------------- Constants ---------------------------------------- +// Codici di ritorno const int KEY_OK = 0 ; const int KEY_ERR_MACHID = 1 ; const int KEY_ERR_SCRAMKEY = 2 ; diff --git a/SELkLockId.h b/SELkLockId.h new file mode 100644 index 0000000..7c00c68 --- /dev/null +++ b/SELkLockId.h @@ -0,0 +1,37 @@ +//---------------------------------------------------------------------------- +// EgalTech 2014-2015 +//---------------------------------------------------------------------------- +// File : SELkLockId.cpp Data : 27.07.15 Versione : 1.6g8 +// Contenuto : Dichiarazione funzioni per gestione/calcolo Id protezione, +// da macchina o da chiave hardware. +// +// +// Modifiche : 10.09.14 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + +#include + +//------------------------------------------------------------------------------- +// Imposto il tipo di protezione +bool SetLockType( int nType) ; +// Recupero l'identificativo in chiaro della protezione +bool GetLockId( std::string& sLockId) ; +// Recupero l'identificativo cifrato della protezione +bool GetLockId2( std::string& sLockId) ; +// conversioni +bool ConvertLockIdToLockId2( const std::string& sLockId, std::string& sLockId2) ; +bool ConvertLockId2ToLockId( const std::string& sLockId2, std::string& sLockId) ; +bool ConvertLockIdToScramKey( const std::string& sLockId, std::string& sScramKey) ; +bool ConvertLockId2ToScramKey( const std::string& sLockId2, std::string& sScramKey) ; + +//-------------------------- Constants ---------------------------------------- +// Tipo di protezione +const int KEY_LOCK_TYPE_ANY = 0 ; +const int KEY_LOCK_TYPE_SW = 1 ; +const int KEY_LOCK_TYPE_HW = 2 ; +// Inizio Id protezione hw +const std::string KEY_LOCK_HW_START = "EGTECH" ; diff --git a/SELkMachineId.h b/SELkMachineId.h index 019b20e..500b33d 100644 --- a/SELkMachineId.h +++ b/SELkMachineId.h @@ -1,9 +1,8 @@ //---------------------------------------------------------------------------- -// EgalTech 2014-2014 +// EgalTech 2014-2015 //---------------------------------------------------------------------------- -// File : SELkMachineId.cpp Data : 10.09.14 Versione : 1.5i2 -// Contenuto : Dichiarazione funzioni per gestione/calcolo Id macchina. -// +// File : SELkMachineId.cpp Data : 27.07.15 Versione : 1.6g8 +// Contenuto : Dichiarazione funzioni per calcolo e gestione Id macchina. // // // Modifiche : 10.09.14 DS Creazione modulo. @@ -17,8 +16,4 @@ //------------------------------------------------------------------------------- bool CalcMachineId( bool bForceNew) ; -bool GetMachineId( std::string& sMachineId) ; bool GetMachineId2( std::string& sMachineId) ; -bool GetMachineId3( std::string& sMachineId) ; -bool ConvertMachineId2ToMachineId( const std::string& sMachId2, std::string& sMachId) ; -bool ConvertMachineId2ToScramKey( const std::string& sMachId2, std::string& sScramKey) ;