diff --git a/EExDllMain.h b/EExDllMain.h index 39ebfc1..fb77344 100644 --- a/EExDllMain.h +++ b/EExDllMain.h @@ -34,6 +34,8 @@ extern "C" { EEX_EXPORT void SetEExLogger( ILogger* pLogger) ; // imposta la chiave di protezione EEX_EXPORT void SetEExKey( const std::string& sKey) ; + // imposta se chiave hardware di rete + EEX_EXPORT void SetEExNetHwKey( bool bNetHwKey) ; } diff --git a/EGkDllMain.h b/EGkDllMain.h index 37466e5..75d321a 100644 --- a/EGkDllMain.h +++ b/EGkDllMain.h @@ -38,6 +38,8 @@ EGK_EXPORT void SetEGkLogger( ILogger* pLogger) ; EGK_EXPORT void SetEGkKey( const std::string& sKey) ; // imposta il tipo di chiave di protezione EGK_EXPORT void SetEGkKeyType( int nType) ; +// imposta se chiave hardware di rete +EGK_EXPORT void SetEGkNetHwKey( bool bNetHwKey) ; // permette di inizializzare il font manager EGK_EXPORT void InitFontManager( const std::string& sNfeFontDir, const std::string& sDefaultFont) ; // restituisce il direttorio dei font proprietari (Nfe) diff --git a/EGrDllMain.h b/EGrDllMain.h index 4b2ddf4..940873a 100644 --- a/EGrDllMain.h +++ b/EGrDllMain.h @@ -32,6 +32,8 @@ extern "C" { EGR_EXPORT void SetEGrLogger( ILogger* pLogger) ; // imposta la chiave di protezione EGR_EXPORT void SetEGrKey( const std::string& sKey) ; + // imposta se chiave hardware di rete + EGR_EXPORT void SetEGrNetHwKey( bool bNetHwKey) ; } diff --git a/EInAPI.h b/EInAPI.h index cf46222..cbd36f7 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -50,6 +50,7 @@ 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 EgtSetLockType( int nType) ; +EIN_EXPORT BOOL __stdcall EgtSetNetHwKey( BOOL bNetHwKey) ; EIN_EXPORT BOOL __stdcall EgtGetKeyLevel( int nProd, int nVer, int nLev, int* pnKLev) ; EIN_EXPORT BOOL __stdcall EgtGetKeyOptions( int nProd, int nVer, int nLev, unsigned int* pnOpt2) ; EIN_EXPORT BOOL __stdcall EgtGetKeyLeftDays( int* pnLeftDays) ; diff --git a/EMkDllMain.h b/EMkDllMain.h index eea5212..b845df3 100644 --- a/EMkDllMain.h +++ b/EMkDllMain.h @@ -34,6 +34,8 @@ extern "C" { EMK_EXPORT void SetEMkLogger( ILogger* pLogger) ; // imposta la chiave di protezione EMK_EXPORT void SetEMkKey( const std::string& sKey) ; + // imposta se chiave hardware di rete + EMK_EXPORT void SetEMkNetHwKey( bool bNetHwKey) ; } diff --git a/EXeExecutor.h b/EXeExecutor.h index da45afd..f5f933b 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -55,6 +55,7 @@ EXE_EXPORT bool ExeGetExecutableVersion( std::string& sVer) ; EXE_EXPORT bool ExeGetVersionInfo( std::string& sVer, const char* szNewLine) ; EXE_EXPORT bool ExeGetKeyInfo( std::string& sKey) ; EXE_EXPORT bool ExeSetLockType( int nType) ; +EXE_EXPORT bool ExeSetNetHwKey( bool bNetHwKey) ; EXE_EXPORT bool ExeGetKeyLevel( int nProd, int nVer, int nLev, int& nKLev) ; EXE_EXPORT bool ExeGetKeyOptions( int nProd, int nVer, int nLev, unsigned int& nOpt2) ; EXE_EXPORT bool ExeGetKeyLeftDays( int& nLeftDays) ; diff --git a/SELkLockId.h b/SELkLockId.h index 50c6c49..d0111c4 100644 --- a/SELkLockId.h +++ b/SELkLockId.h @@ -1,13 +1,13 @@ //---------------------------------------------------------------------------- -// EgalTech 2014-2015 +// EgalTech 2014-2022 //---------------------------------------------------------------------------- -// File : SELkLockId.cpp Data : 27.07.15 Versione : 1.6g8 +// File : SELkLockId.cpp Data : 16.05.22 Versione : 2.4e3 // Contenuto : Dichiarazione funzioni per gestione/calcolo Id protezione, // da macchina o da chiave hardware. // // // Modifiche : 10.09.14 DS Creazione modulo. -// +// 16.05.22 DS Aggiunta gestione chiave di rete. // //---------------------------------------------------------------------------- @@ -18,6 +18,8 @@ //------------------------------------------------------------------------------- // Imposto il tipo di protezione bool SetLockType( int nType) ; +// Forzo chiave di rete (se prevista protezione hardware) +bool SetNetHwKey( bool bNetHwKey) ; // Recupero l'identificativo in chiaro della protezione bool GetLockId( std::string& sLockId) ; // Recupero l'identificativo cifrato della protezione @@ -27,7 +29,7 @@ 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) ; -// Serial Number della chiave hw +// Serial Number della chiave hw (non di rete) bool GetLockSN( int& nLockSN) ; //-------------------------- Constants ----------------------------------------