diff --git a/Base64.cpp b/Base64.cpp deleted file mode 100644 index d6a4863..0000000 --- a/Base64.cpp +++ /dev/null @@ -1,117 +0,0 @@ -//---------------------------------------------------------------------------- -// EgalTech 2014-2014 -//---------------------------------------------------------------------------- -// File : Base64.cpp Data : 08.09.14 Versione : 1.5i2 -// Contenuto : Funzioni per codifica/decodifica Base64. -// -// -// -// Modifiche : 08.09.14 DS Creazione modulo. -// -// -//---------------------------------------------------------------------------- - -//------------------ Include ------------------------------------------------- -#include "stdafx.h" -#include "/EgtDev/Include/SELkBase64.h" - -using namespace std ; - -//--------------------- 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 -//----------------------------------------------------------------------------- -void -encodeblock( unsigned char in[], 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 -//----------------------------------------------------------------------------- -bool -B64Encode( const string& sSou, 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 -//----------------------------------------------------------------------------- -void -decodeblock( char in[], 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)) ; -} - -//----------------------------------------------------------------------------- -bool -B64Decode( const string& sB64Sou, 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/Crc32.cpp b/Crc32.cpp deleted file mode 100644 index 0a6d495..0000000 --- a/Crc32.cpp +++ /dev/null @@ -1,167 +0,0 @@ -//---------------------------------------------------------------------------- -// EgalTech 2014-2014 -//---------------------------------------------------------------------------- -// File : Crc32.cpp Data : 08.09.14 Versione : 1.5i2 -// Contenuto : Funzioni per calcolo CRC32. -// -// -// -// Modifiche : 08.09.14 DS Creazione modulo. -// -// -//---------------------------------------------------------------------------- - - -//------------------ Include ------------------------------------------------- -#include "stdafx.h" -#include "/EgtDev/Include/SELkCrc32.h" - -using namespace std ; - - -//---------------------------------------------------------------------------- -void -AddCrc32ToString( 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 -} - -//---------------------------------------------------------------------------- -bool -TestCrc32AndRemoveFromString( 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) ; -} - -//---------------------------------------------------------------------------- -bool -TestCrc32OfString( const 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) ; -} - -//---------------------------------------------------------------------------- -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 ; -} - - - diff --git a/DongleId.cpp b/DongleId.cpp new file mode 100644 index 0000000..cc31849 --- /dev/null +++ b/DongleId.cpp @@ -0,0 +1,79 @@ +//---------------------------------------------------------------------------- +// EgalTech 2015-2015 +//---------------------------------------------------------------------------- +// File : DongleId.cpp Data : 27.07.15 Versione : 1.6g1 +// Contenuto : Funzioni per gestione/calcolo Id chiave OxySec. +// +// +// +// Modifiche : 27.07.15 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +//------------------ Include ------------------------------------------------- +#include "stdafx.h" +#include "Obfuscate.h" +#include "DongleId.h" +#include "/EgtDev/Include/EgtBase64.h" +#include "/EgtDev/Include/EgtCrc32.h" +#include "/EgtDev/Extern/OxySec/Include/xlt.h" + +using namespace std ; + +//---------------------------------------------------------------------------- +bool +GetDongleId( string& sDongleId) +{ + // cerco la chiave + unsigned char label[XLT_LABEL_SIZE] ; + string sLabel = "EgalTech s.r.l. - CAD/CAM/CIM Software Solutions" ; + strcpy_s( (char*)label, XLT_LABEL_SIZE, sLabel.c_str()) ; + memset( label + sLabel.size(), 0x00, sizeof(label) - sLabel.size()) ; + int device = xlt_locate( label) ; + if ( device < 0) + return false ; + // richiamo funzioni di verifica chiave con decifratura RSA 512 di dati generati al volo + // ... DA FARE ... + // leggo l'identificativo della chiave dal banco 0 + unsigned char pwd[XLT_PASSWORD_SIZE] ; + unsigned char data[XLT_BANK_SIZE] ; + // M0nt3ReC@st3llo1985 + pwd[ 0] = 'M' ; + pwd[ 2] = 'n' ; + pwd[ 4] = '3' ; + pwd[ 6] = 'e' ; + pwd[ 8] = '@' ; + pwd[10] = 't' ; + pwd[12] = 'l' ; + pwd[14] = 'o' ; + pwd[16] = '9' ; + pwd[18] = '5' ; + pwd[20] = '\0' ; + pwd[22] = '\0' ; + pwd[24] = '\0' ; + pwd[26] = '\0' ; + pwd[28] = '\0' ; + pwd[30] = '\0' ; + pwd[ 1] = '0' ; + pwd[ 3] = 't' ; + pwd[ 5] = 'R' ; + pwd[ 7] = 'C' ; + pwd[ 9] = 's' ; + pwd[11] = '3' ; + pwd[13] = 'l' ; + pwd[15] = '1' ; + pwd[17] = '8' ; + pwd[19] = '\0' ; + pwd[21] = '\0' ; + pwd[23] = '\0' ; + pwd[25] = '\0' ; + pwd[27] = '\0' ; + pwd[29] = '\0' ; + pwd[31] = '\0' ; + int status = xlt_read( device, pwd, 0, data) ; + if ( status != XLT_ERROR_SUCCESS) + return false ; + sDongleId = (char*) data ; + return true ; +} diff --git a/DongleId.h b/DongleId.h new file mode 100644 index 0000000..9b5e753 --- /dev/null +++ b/DongleId.h @@ -0,0 +1,19 @@ +//---------------------------------------------------------------------------- +// EgalTech 2015-2015 +//---------------------------------------------------------------------------- +// File : DongleId.h Data : 28.07.15 Versione : 1.6g8 +// Contenuto : Dichiarazione funzioni locali per gestione/calcolo Id chiave. +// +// +// +// Modifiche : 28.07.15 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + +#include + +//------------------------------------------------------------------------------- +bool GetDongleId( std::string& sDongleId) ; diff --git a/EgtLock.sln b/EgtLock.sln index 0d44f72..bc271f1 100644 --- a/EgtLock.sln +++ b/EgtLock.sln @@ -15,8 +15,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {DD7F3502-6761-4B6D-BE79-B2DF4A5FC426}.Debug|Win32.ActiveCfg = Debug|Win32 {DD7F3502-6761-4B6D-BE79-B2DF4A5FC426}.Debug|Win32.Build.0 = Debug|Win32 - {DD7F3502-6761-4B6D-BE79-B2DF4A5FC426}.Debug|x64.ActiveCfg = Release|Win32 - {DD7F3502-6761-4B6D-BE79-B2DF4A5FC426}.Debug|x64.Build.0 = Release|Win32 + {DD7F3502-6761-4B6D-BE79-B2DF4A5FC426}.Debug|x64.ActiveCfg = Debug|x64 + {DD7F3502-6761-4B6D-BE79-B2DF4A5FC426}.Debug|x64.Build.0 = Debug|x64 {DD7F3502-6761-4B6D-BE79-B2DF4A5FC426}.Release|Win32.ActiveCfg = Release|Win32 {DD7F3502-6761-4B6D-BE79-B2DF4A5FC426}.Release|Win32.Build.0 = Release|Win32 {DD7F3502-6761-4B6D-BE79-B2DF4A5FC426}.Release|x64.ActiveCfg = Release|x64 diff --git a/EgtLock.vcxproj b/EgtLock.vcxproj index 6932e86..be82df2 100644 --- a/EgtLock.vcxproj +++ b/EgtLock.vcxproj @@ -70,21 +70,25 @@ $(SolutionDir)$(Configuration)$(PlatformArchitecture)\ $(Configuration)$(PlatformArchitecture)\ S$(ProjectName)D$(PlatformArchitecture) + C:\;$(IncludePath) $(SolutionDir)$(Configuration)$(PlatformArchitecture)\ $(Configuration)$(PlatformArchitecture)\ S$(ProjectName)R$(PlatformArchitecture) + C:\;$(IncludePath) $(SolutionDir)$(Configuration)$(PlatformArchitecture)\ $(Configuration)$(PlatformArchitecture)\ S$(ProjectName)D$(PlatformArchitecture) + C:\;$(IncludePath) $(SolutionDir)$(Configuration)$(PlatformArchitecture)\ $(Configuration)$(PlatformArchitecture)\ S$(ProjectName)R$(PlatformArchitecture) + C:\;$(IncludePath) @@ -173,21 +177,24 @@ copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\ - - + + + + + - + - + Create diff --git a/EgtLock.vcxproj.filters b/EgtLock.vcxproj.filters index b2425b3..4a9ba75 100644 --- a/EgtLock.vcxproj.filters +++ b/EgtLock.vcxproj.filters @@ -18,25 +18,34 @@ File di intestazione - - File di intestazione - - - File di intestazione - - - File di intestazione - File di intestazione File di intestazione + + File di intestazione + + + File di intestazione + + + File di intestazione + + + File di intestazione + File di intestazione - + + File di intestazione + + + File di intestazione + + File di intestazione @@ -44,12 +53,6 @@ File di origine - - File di origine - - - File di origine - File di origine @@ -62,5 +65,11 @@ File di origine + + File di origine + + + File di origine + \ No newline at end of file diff --git a/KeyProc.cpp b/KeyProc.cpp index 1ff64b2..9e309ce 100644 --- a/KeyProc.cpp +++ b/KeyProc.cpp @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2014-2014 +// EgalTech 2014-2015 //---------------------------------------------------------------------------- -// File : KeyProc.cpp Data : 10.09.14 Versione : 1.5i2 +// File : KeyProc.cpp Data : 27.07.15 Versione : 1.6g1 // Contenuto : Funzioni per la gestione della chiave. // // @@ -15,17 +15,18 @@ //------------------ Include ------------------------------------------------- #include "stdafx.h" #include +#include "LockId.h" #include "Obfuscate.h" #include "/EgtDev/Include/EGnStringUtils.h" +#include "/EgtDev/Include/EgtBase64.h" +#include "/EgtDev/Include/EgtCrc32.h" #include "/EgtDev/Include/SELkKeyProc.h" -#include "/EgtDev/Include/SELkMachineId.h" -#include "/EgtDev/Include/SELkCrc32.h" -#include "/EgtDev/Include/SELkBase64.h" +#include "/EgtDev/Include/SELkLockId.h" using namespace std ; //---------------------------------------------------------------------------- -static const int MIN_DAYS = 16326 ; // giorni al 13/09/2014 dal 1/1/1970 +static const int MIN_DAYS = 16642 ; // giorni al 27/07/2015 dal 1/1/1970 static const int N_STEP = 7 ; //---------------------------------------------------------------------------- @@ -111,11 +112,11 @@ VerifyKey( const string& sKey, int nProd, int nVer, int nLev, unsigned int& nKOpt1, unsigned int& nKOpt2, int& nKOptExpDays) { // creo la chiave di scramble - string sMachId2 ; - if ( ! GetMachineId2( sMachId2)) + string sLockId2 ; + if ( ! GetLockId2( sLockId2)) return KEY_ERR_MACHID ; string sScramKey ; - if ( ! ConvertMachineId2ToScramKey( sMachId2, sScramKey)) + if ( ! ConvertLockId2ToScramKey( sLockId2, sScramKey)) return KEY_ERR_SCRAMKEY ; // recupero le informazioni nella chiave if ( ! ReadKey( sKey, sScramKey, diff --git a/LockId.cpp b/LockId.cpp new file mode 100644 index 0000000..07fccf4 --- /dev/null +++ b/LockId.cpp @@ -0,0 +1,133 @@ +//---------------------------------------------------------------------------- +// EgalTech 2015-2015 +//---------------------------------------------------------------------------- +// File : ProtectionId.cpp Data : 28.07.15 Versione : 1.6g8 +// Contenuto : Funzioni per gestione/calcolo Id protezione. +// +// +// +// Modifiche : 28.07.15 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +//------------------ Include ------------------------------------------------- +#include "stdafx.h" +#include "MachineId.h" +#include "DongleId.h" +#include "Obfuscate.h" +#include "/EgtDev/Include/EgtBase64.h" +#include "/EgtDev/Include/EgtCrc32.h" +#include "/EgtDev/Include/SELkLockId.h" + +using namespace std ; + +//---------------------------------------------------------------------------- +static int s_nLockType = KEY_LOCK_TYPE_ANY ; + +//---------------------------------------------------------------------------- +bool +SetLockType( int nType) +{ + if ( nType != KEY_LOCK_TYPE_ANY && + nType != KEY_LOCK_TYPE_SW && + nType != KEY_LOCK_TYPE_HW) + return false ; + s_nLockType = nType ; + return true ; +} + +//---------------------------------------------------------------------------- +int +GetLockType( void) +{ + return s_nLockType ; +} + +//---------------------------------------------------------------------------- +bool +GetLockId( string& sLockId) +{ + switch ( s_nLockType) { + default : // KEY_LOCK_TYPE_ANY + if ( GetDongleId( sLockId)) + return true ; + return GetMachineId( sLockId) ; + case KEY_LOCK_TYPE_SW : + return GetMachineId( sLockId) ; + case KEY_LOCK_TYPE_HW : + return GetDongleId( sLockId) ; + } +} + +//---------------------------------------------------------------------------- +bool +GetLockId2( string& sLockId) +{ + string sTmp ; + if ( ! GetLockId( sTmp)) + return false ; + return ConvertLockIdToLockId2( sTmp, sLockId) ; +} + +//------------------------------------------------------------------------------------ +bool +ConvertLockIdToLockId2( const string& sLockId, string& sLockId2) +{ + // eseguo Mix + CRC32 + Base64 + string sAux = sLockId ; + if ( ! MixLockId( sAux)) + return false ; + AddCrc32ToString( sAux) ; + return B64Encode( sAux, sLockId2) ; +} + +//------------------------------------------------------------------------------------ +bool +ConvertLockId2ToLockId( const string& sLockId2, string& sLockId) +{ + // eseguo decodifica da Base64 + if ( ! B64Decode( sLockId2, sLockId)) + return false ; + // eseguo test e rimozione CRC32 + if ( ! TestCrc32AndRemoveFromString( sLockId)) + return false ; + // eseguo demixing + if ( ! MixLockId( sLockId)) + return false ; + return true ; +} + +//------------------------------------------------------------------------------------ +bool +ConvertLockIdToScramKey( const string& sLockId, string& sScramKey) +{ + // eseguo Mix + sScramKey = sLockId ; + if ( ! MixLockId( sScramKey)) + return false ; + // eseguo scramble + if ( ! ScrambleLockId( sScramKey)) + return false ; + // aggiungo CRC32 + AddCrc32ToString( sScramKey) ; + return true ; +} + +//------------------------------------------------------------------------------------ +bool +ConvertLockId2ToScramKey( const string& sLockId2, string& sScramKey) +{ + // eseguo decodifica da Base64 + if ( ! B64Decode( sLockId2, sScramKey)) + return false ; + // eseguo test e rimozione CRC32 + if ( ! TestCrc32AndRemoveFromString( sScramKey)) + return false ; + // eseguo scramble + if ( ! ScrambleLockId( sScramKey)) + return false ; + // aggiungo CRC32 + AddCrc32ToString( sScramKey) ; + return true ; +} diff --git a/LockId.h b/LockId.h new file mode 100644 index 0000000..811f228 --- /dev/null +++ b/LockId.h @@ -0,0 +1,17 @@ +//---------------------------------------------------------------------------- +// EgalTech 2015-2015 +//---------------------------------------------------------------------------- +// File : ProtectionId.h Data : 28.07.15 Versione : 1.6g8 +// Contenuto : Dichiarazione funzioni locali per gestione/calcolo Id protezione. +// +// +// +// Modifiche : 28.07.15 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + +//------------------------------------------------------------------------------- +int GetProtectionType( void) ; diff --git a/MachineId.cpp b/MachineId.cpp index 5c2b034..2798ee8 100644 --- a/MachineId.cpp +++ b/MachineId.cpp @@ -13,19 +13,28 @@ //------------------ Include ------------------------------------------------- #include "stdafx.h" +#include "MachineId.h" +#include "Obfuscate.h" +#include "RegForMachineId.h" +#include "/EgtDev/Include/SELkMachineId.h" +#include "/EgtDev/Include/EgtBase64.h" +#include "/EgtDev/Include/EgtCrc32.h" +#include "/EgtDev/Include/EGnStringUtils.h" +#include "/EgtDev/Include/EgtStringConverter.h" #define NOMINMAX #include #include -#include "MachineId.h" -#include "RegForMachineId.h" -#include "Obfuscate.h" -#include "/EgtDev/Include/SELkBase64.h" -#include "/EgtDev/Include/SELkCrc32.h" -#include "/EgtDev/Include/EGnStringUtils.h" -#include "/EgtDev/Include/EgtStringConverter.h" using namespace std ; +// ----------------- Funzioni locali ------------------------------------------------- +static bool GetSN123FromRegistry( std::string& sSN1, std::string& sSN2, std::string& sSN3) ; +static bool GetSN123FromMachine( std::string& sSN1, std::string& sSN2, std::string& sSN3) ; +static void AdjustSN( const std::string& sSou, const char* szFill, std::string& sDest) ; +static DWORD GetPhysicalDriveSN( UINT nDriveNumber, std::string& sSerialNumber) ; +static DWORD GetDiskVolumeSN( const wchar_t* wszDisk, std::string& sSerialNumber) ; +static DWORD GetPseudoRandomSN( std::string& sSerialNumber) ; + //------------------------------------------------------------------------------------ bool CalcMachineId( bool bForceNew) @@ -49,7 +58,7 @@ CalcMachineId( bool bForceNew) string sMachineId = sSN1 + "-" + sSN2 + "-" + sSN3 ; // salvo il MachineId nel registry - if ( ! MixMachineId( sMachineId)) + if ( ! MixLockId( sMachineId)) return false ; AddCrc32ToString( sMachineId) ; string sB64 ; @@ -70,8 +79,8 @@ GetMachineId( string& sMachineId) string sMacSN1, sMacSN2, sMacSN3 ; GetSN123FromMachine( sMacSN1, sMacSN2, sMacSN3) ; - // verifico che i primi due seriali coincidano, il terzo di macchina non conta - if ( sRegSN1 != sMacSN1 || sRegSN2 != sMacSN2) + // verifico che i primi due seriali coincidano e il terzo di registro esista (quello di macchina non conta) + if ( sRegSN1 != sMacSN1 || sRegSN2 != sMacSN2 || sRegSN3.empty()) return false ; // costruisco l'Id di macchina dai seriali @@ -84,70 +93,19 @@ GetMachineId( string& sMachineId) bool GetMachineId2( string& sMachineId) { - // recupero id in chiaro string sAux ; if ( ! GetMachineId( sAux)) return false ; - // eseguo Mix + CRC32 + Base64 - if ( ! MixMachineId( sAux)) + // Eseguo Mix + CRC32 + Base64. + // Equivale a ConvertLockIdToLockId2 ma non lo uso per evitare link a sw chiave. + if ( ! MixLockId( sAux)) return false ; AddCrc32ToString( sAux) ; return B64Encode( sAux, sMachineId) ; } //------------------------------------------------------------------------------------ -bool -GetMachineId3( string& sMachineId) -{ - // recupero id in chiaro - string sAux ; - if ( ! GetMachineId( sAux)) - return false ; - // eseguo Mix + Scramble + CRC32 + Base64 - if ( ! MixMachineId( sAux)) - return false ; - if ( ! ScrambleMachineId( sAux)) - return false ; - AddCrc32ToString( sAux) ; - return B64Encode( sAux, sMachineId) ; -} - -//------------------------------------------------------------------------------------ -bool -ConvertMachineId2ToMachineId( const string& sMachId2, string& sMachId) -{ - // eseguo decodifica da Base64 - if ( ! B64Decode( sMachId2, sMachId)) - return false ; - // eseguo test e rimozione CRC32 - if ( ! TestCrc32AndRemoveFromString( sMachId)) - return false ; - // eseguo demixing - if ( ! MixMachineId( sMachId)) - return false ; - return true ; -} - -//------------------------------------------------------------------------------------ -bool -ConvertMachineId2ToScramKey( const string& sMachId2, string& sScramKey) -{ - // eseguo decodifica da Base64 - if ( ! B64Decode( sMachId2, sScramKey)) - return false ; - // eseguo test e rimozione CRC32 - if ( ! TestCrc32AndRemoveFromString( sScramKey)) - return false ; - // eseguo scramble - if ( ! ScrambleMachineId( sScramKey)) - return false ; - // aggiungo CRC32 - AddCrc32ToString( sScramKey) ; - return true ; -} - -//------------------------------------------------------------------------------------ -bool +static bool GetSN123FromRegistry( string& sSN1, string& sSN2, string& sSN3) { // leggo MachineId da Registry @@ -155,8 +113,16 @@ GetSN123FromRegistry( string& sSN1, string& sSN2, string& sSN3) if ( ! LoadMachineIdFromReg( sRegOffMachId)) return false ; // converto da forma offuscata (2) in forma chiara + // Equivale a ConvertLockId2ToLockId ma non lo uso per evitare link a sw chiave. string sRegMachId ; - if ( ! ConvertMachineId2ToMachineId( sRegOffMachId, sRegMachId)) + // eseguo decodifica da Base64 + if ( ! B64Decode( sRegOffMachId, sRegMachId)) + return false ; + // eseguo test e rimozione CRC32 + if ( ! TestCrc32AndRemoveFromString( sRegMachId)) + return false ; + // eseguo demixing + if ( ! MixLockId( sRegMachId)) return false ; // divisione in seriali sSN1 = sRegMachId.substr( 0, 6) ; @@ -167,7 +133,7 @@ GetSN123FromRegistry( string& sSN1, string& sSN2, string& sSN3) } //------------------------------------------------------------------------------------ -bool +static bool GetSN123FromMachine( string& sSN1, string& sSN2, string& sSN3) { // recupero SN fisico del primo disco @@ -198,7 +164,7 @@ GetSN123FromMachine( string& sSN1, string& sSN2, string& sSN3) } //------------------------------------------------------------------------------------ -void +static void AdjustSN( const string& sSou, const char* szFill, string& sDest) { static const int LEN_REF = 6 ; @@ -212,7 +178,7 @@ AdjustSN( const string& sSou, const char* szFill, string& sDest) } //------------------------------------------------------------------------------------ -DWORD +static DWORD GetPhysicalDriveSN( UINT nDriveNumber, string& sSerialNumber) { DWORD dwRet = NO_ERROR ; @@ -282,7 +248,7 @@ GetPhysicalDriveSN( UINT nDriveNumber, string& sSerialNumber) } //----------------------------------------------------------------------------- -DWORD +static DWORD GetDiskVolumeSN( const wchar_t* wszDisk, string& sSerialNumber) { DWORD dwRet = NO_ERROR ; @@ -303,7 +269,7 @@ GetDiskVolumeSN( const wchar_t* wszDisk, string& sSerialNumber) } //----------------------------------------------------------------------------- -DWORD +static DWORD GetPseudoRandomSN( string& sSerialNumber) { sSerialNumber.clear() ; diff --git a/MachineId.h b/MachineId.h index babbe2f..422bee8 100644 --- a/MachineId.h +++ b/MachineId.h @@ -1,8 +1,8 @@ //---------------------------------------------------------------------------- -// EgalTech 2014-2014 +// EgalTech 2014-2015 //---------------------------------------------------------------------------- -// File : MachineId.cpp Data : 10.09.14 Versione : 1.5i2 -// Contenuto : Dichiarazione funzioni locali per gestione/calcolo Id macchina. +// File : MachineId.h Data : 28.07.15 Versione : 1.6g8 +// Contenuto : Dichiarazione funzioni locali per gestione Id macchina. // // // @@ -14,13 +14,6 @@ #pragma once #include -#include "/EgtDev/Include/SELkMachineId.h" - //------------------------------------------------------------------------------- -bool GetSN123FromRegistry( std::string& sSN1, std::string& sSN2, std::string& sSN3) ; -bool GetSN123FromMachine( std::string& sSN1, std::string& sSN2, std::string& sSN3) ; -void AdjustSN( const std::string& sSou, const char* szFill, std::string& sDest) ; -DWORD GetPhysicalDriveSN( UINT nDriveNumber, std::string& sSerialNumber) ; -DWORD GetDiskVolumeSN( const wchar_t* wszDisk, std::string& sSerialNumber) ; -DWORD GetPseudoRandomSN( std::string& sSerialNumber) ; +bool GetMachineId( std::string& sMachineId) ; diff --git a/Obfuscate.cpp b/Obfuscate.cpp index 574c25d..1baa33f 100644 --- a/Obfuscate.cpp +++ b/Obfuscate.cpp @@ -27,7 +27,7 @@ static char CharScramble( char cVal, char cOp) ; //---------------------------------------------------------------------------- bool -MixMachineId( string& sMachineId) +MixLockId( string& sMachineId) { // la stringa deve contenere 20 caratteri if ( sMachineId.length() != LEN) @@ -45,7 +45,7 @@ MixMachineId( string& sMachineId) //---------------------------------------------------------------------------- bool -ScrambleMachineId( string& sMachineId) +ScrambleLockId( string& sMachineId) { // la stringa deve contenere 20 caratteri if ( sMachineId.length() != LEN) diff --git a/Obfuscate.h b/Obfuscate.h index 2e9530f..66e53a9 100644 --- a/Obfuscate.h +++ b/Obfuscate.h @@ -16,7 +16,7 @@ #include //----------------------------------------------------------------------------- -bool MixMachineId( std::string& sMachineId) ; -bool ScrambleMachineId( std::string& sMachineId) ; +bool MixLockId( std::string& sMachineId) ; +bool ScrambleLockId( std::string& sMachineId) ; bool ScrambleData( std::string& sData, const std::string& sMask, const int nStep) ; bool UnScrambleData( std::string& sData, const std::string& sMask, const int nStep) ;