Migrating the (performance) testing tool to SDK v2
diff --git a/src/crypto/big.c b/src/crypto/big.c
index fdc721f..6877522 100644
--- a/src/crypto/big.c
+++ b/src/crypto/big.c
@@ -101,7 +101,7 @@
{
BIG_copy(b,a);
BIG_shr(b,i*4);
- printf("%01x",b[0]&15);
+ printf("%01x",(unsigned int)(b[0]&15));
}
}
@@ -111,8 +111,8 @@
int i;
printf("(");
for (i=0;i<NLEN-1;i++)
- printf("%llx,",a[i]);
- printf("%llx)",a[NLEN-1]);
+ printf("%ldx,",a[i]);
+ printf("%ldx)",a[NLEN-1]);
}
/* Swap a and b if d=1 */
@@ -192,7 +192,7 @@
{
BIG_dcopy(b,a);
BIG_dshr(b,i*4);
- printf("%01x",b[0]&15);
+ printf("%01x",(unsigned int)(b[0]&15));
}
}
diff --git a/src/mpin_crypto_non_tee.cpp b/src/mpin_crypto_non_tee.cpp
index 3983762..23e2e07 100644
--- a/src/mpin_crypto_non_tee.cpp
+++ b/src/mpin_crypto_non_tee.cpp
@@ -493,7 +493,7 @@
FILE *fp = fopen("/dev/urandom", "rb");
if(fp != NULL)
{
- fread(buf, 1, len, fp);
+ size_t rc = fread(buf, 1, len, fp);
fclose(fp);
}
#else
diff --git a/tests/linux/MPinClient/MpinClient.cpp b/tests/linux/MPinClient/MpinClient.cpp
index 2b8df79..bda5a34 100644
--- a/tests/linux/MPinClient/MpinClient.cpp
+++ b/tests/linux/MPinClient/MpinClient.cpp
@@ -79,7 +79,7 @@
CMpinClient::CMpinClient( int aClientId, const String& aBackendUrl, const String& aUserId ) :
m_bInitialized(false), m_id(aClientId), m_userId(aUserId),
m_storageSecure( String().Format("sec-%d", aClientId) ), m_storageNonSecure( String().Format("%d", aClientId) ),
- m_context( String().Format("%d",aClientId), &m_storageSecure, &m_storageNonSecure, &m_pinPad ),
+ m_context( String().Format("%d",aClientId), &m_storageSecure, &m_storageNonSecure ),
m_thread(aUserId), m_queue(aUserId.c_str()), m_bIdle(false), m_bStatsEnabled(true)
{
std::ifstream filePin( String().Format("pin-%d", m_id).c_str() );
@@ -92,7 +92,7 @@
CMpinClient::CMpinClient( int aClientId, const String& aBackendUrl, const String& aUserId, const String& aPinGood, const String& aPinBad ) :
m_bInitialized(false), m_id(aClientId), m_userId(aUserId), m_pinGood(aPinGood), m_pinBad(aPinBad),
m_storageSecure( String().Format("sec-%d", aClientId) ), m_storageNonSecure( String().Format("%d", aClientId) ),
- m_context( String().Format("%d",aClientId), &m_storageSecure, &m_storageNonSecure, &m_pinPad ),
+ m_context( String().Format("%d",aClientId), &m_storageSecure, &m_storageNonSecure ),
m_thread(aUserId), m_queue(aUserId.c_str()), m_bIdle(false), m_bStatsEnabled(true)
{
std::ofstream filePin( String().Format("pin-%d", m_id).c_str() );
@@ -171,8 +171,6 @@
MPinSDK::UserPtr user = m_sdk.MakeNewUser( m_userId, String().Format( "M-Pin Test Client #%d", m_id ) );
- m_pinPad.SetPin( m_pinGood );
-
TimeSpec now;
GetCurrentTime(now);
Millisecs startTime = now.ToMillisecs();
@@ -197,7 +195,7 @@
CvShared::SleepFor( CvShared::Seconds(10) );
- status = m_sdk.FinishRegistration( user );
+ status = m_sdk.ConfirmRegistration( user );
if ( status == MPinSDK::Status::OK )
{
@@ -207,7 +205,7 @@
if ( status != MPinSDK::Status::IDENTITY_NOT_VERIFIED )
{
- LogMessage( enLogLevel_Error, "Failed in FinishRegistration(): %s [%d]", status.GetErrorMessage().c_str(), status.GetStatusCode() );
+ LogMessage( enLogLevel_Error, "Failed in ConfirmRegistration(): %s [%d]", status.GetErrorMessage().c_str(), status.GetStatusCode() );
if ( m_bStatsEnabled )
{
++m_stats.m_numOfErrors;
@@ -220,11 +218,11 @@
{
LogMessage( enLogLevel_Info, "User [%s] has been force-activated", user->GetId().c_str() );
- status = m_sdk.FinishRegistration( user );
+ status = m_sdk.ConfirmRegistration( user );
if ( status != MPinSDK::Status::OK )
{
- LogMessage( enLogLevel_Error, "Failed in FinishRegistration(): %s [%d]", status.GetErrorMessage().c_str(), status.GetStatusCode() );
+ LogMessage( enLogLevel_Error, "Failed in ConfirmRegistration(): %s [%d]", status.GetErrorMessage().c_str(), status.GetStatusCode() );
if ( m_bStatsEnabled )
{
++m_stats.m_numOfErrors;
@@ -233,6 +231,18 @@
}
}
+ status = m_sdk.FinishRegistration( user, m_pinGood );
+
+ if ( status != MPinSDK::Status::OK )
+ {
+ LogMessage( enLogLevel_Error, "Failed in FinishRegistration(): %s [%d]", status.GetErrorMessage().c_str(), status.GetStatusCode() );
+ if ( m_bStatsEnabled )
+ {
+ ++m_stats.m_numOfErrors;
+ }
+ return false;
+ }
+
GetCurrentTime(now);
if ( m_bStatsEnabled )
@@ -284,8 +294,6 @@
MPinSDK::UserPtr user = *itr;
- m_pinPad.SetPin( aPin );
-
if ( aPin == m_pinGood )
{
LogMessage( enLogLevel_Info, "Authenticating user [%s] with correct PIN...", user->GetId().c_str() );
@@ -299,7 +307,19 @@
GetCurrentTime(now);
Millisecs startTime = now.ToMillisecs();
- MPinSDK::Status status = m_sdk.Authenticate( user );
+ MPinSDK::Status status = m_sdk.StartAuthentication( user );
+
+ if ( status != MPinSDK::Status::OK )
+ {
+ LogMessage( enLogLevel_Error, "Failed in StartAuthentication(): %s [%d]", status.GetErrorMessage().c_str(), status.GetStatusCode() );
+ if ( m_bStatsEnabled )
+ {
+ ++m_stats.m_numOfErrors;
+ }
+ return false;
+ }
+
+ status = m_sdk.FinishAuthentication( user, aPin );
if ( aPin == m_pinGood )
{
diff --git a/tests/linux/MPinClient/MpinClient.h b/tests/linux/MPinClient/MpinClient.h
index 5887235..c5f55ce 100644
--- a/tests/linux/MPinClient/MpinClient.h
+++ b/tests/linux/MPinClient/MpinClient.h
@@ -29,7 +29,6 @@
typedef MPinSDK::StringMap StringMap;
class CStorage;
-class CPinPad;
class CContext;
class CMpinClient
@@ -87,24 +86,11 @@
String m_errorMsg;
};
- class CPinPad : public MPinSDK::IPinPad
- {
- public:
- CPinPad() {}
- virtual ~CPinPad() {}
- virtual String Show(MPinSDK::UserPtr user, Mode mode) { return m_pin; }
-
- void SetPin( const String& aPin ) { m_pin = aPin; }
-
- private:
- String m_pin;
- };
-
class CContext : public MPinSDK::IContext
{
public:
- CContext( const String& aId, CStorage* apStorageSecure, CStorage* apStorageNonSecure, CPinPad* apPinPad ) :
- m_id(aId), m_pStorageSecure(apStorageSecure), m_pStorageNonSecure(apStorageNonSecure), m_pPinPad(apPinPad)
+ CContext( const String& aId, CStorage* apStorageSecure, CStorage* apStorageNonSecure ) :
+ m_id(aId), m_pStorageSecure(apStorageSecure), m_pStorageNonSecure(apStorageNonSecure)
{}
virtual ~CContext() {}
@@ -112,14 +98,12 @@
virtual MPinSDK::IHttpRequest* CreateHttpRequest() const;
virtual void ReleaseHttpRequest( IN MPinSDK::IHttpRequest *request ) const { delete request; }
virtual MPinSDK::IStorage* GetStorage( MPinSDK::IStorage::Type type ) const { return (type == MPinSDK::IStorage::SECURE) ? m_pStorageSecure : m_pStorageNonSecure; }
- virtual MPinSDK::IPinPad* GetPinPad() const { return m_pPinPad; }
virtual MPinSDK::CryptoType GetMPinCryptoType() const { return MPinSDK::CRYPTO_NON_TEE; }
private:
String m_id;
CStorage* m_pStorageSecure;
CStorage* m_pStorageNonSecure;
- CPinPad* m_pPinPad;
};
CMpinClient(const CMpinClient& orig);
@@ -134,7 +118,6 @@
MPinSDK m_sdk;
CStorage m_storageSecure;
CStorage m_storageNonSecure;
- CPinPad m_pinPad;
CContext m_context;
bool m_bInitialized;
diff --git a/tests/linux/MPinClient/main.cpp b/tests/linux/MPinClient/main.cpp
index edd8d44..5c0c979 100644
--- a/tests/linux/MPinClient/main.cpp
+++ b/tests/linux/MPinClient/main.cpp
@@ -33,15 +33,15 @@
typedef MPinSDK::String String;
typedef MPinSDK::StringMap StringMap;
-void PrintUsage( const char* aExeName, const char* aMessage = NULL )
+void PrintUsage(const char* aExeName, const char* aMessage = NULL)
{
- printf( "\n" );
- if ( aMessage != NULL )
+ printf("\n");
+ if (aMessage != NULL)
{
- printf( "%s\n", aMessage );
+ printf("%s\n", aMessage);
}
- printf( "Usage: %s --reg --auth -n <num-of-clients> -r <requests-per-second> [-u <user-prefix> -t <timeout-sec> -c <count>] -b <backend-url>\n", aExeName );
- printf( "\n" );
+ printf("Usage: %s --reg --auth -n <num-of-clients> -r <requests-per-second> [-u <user-prefix> -t <timeout-sec> -c <count>] -b <backend-url>\n", aExeName);
+ printf("\n");
}
struct sParams
@@ -50,7 +50,7 @@
bRegister(false), bAuthenticate(false), numOfClients(0), requestsPerSecond(0),
count(1), userPrefix("test"), timeout(30)
{}
-
+
bool bRegister;
bool bAuthenticate;
uint32_t numOfClients;
@@ -61,286 +61,294 @@
Seconds timeout;
};
-bool doargs( int argc,char **argv, OUT sParams& aParams )
+bool doargs(int argc, char **argv, OUT sParams& aParams)
{
- char ch;
+ char ch;
- if ( argc == 1 )
+ if (argc == 1)
{
- PrintUsage( argv[0] );
+ PrintUsage(argv[0]);
return false;
- }
+ }
aParams.bRegister = false;
aParams.bAuthenticate = false;
-
+
static struct option long_options[] = {
- { "reg", no_argument, NULL, 1 },
- { "auth", no_argument, NULL, 2 },
- { 0, 0, 0, 0 }
+ { "reg", no_argument, NULL, 1},
+ { "auth", no_argument, NULL, 2},
+ { 0, 0, 0, 0}
};
int option_index = 0;
-
- while ( (ch = getopt_long(argc,argv,"n:r:b:u:t:c:",long_options,&option_index) ) > 0 )
+
+ while ((ch = getopt_long(argc, argv, "n:r:b:u:t:c:", long_options, &option_index)) > 0)
{
switch (ch)
{
- case 'n': aParams.numOfClients = atoi(optarg); break;
- case 'r': aParams.requestsPerSecond = atoi(optarg); break;
- case 'b': aParams.backendUrl = optarg; break;
- case 'u': aParams.userPrefix = optarg; break;
- case 't': aParams.timeout = atoi(optarg); break;
- case 'c': aParams.count = atoi(optarg); break;
- case 1: aParams.bRegister = true; break;
- case 2: aParams.bAuthenticate = true; break;
+ case 'n': aParams.numOfClients = atoi(optarg);
+ break;
+ case 'r': aParams.requestsPerSecond = atoi(optarg);
+ break;
+ case 'b': aParams.backendUrl = optarg;
+ break;
+ case 'u': aParams.userPrefix = optarg;
+ break;
+ case 't': aParams.timeout = atoi(optarg);
+ break;
+ case 'c': aParams.count = atoi(optarg);
+ break;
+ case 1: aParams.bRegister = true;
+ break;
+ case 2: aParams.bAuthenticate = true;
+ break;
}
- }
+ }
return true;
}
-bool SleepRandTime( uint32_t aRequestsPerSecond )
+bool SleepRandTime(uint32_t aRequestsPerSecond)
{
- Millisecs time2wait( Seconds(1).ToMillisecs()/aRequestsPerSecond );
+ Millisecs time2wait(Seconds(1).ToMillisecs() / aRequestsPerSecond);
- int randFactor = (rand() * time2wait.Value())/RAND_MAX - time2wait.Value()/2; // -0.5*time2wait ... +0.5time2wait
+ int randFactor = (rand() * time2wait.Value()) / RAND_MAX - time2wait.Value() / 2; // -0.5*time2wait ... +0.5time2wait
- Millisecs randTime2wait( time2wait.Value() + randFactor );
+ Millisecs randTime2wait(time2wait.Value() + randFactor);
- LogMessage( enLogLevel_Info, "Waiting [%ld msec] before next request", randTime2wait.Value() );
+ LogMessage(enLogLevel_Info, "Waiting [%ld msec] before next request", randTime2wait.Value());
- return SleepFor( randTime2wait );
+ return SleepFor(randTime2wait);
}
-void WaitAllDone( std::list<CMpinClient*> aListClients, const Seconds aTimeout )
+void WaitAllDone(std::list<CMpinClient*> aListClients, const Seconds aTimeout)
{
CvShared::TimeValue_t i = 0;
size_t notDone = aListClients.size();
CvShared::TimeValue_t limit = aTimeout.ToMillisecs();
- while ( notDone > 0 && i < limit )
+ while (notDone > 0 && i < limit)
{
- notDone = 0;
- Millisecs time2wait = Seconds(1);
+ notDone = 0;
+ Millisecs time2wait = Seconds(1);
i += time2wait.Value();
-
+
std::list<CMpinClient*>::iterator itr = aListClients.begin();
- for( ; itr != aListClients.end(); ++itr )
+ for (; itr != aListClients.end(); ++itr)
{
CMpinClient* pClient = *itr;
-
- if ( !pClient->Done() )
+
+ if (!pClient->Done())
{
++notDone;
- if ( i >= limit )
+ if (i >= limit)
{
- printf( "Clients #%d for [%s] is not done yet. Tired waiting...\n", pClient->GetId(), pClient->GetUserId().c_str() );
- LogMessage( enLogLevel_Warning, "Clients #%d for [%s] is not done yet. Tired waiting...", pClient->GetId(), pClient->GetUserId().c_str() );
+ printf("Clients #%d for [%s] is not done yet. Tired waiting...\n", pClient->GetId(), pClient->GetUserId().c_str());
+ LogMessage(enLogLevel_Warning, "Clients #%d for [%s] is not done yet. Tired waiting...", pClient->GetId(), pClient->GetUserId().c_str());
}
}
}
-
- if ( notDone > 0 && i < limit )
+
+ if (notDone > 0 && i < limit)
{
- printf( "Waiting for clients to finish (%ld/%ld). %ld out of %ld not done yet...\n", Millisecs(i).ToSeconds(), Millisecs(limit).ToSeconds(),
- notDone, aListClients.size() );
- SleepFor( time2wait );
+ printf("Waiting for clients to finish (%ld/%ld). %ld out of %ld not done yet...\n", Millisecs(i).ToSeconds(), Millisecs(limit).ToSeconds(),
+ notDone, aListClients.size());
+ SleepFor(time2wait);
}
}
}
int main(int argc, char** argv)
{
- InitLogger( argv[0], enLogLevel_Info );
- LogMessage( enLogLevel_Info, "========== Starting M-Pin Client Test ==========" );
-
+ InitLogger(argv[0], enLogLevel_Info);
+ LogMessage(enLogLevel_Info, "========== Starting M-Pin Client Test ==========");
+
sParams params;
-
- if ( !doargs( argc, argv, params ) )
+
+ if (!doargs(argc, argv, params))
{
return 102;
}
- if ( params.numOfClients == 0 )
+ if (params.numOfClients == 0)
{
- PrintUsage( argv[0], "Missing parameter: -n <num-of-clients>" );
+ PrintUsage(argv[0], "Missing parameter: -n <num-of-clients>");
return -1;
}
- if ( params.requestsPerSecond == 0 )
+ if (params.requestsPerSecond == 0)
{
- PrintUsage( argv[0], "Missing parameter: -r <requests-per-second>" );
+ PrintUsage(argv[0], "Missing parameter: -r <requests-per-second>");
return -1;
}
-
- if ( params.backendUrl.empty() )
+
+ if (params.backendUrl.empty())
{
- PrintUsage( argv[0], "Missing parameter: -b <backend-url>" );
+ PrintUsage(argv[0], "Missing parameter: -b <backend-url>");
return -1;
}
-
+
CvHttpRequest::COpenSslMt sslMtLock;
-
+
srand(time(NULL));
-
+
std::list<CMpinClient*> listClients;
-
- for ( int i = 0; i < params.numOfClients; ++i )
+
+ for (int i = 0; i < params.numOfClients; ++i)
{
::String userId;
- userId.Format("%s%d@dispostable.com", params.userPrefix.c_str(), i+1);
+ userId.Format("%s%d@dispostable.com", params.userPrefix.c_str(), i + 1);
CMpinClient* pClient = NULL;
-
+
if (params.bRegister)
{
- ::String pinGood; pinGood.Format("%04d", rand()%10000 );
- ::String pinBad; pinBad.Format("%04d", rand()%10000 );
+ ::String pinGood; pinGood.Format("%04d", rand() % 10000);
+ ::String pinBad; pinBad.Format("%04d", rand() % 10000);
- while( pinBad == pinGood )
+ while (pinBad == pinGood)
{
- pinBad.Format("%04d", rand()%10000 );
+ pinBad.Format("%04d", rand() % 10000);
}
- pClient = new CMpinClient( i+1, params.backendUrl, userId, pinGood, pinBad );
+ pClient = new CMpinClient(i + 1, params.backendUrl, userId, pinGood, pinBad);
}
else
{
- pClient = new CMpinClient( i+1, params.backendUrl, userId );
+ pClient = new CMpinClient(i + 1, params.backendUrl, userId);
}
-
- listClients.push_back( pClient );
+
+ listClients.push_back(pClient);
}
-
+
std::list<CMpinClient*>::iterator itr;
-
- for ( int j = 0; j < params.count; ++j )
+
+ for (int j = 0; j < params.count; ++j)
{
if (params.bRegister)
{
- for( itr = listClients.begin(); itr != listClients.end(); ++itr )
+ for (itr = listClients.begin(); itr != listClients.end(); ++itr)
{
CMpinClient* pClient = *itr;
- if ( itr != listClients.begin() )
+ if (itr != listClients.begin())
{
- SleepRandTime( params.requestsPerSecond );
+ SleepRandTime(params.requestsPerSecond);
}
pClient->Register();
}
}
-
- // SleepFor( Seconds(5) );
- // printf( "Hit any key to continue with authentication..." );
- // getchar();
-
+
+ // SleepFor( Seconds(5) );
+ // printf( "Hit any key to continue with authentication..." );
+ // getchar();
+
if (params.bAuthenticate)
{
//First Authentication will retrieve Time Permits, while the second will work with cached ones.
- // for (int i = 0; i < 2; ++i)
- // {
- for( itr = listClients.begin(); itr != listClients.end(); ++itr )
+// for (int i = 0; i < 2; ++i)
+// {
+ for (itr = listClients.begin(); itr != listClients.end(); ++itr)
+ {
+ CMpinClient* pClient = *itr;
+
+ // pClient->EnableStats(i>0);
+
+ if (itr != listClients.begin())
{
- CMpinClient* pClient = *itr;
-
- // pClient->EnableStats(i>0);
-
- if ( itr != listClients.begin() )
- {
- SleepRandTime( params.requestsPerSecond );
- }
-
- bool bAuthBad = ( (rand()%10) == 0 );
-
- if ( bAuthBad )
- pClient->AuthenticateBad();
- else
- pClient->AuthenticateGood();
+ SleepRandTime(params.requestsPerSecond);
}
-
- // if ( i == 0 )
- // {
- // WaitAllDone( listClients );
- // printf( "Hit any key to continue with authentication..." );
- //
- // getchar();
- // }
- // }
+
+ bool bAuthBad = ((rand() % 10) == 0);
+
+ if (bAuthBad)
+ pClient->AuthenticateBad();
+ else
+ pClient->AuthenticateGood();
+ }
+
+// if ( i == 0 )
+// {
+// WaitAllDone( listClients );
+// printf( "Hit any key to continue with authentication..." );
+//
+// getchar();
+// }
+// }
}
}
-
- SleepFor( Seconds(5) );
- WaitAllDone( listClients, 30 + params.count*10 );
-
- printf( "==============================================================================================\n" );
- printf( "Client ID | User ID | # Errors | # Regs | Min.Reg.Time | Max.Reg.Time | Avg.Reg.Time | # Auths | Min.Auth.Time | Max.Auth.Time | Avg.Auth.Time (all times in are in msec)\n" );
- printf( "----------------------------------------------------------------------------------------------\n" );
+
+ SleepFor(Seconds(5));
+ WaitAllDone(listClients, 30 + params.count * 10);
+
+ printf("==============================================================================================\n");
+ printf("Client ID | User ID | # Errors | # Regs | Min.Reg.Time | Max.Reg.Time | Avg.Reg.Time | # Auths | Min.Auth.Time | Max.Auth.Time | Avg.Auth.Time (all times in are in msec)\n");
+ printf("----------------------------------------------------------------------------------------------\n");
CMpinClient::sStats_t total;
-
- for( itr = listClients.begin(); itr != listClients.end(); ++itr )
+
+ for (itr = listClients.begin(); itr != listClients.end(); ++itr)
{
CMpinClient* pClient = *itr;
const CMpinClient::sStats_t& stats = pClient->GetStats();
- printf( " #%d | %s | %d | %d | %d | %d | %d | %d | %d | %d | %d\n",
+ printf(" #%d | %s | %d | %d | %d | %d | %d | %d | %d | %d | %d\n",
pClient->GetId(), pClient->GetUserId().c_str(), stats.m_numOfErrors,
stats.m_numOfReg, stats.m_minRegMsec, stats.m_maxRegMsec, stats.m_avgRegMsec,
- stats.m_numOfAuth, stats.m_minAuthMsec, stats.m_maxAuthMsec, stats.m_avgAuthMsec );
-
+ stats.m_numOfAuth, stats.m_minAuthMsec, stats.m_maxAuthMsec, stats.m_avgAuthMsec);
+
total.m_numOfErrors += stats.m_numOfErrors;
-
- if ( stats.m_numOfErrors == 0 )
+
+ if (stats.m_numOfErrors == 0)
{
- if ( stats.m_numOfReg > 0 )
+ if (stats.m_numOfReg > 0)
{
- total.m_avgRegMsec = ( total.m_avgRegMsec*total.m_numOfReg + stats.m_avgRegMsec*stats.m_numOfReg ) / ( total.m_numOfReg + stats.m_numOfReg );
+ total.m_avgRegMsec = (total.m_avgRegMsec * total.m_numOfReg + stats.m_avgRegMsec * stats.m_numOfReg) / (total.m_numOfReg + stats.m_numOfReg);
total.m_numOfReg += stats.m_numOfReg;
}
-
- if ( stats.m_numOfAuth > 0 )
+
+ if (stats.m_numOfAuth > 0)
{
- total.m_avgAuthMsec = ( total.m_avgAuthMsec*total.m_numOfAuth + stats.m_avgAuthMsec*stats.m_numOfAuth ) / ( total.m_numOfAuth + stats.m_numOfAuth );
+ total.m_avgAuthMsec = (total.m_avgAuthMsec * total.m_numOfAuth + stats.m_avgAuthMsec * stats.m_numOfAuth) / (total.m_numOfAuth + stats.m_numOfAuth);
total.m_numOfAuth += stats.m_numOfAuth;
}
}
-
- if ( stats.m_minRegMsec < total.m_minRegMsec || total.m_minRegMsec == 0 )
+
+ if (stats.m_minRegMsec < total.m_minRegMsec || total.m_minRegMsec == 0)
total.m_minRegMsec = stats.m_minRegMsec;
- if ( stats.m_maxRegMsec > total.m_maxRegMsec )
+ if (stats.m_maxRegMsec > total.m_maxRegMsec)
total.m_maxRegMsec = stats.m_maxRegMsec;
- if ( stats.m_minAuthMsec < total.m_minAuthMsec || total.m_minAuthMsec == 0 )
+ if (stats.m_minAuthMsec < total.m_minAuthMsec || total.m_minAuthMsec == 0)
total.m_minAuthMsec = stats.m_minAuthMsec;
- if ( stats.m_maxAuthMsec > total.m_maxAuthMsec )
+ if (stats.m_maxAuthMsec > total.m_maxAuthMsec)
total.m_maxAuthMsec = stats.m_maxAuthMsec;
}
-
- printf( " TOTAL: ======================================================================================\n" );
- printf( " # Errors | # Regs | Min.Reg.Time | Max.Reg.Time | Avg.Reg.Time | # Auths | Min.Auth.Time | Max.Auth.Time | Avg.Auth.Time (all times in are in msec)\n" );
- printf( "----------------------------------------------------------------------------------------------\n" );
- printf( " %d | %d | %d | %d | %d | %d | %d | %d | %d\n", total.m_numOfErrors,
+
+ printf(" TOTAL: ======================================================================================\n");
+ printf(" # Errors | # Regs | Min.Reg.Time | Max.Reg.Time | Avg.Reg.Time | # Auths | Min.Auth.Time | Max.Auth.Time | Avg.Auth.Time (all times in are in msec)\n");
+ printf("----------------------------------------------------------------------------------------------\n");
+ printf(" %d | %d | %d | %d | %d | %d | %d | %d | %d\n", total.m_numOfErrors,
total.m_numOfReg, total.m_minRegMsec, total.m_maxRegMsec, total.m_avgRegMsec,
- total.m_numOfAuth, total.m_minAuthMsec, total.m_maxAuthMsec, total.m_avgAuthMsec );
- printf( "==============================================================================================\n" );
-
- printf( "Terminating clients...\n" );
-
- for( itr = listClients.begin(); itr != listClients.end(); ++itr )
+ total.m_numOfAuth, total.m_minAuthMsec, total.m_maxAuthMsec, total.m_avgAuthMsec);
+ printf("==============================================================================================\n");
+
+ printf("Terminating clients...\n");
+
+ for (itr = listClients.begin(); itr != listClients.end(); ++itr)
{
CMpinClient* pClient = *itr;
-
+
delete pClient;
}
- if ( total.m_numOfErrors > 0 )
+ if (total.m_numOfErrors > 0)
{
- printf( "Exiting with %d errors :(\n", total.m_numOfErrors );
+ printf("Exiting with %d errors :(\n", total.m_numOfErrors);
}
else
{
- printf( "Exiting without errors :)\n" );
+ printf("Exiting without errors :)\n");
}
-
- LogMessage( enLogLevel_Info, "========== M-Pin Test Client Done ==========" );
-
- return ( total.m_numOfErrors > 0 ) ? -1 : 0;
+
+ LogMessage(enLogLevel_Info, "========== M-Pin Test Client Done ==========");
+
+ return ( total.m_numOfErrors > 0) ? -1 : 0;
}
diff --git a/tests/linux/MPinClient/nbproject/Makefile-Debug.mk b/tests/linux/MPinClient/nbproject/Makefile-Debug.mk
index 3976a07..071110c 100644
--- a/tests/linux/MPinClient/nbproject/Makefile-Debug.mk
+++ b/tests/linux/MPinClient/nbproject/Makefile-Debug.mk
@@ -42,26 +42,26 @@
${OBJECTDIR}/_ext/580510450/CvMutex.o \
${OBJECTDIR}/_ext/580510450/CvSemaphore.o \
${OBJECTDIR}/_ext/580510450/CvThread.o \
- ${OBJECTDIR}/_ext/1341795113/aes.o \
- ${OBJECTDIR}/_ext/1341795113/big.o \
- ${OBJECTDIR}/_ext/1341795113/ecp.o \
- ${OBJECTDIR}/_ext/1341795113/ecp2.o \
- ${OBJECTDIR}/_ext/1341795113/ff.o \
- ${OBJECTDIR}/_ext/1341795113/fp.o \
- ${OBJECTDIR}/_ext/1341795113/fp12.o \
- ${OBJECTDIR}/_ext/1341795113/fp2.o \
- ${OBJECTDIR}/_ext/1341795113/fp4.o \
- ${OBJECTDIR}/_ext/1341795113/gcm.o \
- ${OBJECTDIR}/_ext/1341795113/hash.o \
- ${OBJECTDIR}/_ext/1341795113/mpin.o \
- ${OBJECTDIR}/_ext/1341795113/oct.o \
- ${OBJECTDIR}/_ext/1341795113/pair.o \
- ${OBJECTDIR}/_ext/1341795113/rand.o \
- ${OBJECTDIR}/_ext/1341795113/rom.o \
- ${OBJECTDIR}/_ext/1341795113/version.o \
- ${OBJECTDIR}/_ext/608447161/mpin_crypto_non_tee.o \
- ${OBJECTDIR}/_ext/608447161/mpin_sdk.o \
- ${OBJECTDIR}/_ext/608447161/utils.o \
+ ${OBJECTDIR}/_ext/605162843/aes.o \
+ ${OBJECTDIR}/_ext/605162843/big.o \
+ ${OBJECTDIR}/_ext/605162843/ecp.o \
+ ${OBJECTDIR}/_ext/605162843/ecp2.o \
+ ${OBJECTDIR}/_ext/605162843/ff.o \
+ ${OBJECTDIR}/_ext/605162843/fp.o \
+ ${OBJECTDIR}/_ext/605162843/fp12.o \
+ ${OBJECTDIR}/_ext/605162843/fp2.o \
+ ${OBJECTDIR}/_ext/605162843/fp4.o \
+ ${OBJECTDIR}/_ext/605162843/gcm.o \
+ ${OBJECTDIR}/_ext/605162843/hash.o \
+ ${OBJECTDIR}/_ext/605162843/mpin.o \
+ ${OBJECTDIR}/_ext/605162843/oct.o \
+ ${OBJECTDIR}/_ext/605162843/pair.o \
+ ${OBJECTDIR}/_ext/605162843/rand.o \
+ ${OBJECTDIR}/_ext/605162843/rom.o \
+ ${OBJECTDIR}/_ext/605162843/version.o \
+ ${OBJECTDIR}/_ext/1386528437/mpin_crypto_non_tee.o \
+ ${OBJECTDIR}/_ext/1386528437/mpin_sdk.o \
+ ${OBJECTDIR}/_ext/1386528437/utils.o \
${OBJECTDIR}/HttpRequest.o \
${OBJECTDIR}/MpinClient.o \
${OBJECTDIR}/main.o
@@ -94,152 +94,152 @@
${OBJECTDIR}/_ext/620013993/CvString.o: ../../../ext/cvshared/cpp/CvString.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/620013993
${RM} "$@.d"
- $(COMPILE.cc) -g -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/620013993/CvString.o ../../../ext/cvshared/cpp/CvString.cpp
+ $(COMPILE.cc) -g -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/620013993/CvString.o ../../../ext/cvshared/cpp/CvString.cpp
${OBJECTDIR}/_ext/620013993/CvXcode.o: ../../../ext/cvshared/cpp/CvXcode.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/620013993
${RM} "$@.d"
- $(COMPILE.cc) -g -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/620013993/CvXcode.o ../../../ext/cvshared/cpp/CvXcode.cpp
+ $(COMPILE.cc) -g -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/620013993/CvXcode.o ../../../ext/cvshared/cpp/CvXcode.cpp
${OBJECTDIR}/_ext/580510450/CvHttpRequest.o: ../../../ext/cvshared/cpp/linux/CvHttpRequest.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/580510450
${RM} "$@.d"
- $(COMPILE.cc) -g -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvHttpRequest.o ../../../ext/cvshared/cpp/linux/CvHttpRequest.cpp
+ $(COMPILE.cc) -g -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvHttpRequest.o ../../../ext/cvshared/cpp/linux/CvHttpRequest.cpp
${OBJECTDIR}/_ext/580510450/CvLogger.o: ../../../ext/cvshared/cpp/linux/CvLogger.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/580510450
${RM} "$@.d"
- $(COMPILE.cc) -g -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvLogger.o ../../../ext/cvshared/cpp/linux/CvLogger.cpp
+ $(COMPILE.cc) -g -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvLogger.o ../../../ext/cvshared/cpp/linux/CvLogger.cpp
${OBJECTDIR}/_ext/580510450/CvMutex.o: ../../../ext/cvshared/cpp/linux/CvMutex.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/580510450
${RM} "$@.d"
- $(COMPILE.cc) -g -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvMutex.o ../../../ext/cvshared/cpp/linux/CvMutex.cpp
+ $(COMPILE.cc) -g -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvMutex.o ../../../ext/cvshared/cpp/linux/CvMutex.cpp
${OBJECTDIR}/_ext/580510450/CvSemaphore.o: ../../../ext/cvshared/cpp/linux/CvSemaphore.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/580510450
${RM} "$@.d"
- $(COMPILE.cc) -g -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvSemaphore.o ../../../ext/cvshared/cpp/linux/CvSemaphore.cpp
+ $(COMPILE.cc) -g -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvSemaphore.o ../../../ext/cvshared/cpp/linux/CvSemaphore.cpp
${OBJECTDIR}/_ext/580510450/CvThread.o: ../../../ext/cvshared/cpp/linux/CvThread.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/580510450
${RM} "$@.d"
- $(COMPILE.cc) -g -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvThread.o ../../../ext/cvshared/cpp/linux/CvThread.cpp
+ $(COMPILE.cc) -g -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvThread.o ../../../ext/cvshared/cpp/linux/CvThread.cpp
-${OBJECTDIR}/_ext/1341795113/aes.o: ../../../src/core/crypto/aes.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/aes.o: ../../../src/crypto/aes.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/aes.o ../../../src/core/crypto/aes.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/aes.o ../../../src/crypto/aes.c
-${OBJECTDIR}/_ext/1341795113/big.o: ../../../src/core/crypto/big.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/big.o: ../../../src/crypto/big.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/big.o ../../../src/core/crypto/big.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/big.o ../../../src/crypto/big.c
-${OBJECTDIR}/_ext/1341795113/ecp.o: ../../../src/core/crypto/ecp.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/ecp.o: ../../../src/crypto/ecp.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/ecp.o ../../../src/core/crypto/ecp.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/ecp.o ../../../src/crypto/ecp.c
-${OBJECTDIR}/_ext/1341795113/ecp2.o: ../../../src/core/crypto/ecp2.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/ecp2.o: ../../../src/crypto/ecp2.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/ecp2.o ../../../src/core/crypto/ecp2.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/ecp2.o ../../../src/crypto/ecp2.c
-${OBJECTDIR}/_ext/1341795113/ff.o: ../../../src/core/crypto/ff.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/ff.o: ../../../src/crypto/ff.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/ff.o ../../../src/core/crypto/ff.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/ff.o ../../../src/crypto/ff.c
-${OBJECTDIR}/_ext/1341795113/fp.o: ../../../src/core/crypto/fp.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/fp.o: ../../../src/crypto/fp.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/fp.o ../../../src/core/crypto/fp.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/fp.o ../../../src/crypto/fp.c
-${OBJECTDIR}/_ext/1341795113/fp12.o: ../../../src/core/crypto/fp12.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/fp12.o: ../../../src/crypto/fp12.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/fp12.o ../../../src/core/crypto/fp12.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/fp12.o ../../../src/crypto/fp12.c
-${OBJECTDIR}/_ext/1341795113/fp2.o: ../../../src/core/crypto/fp2.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/fp2.o: ../../../src/crypto/fp2.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/fp2.o ../../../src/core/crypto/fp2.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/fp2.o ../../../src/crypto/fp2.c
-${OBJECTDIR}/_ext/1341795113/fp4.o: ../../../src/core/crypto/fp4.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/fp4.o: ../../../src/crypto/fp4.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/fp4.o ../../../src/core/crypto/fp4.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/fp4.o ../../../src/crypto/fp4.c
-${OBJECTDIR}/_ext/1341795113/gcm.o: ../../../src/core/crypto/gcm.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/gcm.o: ../../../src/crypto/gcm.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/gcm.o ../../../src/core/crypto/gcm.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/gcm.o ../../../src/crypto/gcm.c
-${OBJECTDIR}/_ext/1341795113/hash.o: ../../../src/core/crypto/hash.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/hash.o: ../../../src/crypto/hash.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/hash.o ../../../src/core/crypto/hash.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/hash.o ../../../src/crypto/hash.c
-${OBJECTDIR}/_ext/1341795113/mpin.o: ../../../src/core/crypto/mpin.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/mpin.o: ../../../src/crypto/mpin.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/mpin.o ../../../src/core/crypto/mpin.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/mpin.o ../../../src/crypto/mpin.c
-${OBJECTDIR}/_ext/1341795113/oct.o: ../../../src/core/crypto/oct.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/oct.o: ../../../src/crypto/oct.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/oct.o ../../../src/core/crypto/oct.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/oct.o ../../../src/crypto/oct.c
-${OBJECTDIR}/_ext/1341795113/pair.o: ../../../src/core/crypto/pair.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/pair.o: ../../../src/crypto/pair.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/pair.o ../../../src/core/crypto/pair.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/pair.o ../../../src/crypto/pair.c
-${OBJECTDIR}/_ext/1341795113/rand.o: ../../../src/core/crypto/rand.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/rand.o: ../../../src/crypto/rand.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/rand.o ../../../src/core/crypto/rand.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/rand.o ../../../src/crypto/rand.c
-${OBJECTDIR}/_ext/1341795113/rom.o: ../../../src/core/crypto/rom.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/rom.o: ../../../src/crypto/rom.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/rom.o ../../../src/core/crypto/rom.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/rom.o ../../../src/crypto/rom.c
-${OBJECTDIR}/_ext/1341795113/version.o: ../../../src/core/crypto/version.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/version.o: ../../../src/crypto/version.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -g -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/version.o ../../../src/core/crypto/version.c
+ $(COMPILE.c) -g -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/version.o ../../../src/crypto/version.c
-${OBJECTDIR}/_ext/608447161/mpin_crypto_non_tee.o: ../../../src/core/mpin_crypto_non_tee.cpp
- ${MKDIR} -p ${OBJECTDIR}/_ext/608447161
+${OBJECTDIR}/_ext/1386528437/mpin_crypto_non_tee.o: ../../../src/mpin_crypto_non_tee.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/1386528437
${RM} "$@.d"
- $(COMPILE.cc) -g -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/608447161/mpin_crypto_non_tee.o ../../../src/core/mpin_crypto_non_tee.cpp
+ $(COMPILE.cc) -g -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1386528437/mpin_crypto_non_tee.o ../../../src/mpin_crypto_non_tee.cpp
-${OBJECTDIR}/_ext/608447161/mpin_sdk.o: ../../../src/core/mpin_sdk.cpp
- ${MKDIR} -p ${OBJECTDIR}/_ext/608447161
+${OBJECTDIR}/_ext/1386528437/mpin_sdk.o: ../../../src/mpin_sdk.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/1386528437
${RM} "$@.d"
- $(COMPILE.cc) -g -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/608447161/mpin_sdk.o ../../../src/core/mpin_sdk.cpp
+ $(COMPILE.cc) -g -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1386528437/mpin_sdk.o ../../../src/mpin_sdk.cpp
-${OBJECTDIR}/_ext/608447161/utils.o: ../../../src/core/utils.cpp
- ${MKDIR} -p ${OBJECTDIR}/_ext/608447161
+${OBJECTDIR}/_ext/1386528437/utils.o: ../../../src/utils.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/1386528437
${RM} "$@.d"
- $(COMPILE.cc) -g -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/608447161/utils.o ../../../src/core/utils.cpp
+ $(COMPILE.cc) -g -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1386528437/utils.o ../../../src/utils.cpp
${OBJECTDIR}/HttpRequest.o: HttpRequest.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"
- $(COMPILE.cc) -g -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HttpRequest.o HttpRequest.cpp
+ $(COMPILE.cc) -g -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HttpRequest.o HttpRequest.cpp
${OBJECTDIR}/MpinClient.o: MpinClient.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"
- $(COMPILE.cc) -g -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/MpinClient.o MpinClient.cpp
+ $(COMPILE.cc) -g -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/MpinClient.o MpinClient.cpp
${OBJECTDIR}/main.o: main.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"
- $(COMPILE.cc) -g -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp
+ $(COMPILE.cc) -g -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp
# Subprojects
.build-subprojects:
diff --git a/tests/linux/MPinClient/nbproject/Makefile-Release.mk b/tests/linux/MPinClient/nbproject/Makefile-Release.mk
index 49516d8..8e184f8 100644
--- a/tests/linux/MPinClient/nbproject/Makefile-Release.mk
+++ b/tests/linux/MPinClient/nbproject/Makefile-Release.mk
@@ -42,26 +42,26 @@
${OBJECTDIR}/_ext/580510450/CvMutex.o \
${OBJECTDIR}/_ext/580510450/CvSemaphore.o \
${OBJECTDIR}/_ext/580510450/CvThread.o \
- ${OBJECTDIR}/_ext/1341795113/aes.o \
- ${OBJECTDIR}/_ext/1341795113/big.o \
- ${OBJECTDIR}/_ext/1341795113/ecp.o \
- ${OBJECTDIR}/_ext/1341795113/ecp2.o \
- ${OBJECTDIR}/_ext/1341795113/ff.o \
- ${OBJECTDIR}/_ext/1341795113/fp.o \
- ${OBJECTDIR}/_ext/1341795113/fp12.o \
- ${OBJECTDIR}/_ext/1341795113/fp2.o \
- ${OBJECTDIR}/_ext/1341795113/fp4.o \
- ${OBJECTDIR}/_ext/1341795113/gcm.o \
- ${OBJECTDIR}/_ext/1341795113/hash.o \
- ${OBJECTDIR}/_ext/1341795113/mpin.o \
- ${OBJECTDIR}/_ext/1341795113/oct.o \
- ${OBJECTDIR}/_ext/1341795113/pair.o \
- ${OBJECTDIR}/_ext/1341795113/rand.o \
- ${OBJECTDIR}/_ext/1341795113/rom.o \
- ${OBJECTDIR}/_ext/1341795113/version.o \
- ${OBJECTDIR}/_ext/608447161/mpin_crypto_non_tee.o \
- ${OBJECTDIR}/_ext/608447161/mpin_sdk.o \
- ${OBJECTDIR}/_ext/608447161/utils.o \
+ ${OBJECTDIR}/_ext/605162843/aes.o \
+ ${OBJECTDIR}/_ext/605162843/big.o \
+ ${OBJECTDIR}/_ext/605162843/ecp.o \
+ ${OBJECTDIR}/_ext/605162843/ecp2.o \
+ ${OBJECTDIR}/_ext/605162843/ff.o \
+ ${OBJECTDIR}/_ext/605162843/fp.o \
+ ${OBJECTDIR}/_ext/605162843/fp12.o \
+ ${OBJECTDIR}/_ext/605162843/fp2.o \
+ ${OBJECTDIR}/_ext/605162843/fp4.o \
+ ${OBJECTDIR}/_ext/605162843/gcm.o \
+ ${OBJECTDIR}/_ext/605162843/hash.o \
+ ${OBJECTDIR}/_ext/605162843/mpin.o \
+ ${OBJECTDIR}/_ext/605162843/oct.o \
+ ${OBJECTDIR}/_ext/605162843/pair.o \
+ ${OBJECTDIR}/_ext/605162843/rand.o \
+ ${OBJECTDIR}/_ext/605162843/rom.o \
+ ${OBJECTDIR}/_ext/605162843/version.o \
+ ${OBJECTDIR}/_ext/1386528437/mpin_crypto_non_tee.o \
+ ${OBJECTDIR}/_ext/1386528437/mpin_sdk.o \
+ ${OBJECTDIR}/_ext/1386528437/utils.o \
${OBJECTDIR}/HttpRequest.o \
${OBJECTDIR}/MpinClient.o \
${OBJECTDIR}/main.o
@@ -94,152 +94,152 @@
${OBJECTDIR}/_ext/620013993/CvString.o: ../../../ext/cvshared/cpp/CvString.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/620013993
${RM} "$@.d"
- $(COMPILE.cc) -O2 -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/620013993/CvString.o ../../../ext/cvshared/cpp/CvString.cpp
+ $(COMPILE.cc) -O2 -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/620013993/CvString.o ../../../ext/cvshared/cpp/CvString.cpp
${OBJECTDIR}/_ext/620013993/CvXcode.o: ../../../ext/cvshared/cpp/CvXcode.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/620013993
${RM} "$@.d"
- $(COMPILE.cc) -O2 -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/620013993/CvXcode.o ../../../ext/cvshared/cpp/CvXcode.cpp
+ $(COMPILE.cc) -O2 -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/620013993/CvXcode.o ../../../ext/cvshared/cpp/CvXcode.cpp
${OBJECTDIR}/_ext/580510450/CvHttpRequest.o: ../../../ext/cvshared/cpp/linux/CvHttpRequest.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/580510450
${RM} "$@.d"
- $(COMPILE.cc) -O2 -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvHttpRequest.o ../../../ext/cvshared/cpp/linux/CvHttpRequest.cpp
+ $(COMPILE.cc) -O2 -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvHttpRequest.o ../../../ext/cvshared/cpp/linux/CvHttpRequest.cpp
${OBJECTDIR}/_ext/580510450/CvLogger.o: ../../../ext/cvshared/cpp/linux/CvLogger.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/580510450
${RM} "$@.d"
- $(COMPILE.cc) -O2 -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvLogger.o ../../../ext/cvshared/cpp/linux/CvLogger.cpp
+ $(COMPILE.cc) -O2 -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvLogger.o ../../../ext/cvshared/cpp/linux/CvLogger.cpp
${OBJECTDIR}/_ext/580510450/CvMutex.o: ../../../ext/cvshared/cpp/linux/CvMutex.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/580510450
${RM} "$@.d"
- $(COMPILE.cc) -O2 -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvMutex.o ../../../ext/cvshared/cpp/linux/CvMutex.cpp
+ $(COMPILE.cc) -O2 -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvMutex.o ../../../ext/cvshared/cpp/linux/CvMutex.cpp
${OBJECTDIR}/_ext/580510450/CvSemaphore.o: ../../../ext/cvshared/cpp/linux/CvSemaphore.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/580510450
${RM} "$@.d"
- $(COMPILE.cc) -O2 -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvSemaphore.o ../../../ext/cvshared/cpp/linux/CvSemaphore.cpp
+ $(COMPILE.cc) -O2 -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvSemaphore.o ../../../ext/cvshared/cpp/linux/CvSemaphore.cpp
${OBJECTDIR}/_ext/580510450/CvThread.o: ../../../ext/cvshared/cpp/linux/CvThread.cpp
${MKDIR} -p ${OBJECTDIR}/_ext/580510450
${RM} "$@.d"
- $(COMPILE.cc) -O2 -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvThread.o ../../../ext/cvshared/cpp/linux/CvThread.cpp
+ $(COMPILE.cc) -O2 -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/580510450/CvThread.o ../../../ext/cvshared/cpp/linux/CvThread.cpp
-${OBJECTDIR}/_ext/1341795113/aes.o: ../../../src/core/crypto/aes.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/aes.o: ../../../src/crypto/aes.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/aes.o ../../../src/core/crypto/aes.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/aes.o ../../../src/crypto/aes.c
-${OBJECTDIR}/_ext/1341795113/big.o: ../../../src/core/crypto/big.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/big.o: ../../../src/crypto/big.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/big.o ../../../src/core/crypto/big.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/big.o ../../../src/crypto/big.c
-${OBJECTDIR}/_ext/1341795113/ecp.o: ../../../src/core/crypto/ecp.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/ecp.o: ../../../src/crypto/ecp.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/ecp.o ../../../src/core/crypto/ecp.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/ecp.o ../../../src/crypto/ecp.c
-${OBJECTDIR}/_ext/1341795113/ecp2.o: ../../../src/core/crypto/ecp2.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/ecp2.o: ../../../src/crypto/ecp2.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/ecp2.o ../../../src/core/crypto/ecp2.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/ecp2.o ../../../src/crypto/ecp2.c
-${OBJECTDIR}/_ext/1341795113/ff.o: ../../../src/core/crypto/ff.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/ff.o: ../../../src/crypto/ff.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/ff.o ../../../src/core/crypto/ff.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/ff.o ../../../src/crypto/ff.c
-${OBJECTDIR}/_ext/1341795113/fp.o: ../../../src/core/crypto/fp.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/fp.o: ../../../src/crypto/fp.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/fp.o ../../../src/core/crypto/fp.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/fp.o ../../../src/crypto/fp.c
-${OBJECTDIR}/_ext/1341795113/fp12.o: ../../../src/core/crypto/fp12.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/fp12.o: ../../../src/crypto/fp12.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/fp12.o ../../../src/core/crypto/fp12.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/fp12.o ../../../src/crypto/fp12.c
-${OBJECTDIR}/_ext/1341795113/fp2.o: ../../../src/core/crypto/fp2.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/fp2.o: ../../../src/crypto/fp2.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/fp2.o ../../../src/core/crypto/fp2.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/fp2.o ../../../src/crypto/fp2.c
-${OBJECTDIR}/_ext/1341795113/fp4.o: ../../../src/core/crypto/fp4.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/fp4.o: ../../../src/crypto/fp4.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/fp4.o ../../../src/core/crypto/fp4.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/fp4.o ../../../src/crypto/fp4.c
-${OBJECTDIR}/_ext/1341795113/gcm.o: ../../../src/core/crypto/gcm.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/gcm.o: ../../../src/crypto/gcm.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/gcm.o ../../../src/core/crypto/gcm.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/gcm.o ../../../src/crypto/gcm.c
-${OBJECTDIR}/_ext/1341795113/hash.o: ../../../src/core/crypto/hash.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/hash.o: ../../../src/crypto/hash.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/hash.o ../../../src/core/crypto/hash.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/hash.o ../../../src/crypto/hash.c
-${OBJECTDIR}/_ext/1341795113/mpin.o: ../../../src/core/crypto/mpin.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/mpin.o: ../../../src/crypto/mpin.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/mpin.o ../../../src/core/crypto/mpin.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/mpin.o ../../../src/crypto/mpin.c
-${OBJECTDIR}/_ext/1341795113/oct.o: ../../../src/core/crypto/oct.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/oct.o: ../../../src/crypto/oct.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/oct.o ../../../src/core/crypto/oct.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/oct.o ../../../src/crypto/oct.c
-${OBJECTDIR}/_ext/1341795113/pair.o: ../../../src/core/crypto/pair.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/pair.o: ../../../src/crypto/pair.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/pair.o ../../../src/core/crypto/pair.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/pair.o ../../../src/crypto/pair.c
-${OBJECTDIR}/_ext/1341795113/rand.o: ../../../src/core/crypto/rand.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/rand.o: ../../../src/crypto/rand.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/rand.o ../../../src/core/crypto/rand.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/rand.o ../../../src/crypto/rand.c
-${OBJECTDIR}/_ext/1341795113/rom.o: ../../../src/core/crypto/rom.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/rom.o: ../../../src/crypto/rom.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/rom.o ../../../src/core/crypto/rom.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/rom.o ../../../src/crypto/rom.c
-${OBJECTDIR}/_ext/1341795113/version.o: ../../../src/core/crypto/version.c
- ${MKDIR} -p ${OBJECTDIR}/_ext/1341795113
+${OBJECTDIR}/_ext/605162843/version.o: ../../../src/crypto/version.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/605162843
${RM} "$@.d"
- $(COMPILE.c) -O2 -I../../../src/core/crypto -I../../../src/core -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1341795113/version.o ../../../src/core/crypto/version.c
+ $(COMPILE.c) -O2 -I../../../src/crypto -I../../../src -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/605162843/version.o ../../../src/crypto/version.c
-${OBJECTDIR}/_ext/608447161/mpin_crypto_non_tee.o: ../../../src/core/mpin_crypto_non_tee.cpp
- ${MKDIR} -p ${OBJECTDIR}/_ext/608447161
+${OBJECTDIR}/_ext/1386528437/mpin_crypto_non_tee.o: ../../../src/mpin_crypto_non_tee.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/1386528437
${RM} "$@.d"
- $(COMPILE.cc) -O2 -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/608447161/mpin_crypto_non_tee.o ../../../src/core/mpin_crypto_non_tee.cpp
+ $(COMPILE.cc) -O2 -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1386528437/mpin_crypto_non_tee.o ../../../src/mpin_crypto_non_tee.cpp
-${OBJECTDIR}/_ext/608447161/mpin_sdk.o: ../../../src/core/mpin_sdk.cpp
- ${MKDIR} -p ${OBJECTDIR}/_ext/608447161
+${OBJECTDIR}/_ext/1386528437/mpin_sdk.o: ../../../src/mpin_sdk.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/1386528437
${RM} "$@.d"
- $(COMPILE.cc) -O2 -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/608447161/mpin_sdk.o ../../../src/core/mpin_sdk.cpp
+ $(COMPILE.cc) -O2 -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1386528437/mpin_sdk.o ../../../src/mpin_sdk.cpp
-${OBJECTDIR}/_ext/608447161/utils.o: ../../../src/core/utils.cpp
- ${MKDIR} -p ${OBJECTDIR}/_ext/608447161
+${OBJECTDIR}/_ext/1386528437/utils.o: ../../../src/utils.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/1386528437
${RM} "$@.d"
- $(COMPILE.cc) -O2 -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/608447161/utils.o ../../../src/core/utils.cpp
+ $(COMPILE.cc) -O2 -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1386528437/utils.o ../../../src/utils.cpp
${OBJECTDIR}/HttpRequest.o: HttpRequest.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"
- $(COMPILE.cc) -O2 -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HttpRequest.o HttpRequest.cpp
+ $(COMPILE.cc) -O2 -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HttpRequest.o HttpRequest.cpp
${OBJECTDIR}/MpinClient.o: MpinClient.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"
- $(COMPILE.cc) -O2 -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/MpinClient.o MpinClient.cpp
+ $(COMPILE.cc) -O2 -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/MpinClient.o MpinClient.cpp
${OBJECTDIR}/main.o: main.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} "$@.d"
- $(COMPILE.cc) -O2 -I../../../src/core/crypto -I../../../src/core -I../../../ext/cvshared/cpp/include -I../../../src/core/json -I../../../src/core/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp
+ $(COMPILE.cc) -O2 -I../../../src/crypto -I../../../src -I../../../ext/cvshared/cpp/include -I../../../src/json -I../../../src/utf8 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp
# Subprojects
.build-subprojects:
diff --git a/tests/linux/MPinClient/nbproject/configurations.xml b/tests/linux/MPinClient/nbproject/configurations.xml
index 1edb361..5877a90 100644
--- a/tests/linux/MPinClient/nbproject/configurations.xml
+++ b/tests/linux/MPinClient/nbproject/configurations.xml
@@ -5,20 +5,20 @@
displayName="Header Files"
projectFiles="true">
<logicalFolder name="f2" displayName="core" projectFiles="true">
- <itemPath>../../../src/core/cv_shared_ptr.h</itemPath>
- <itemPath>../../../src/core/mpin_crypto.h</itemPath>
- <itemPath>../../../src/core/mpin_crypto_non_tee.h</itemPath>
- <itemPath>../../../src/core/mpin_sdk.h</itemPath>
- <itemPath>../../../src/core/utf8.h</itemPath>
- <itemPath>../../../src/core/utils.h</itemPath>
- <itemPath>../../../src/core/version.h</itemPath>
+ <itemPath>../../../src/cv_shared_ptr.h</itemPath>
+ <itemPath>../../../src/mpin_crypto.h</itemPath>
+ <itemPath>../../../src/mpin_crypto_non_tee.h</itemPath>
+ <itemPath>../../../src/mpin_sdk.h</itemPath>
+ <itemPath>../../../src/utf8.h</itemPath>
+ <itemPath>../../../src/utils.h</itemPath>
+ <itemPath>../../../src/version.h</itemPath>
</logicalFolder>
<logicalFolder name="f1" displayName="crypto" projectFiles="true">
- <itemPath>../../../src/core/crypto/DLLDefines.h</itemPath>
- <itemPath>../../../src/core/crypto/clint.h</itemPath>
- <itemPath>../../../src/core/crypto/mpin.h</itemPath>
- <itemPath>../../../src/core/crypto/platform.h</itemPath>
- <itemPath>../../../src/core/crypto/version.h</itemPath>
+ <itemPath>../../../src/crypto/DLLDefines.h</itemPath>
+ <itemPath>../../../src/crypto/clint.h</itemPath>
+ <itemPath>../../../src/crypto/mpin.h</itemPath>
+ <itemPath>../../../src/crypto/platform.h</itemPath>
+ <itemPath>../../../src/crypto/version.h</itemPath>
</logicalFolder>
<logicalFolder name="f3" displayName="cvshared" projectFiles="true">
<itemPath>../../../ext/cvshared/cpp/include/CvHttpRequest.h</itemPath>
@@ -37,28 +37,28 @@
displayName="Source Files"
projectFiles="true">
<logicalFolder name="f2" displayName="core" projectFiles="true">
- <itemPath>../../../src/core/mpin_crypto_non_tee.cpp</itemPath>
- <itemPath>../../../src/core/mpin_sdk.cpp</itemPath>
- <itemPath>../../../src/core/utils.cpp</itemPath>
+ <itemPath>../../../src/mpin_crypto_non_tee.cpp</itemPath>
+ <itemPath>../../../src/mpin_sdk.cpp</itemPath>
+ <itemPath>../../../src/utils.cpp</itemPath>
</logicalFolder>
<logicalFolder name="f1" displayName="crypto" projectFiles="true">
- <itemPath>../../../src/core/crypto/aes.c</itemPath>
- <itemPath>../../../src/core/crypto/big.c</itemPath>
- <itemPath>../../../src/core/crypto/ecp.c</itemPath>
- <itemPath>../../../src/core/crypto/ecp2.c</itemPath>
- <itemPath>../../../src/core/crypto/ff.c</itemPath>
- <itemPath>../../../src/core/crypto/fp.c</itemPath>
- <itemPath>../../../src/core/crypto/fp12.c</itemPath>
- <itemPath>../../../src/core/crypto/fp2.c</itemPath>
- <itemPath>../../../src/core/crypto/fp4.c</itemPath>
- <itemPath>../../../src/core/crypto/gcm.c</itemPath>
- <itemPath>../../../src/core/crypto/hash.c</itemPath>
- <itemPath>../../../src/core/crypto/mpin.c</itemPath>
- <itemPath>../../../src/core/crypto/oct.c</itemPath>
- <itemPath>../../../src/core/crypto/pair.c</itemPath>
- <itemPath>../../../src/core/crypto/rand.c</itemPath>
- <itemPath>../../../src/core/crypto/rom.c</itemPath>
- <itemPath>../../../src/core/crypto/version.c</itemPath>
+ <itemPath>../../../src/crypto/aes.c</itemPath>
+ <itemPath>../../../src/crypto/big.c</itemPath>
+ <itemPath>../../../src/crypto/ecp.c</itemPath>
+ <itemPath>../../../src/crypto/ecp2.c</itemPath>
+ <itemPath>../../../src/crypto/ff.c</itemPath>
+ <itemPath>../../../src/crypto/fp.c</itemPath>
+ <itemPath>../../../src/crypto/fp12.c</itemPath>
+ <itemPath>../../../src/crypto/fp2.c</itemPath>
+ <itemPath>../../../src/crypto/fp4.c</itemPath>
+ <itemPath>../../../src/crypto/gcm.c</itemPath>
+ <itemPath>../../../src/crypto/hash.c</itemPath>
+ <itemPath>../../../src/crypto/mpin.c</itemPath>
+ <itemPath>../../../src/crypto/oct.c</itemPath>
+ <itemPath>../../../src/crypto/pair.c</itemPath>
+ <itemPath>../../../src/crypto/rand.c</itemPath>
+ <itemPath>../../../src/crypto/rom.c</itemPath>
+ <itemPath>../../../src/crypto/version.c</itemPath>
</logicalFolder>
<logicalFolder name="f3" displayName="cvshared" projectFiles="true">
<itemPath>../../../ext/cvshared/cpp/linux/CvHttpRequest.cpp</itemPath>
@@ -98,18 +98,18 @@
<cTool>
<architecture>2</architecture>
<incDir>
- <pElem>../../../src/core/crypto</pElem>
- <pElem>../../../src/core</pElem>
+ <pElem>../../../src/crypto</pElem>
+ <pElem>../../../src</pElem>
</incDir>
</cTool>
<ccTool>
<architecture>2</architecture>
<incDir>
- <pElem>../../../src/core/crypto</pElem>
- <pElem>../../../src/core</pElem>
+ <pElem>../../../src/crypto</pElem>
+ <pElem>../../../src</pElem>
<pElem>../../../ext/cvshared/cpp/include</pElem>
- <pElem>../../../src/core/json</pElem>
- <pElem>../../../src/core/utf8</pElem>
+ <pElem>../../../src/json</pElem>
+ <pElem>../../../src/utf8</pElem>
</incDir>
</ccTool>
<linkerTool>
@@ -195,81 +195,72 @@
tool="1"
flavor2="0">
</item>
- <item path="../../../src/core/crypto/DLLDefines.h"
- ex="false"
- tool="3"
- flavor2="0">
+ <item path="../../../src/crypto/DLLDefines.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/crypto/aes.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/aes.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/big.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/big.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/clint.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/crypto/clint.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/crypto/ecp.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/ecp.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/ecp2.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/ecp2.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/ff.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/ff.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/fp.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/fp.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/fp12.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/fp12.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/fp2.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/fp2.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/fp4.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/fp4.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/gcm.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/gcm.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/hash.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/hash.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/mpin.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/mpin.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/mpin.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/crypto/mpin.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/crypto/oct.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/oct.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/pair.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/pair.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/platform.h"
- ex="false"
- tool="3"
- flavor2="0">
+ <item path="../../../src/crypto/platform.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/crypto/rand.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/rand.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/rom.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/rom.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/version.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/version.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/version.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/crypto/version.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/cv_shared_ptr.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/cv_shared_ptr.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/mpin_crypto.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/mpin_crypto.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/mpin_crypto_non_tee.cpp"
+ <item path="../../../src/mpin_crypto_non_tee.cpp"
ex="false"
tool="1"
flavor2="0">
</item>
- <item path="../../../src/core/mpin_crypto_non_tee.h"
- ex="false"
- tool="3"
- flavor2="0">
+ <item path="../../../src/mpin_crypto_non_tee.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/mpin_sdk.cpp" ex="false" tool="1" flavor2="0">
+ <item path="../../../src/mpin_sdk.cpp" ex="false" tool="1" flavor2="0">
</item>
- <item path="../../../src/core/mpin_sdk.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/mpin_sdk.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/utf8.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/utf8.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/utils.cpp" ex="false" tool="1" flavor2="0">
+ <item path="../../../src/utils.cpp" ex="false" tool="1" flavor2="0">
</item>
- <item path="../../../src/core/utils.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/utils.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/version.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/version.h" ex="false" tool="3" flavor2="0">
</item>
<item path="HttpRequest.cpp" ex="false" tool="1" flavor2="0">
</item>
@@ -295,19 +286,19 @@
<developmentMode>5</developmentMode>
<architecture>2</architecture>
<incDir>
- <pElem>../../../src/core/crypto</pElem>
- <pElem>../../../src/core</pElem>
+ <pElem>../../../src/crypto</pElem>
+ <pElem>../../../src</pElem>
</incDir>
</cTool>
<ccTool>
<developmentMode>5</developmentMode>
<architecture>2</architecture>
<incDir>
- <pElem>../../../src/core/crypto</pElem>
- <pElem>../../../src/core</pElem>
+ <pElem>../../../src/crypto</pElem>
+ <pElem>../../../src</pElem>
<pElem>../../../ext/cvshared/cpp/include</pElem>
- <pElem>../../../src/core/json</pElem>
- <pElem>../../../src/core/utf8</pElem>
+ <pElem>../../../src/json</pElem>
+ <pElem>../../../src/utf8</pElem>
</incDir>
</ccTool>
<fortranCompilerTool>
@@ -399,81 +390,72 @@
tool="1"
flavor2="0">
</item>
- <item path="../../../src/core/crypto/DLLDefines.h"
- ex="false"
- tool="3"
- flavor2="0">
+ <item path="../../../src/crypto/DLLDefines.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/crypto/aes.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/aes.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/big.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/big.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/clint.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/crypto/clint.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/crypto/ecp.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/ecp.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/ecp2.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/ecp2.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/ff.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/ff.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/fp.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/fp.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/fp12.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/fp12.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/fp2.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/fp2.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/fp4.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/fp4.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/gcm.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/gcm.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/hash.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/hash.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/mpin.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/mpin.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/mpin.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/crypto/mpin.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/crypto/oct.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/oct.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/pair.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/pair.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/platform.h"
- ex="false"
- tool="3"
- flavor2="0">
+ <item path="../../../src/crypto/platform.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/crypto/rand.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/rand.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/rom.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/rom.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/version.c" ex="false" tool="0" flavor2="0">
+ <item path="../../../src/crypto/version.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="../../../src/core/crypto/version.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/crypto/version.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/cv_shared_ptr.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/cv_shared_ptr.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/mpin_crypto.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/mpin_crypto.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/mpin_crypto_non_tee.cpp"
+ <item path="../../../src/mpin_crypto_non_tee.cpp"
ex="false"
tool="1"
flavor2="0">
</item>
- <item path="../../../src/core/mpin_crypto_non_tee.h"
- ex="false"
- tool="3"
- flavor2="0">
+ <item path="../../../src/mpin_crypto_non_tee.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/mpin_sdk.cpp" ex="false" tool="1" flavor2="0">
+ <item path="../../../src/mpin_sdk.cpp" ex="false" tool="1" flavor2="0">
</item>
- <item path="../../../src/core/mpin_sdk.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/mpin_sdk.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/utf8.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/utf8.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/utils.cpp" ex="false" tool="1" flavor2="0">
+ <item path="../../../src/utils.cpp" ex="false" tool="1" flavor2="0">
</item>
- <item path="../../../src/core/utils.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/utils.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="../../../src/core/version.h" ex="false" tool="3" flavor2="0">
+ <item path="../../../src/version.h" ex="false" tool="3" flavor2="0">
</item>
<item path="HttpRequest.cpp" ex="false" tool="1" flavor2="0">
</item>
