diff -r 13d7c31c74e0 -r b183ec05bd8c terminalsecurity/SCP/SCPServer/inc/SCPServer.h --- a/terminalsecurity/SCP/SCPServer/inc/SCPServer.h Thu Aug 19 10:44:50 2010 +0300 +++ b/terminalsecurity/SCP/SCPServer/inc/SCPServer.h Tue Aug 31 16:04:06 2010 +0300 @@ -92,6 +92,7 @@ _LIT8( KCodePolicyTypeId, "http://www.w3.org/2001/XMLSchema#string" ); // Allowed SIDs for the functions +const TUint32 KSCPSTIF( 0x102073E4 ); // STIF exe const TUint32 KSCPServerSIDTelephone( 0x100058B3 ); // Terminal Control Server const TUint32 KSCPServerSIDLog( 0x101f4cd5 ); // Terminal Control Server const TUint32 KSCPServerSIDTerminalControl( 0x10207825 ); // Terminal Control Server @@ -136,7 +137,7 @@ // Only Autolock allowed for the Check configuration call }, { - _INIT_SECURITY_POLICY_C1( ECapability_None ), + _INIT_SECURITY_POLICY_S0( KSCPEvntHndlrUid ), CPolicyServer::EFailClient }, { @@ -178,7 +179,7 @@ { _INIT_SECURITY_POLICY_C1( ECapability_None ), CPolicyServer::EFailClient - } + } }; #endif // SCP_ENFORCE_SECURITY @@ -494,6 +495,11 @@ * This method is called to remove the parameters set by the application(s) provided as arguments. */ TInt PerformCleanupL( HBufC8* aAppIDBuffer, RArray& aChangeArray, RPointerArray& aParamValArray ); + + /** + * This method returns the values for the policies maintained at the server + */ + void GetPoliciesL(HBufC8* aAppIDBuffer, TUint32 aCallerIdentity); //#endif // __SAP_DEVICE_LOCK_ENHANCEMENTS // Methods from base classes @@ -515,6 +521,8 @@ * @param aParam The parameter passed to the timer object */ void Timeout( TAny* aParam ); + + TInt ValidateLockcodeAgainstPoliciesL(TDes& aLockcode,CSCPParamObject*& aRetParams); private: //Methods