--- a/authenticationservices/authenticationserver/bwins/authclientU.DEF	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-EXPORTS
-	??0RAuthClient@AuthServer@@QAE@XZ @ 1 NONAME ; AuthServer::RAuthClient::RAuthClient(void)
-	?ActivePluginsL@RAuthClient@AuthServer@@QAEXAAV?$RCPointerArray@$$CBVCPluginDesc@AuthServer@@@@@Z @ 2 NONAME ; void AuthServer::RAuthClient::ActivePluginsL(class RCPointerArray<class AuthServer::CPluginDesc const > &)
-	?AuthenticateL@RAuthClient@AuthServer@@QAEPAVCIdentity@2@ABVCAuthExpression@2@VTTimeIntervalSeconds@@HH@Z @ 3 NONAME ; class AuthServer::CIdentity * AuthServer::RAuthClient::AuthenticateL(class AuthServer::CAuthExpression const &, class TTimeIntervalSeconds, int, int)
-	?AuthenticateL@RAuthClient@AuthServer@@QAEXABVCAuthExpression@2@VTTimeIntervalSeconds@@HHAAPAVCIdentity@2@AAVTRequestStatus@@@Z @ 4 NONAME ; void AuthServer::RAuthClient::AuthenticateL(class AuthServer::CAuthExpression const &, class TTimeIntervalSeconds, int, int, class AuthServer::CIdentity * &, class TRequestStatus &)
-	?Cancel@RAuthClient@AuthServer@@QAEIXZ @ 5 NONAME ; unsigned int AuthServer::RAuthClient::Cancel(void)
-	?Close@RAuthClient@AuthServer@@QAEXXZ @ 6 NONAME ; void AuthServer::RAuthClient::Close(void)
-	?Connect@RAuthClient@AuthServer@@QAEHXZ @ 7 NONAME ; int AuthServer::RAuthClient::Connect(void)
-	?DeauthenticateL@RAuthClient@AuthServer@@QAEXXZ @ 8 NONAME ; void AuthServer::RAuthClient::DeauthenticateL(void)
-	?ForgetPluginL@RAuthMgrClient@AuthServer@@QAEXKK@Z @ 9 NONAME ; void AuthServer::RAuthMgrClient::ForgetPluginL(unsigned long, unsigned long)
-	?IdentitiesL@RAuthClient@AuthServer@@QAEXAAV?$RArray@K@@@Z @ 10 NONAME ; void AuthServer::RAuthClient::IdentitiesL(class RArray<unsigned long> &)
-	?IdentitiesWithStringL@RAuthClient@AuthServer@@QAEXAAV?$RCPointerArray@VCIdAndString@AuthServer@@@@@Z @ 11 NONAME ; void AuthServer::RAuthClient::IdentitiesWithStringL(class RCPointerArray<class AuthServer::CIdAndString> &)
-	?IdentityStringL@RAuthClient@AuthServer@@QAEPAVHBufC16@@K@Z @ 12 NONAME ; class HBufC16 * AuthServer::RAuthClient::IdentityStringL(unsigned long)
-	?PluginsL@RAuthClient@AuthServer@@QAEXAAV?$RCPointerArray@$$CBVCPluginDesc@AuthServer@@@@@Z @ 13 NONAME ; void AuthServer::RAuthClient::PluginsL(class RCPointerArray<class AuthServer::CPluginDesc const > &)
-	?PluginsOfTypeL@RAuthClient@AuthServer@@QAEXW4TAuthPluginType@2@AAV?$RCPointerArray@$$CBVCPluginDesc@AuthServer@@@@@Z @ 14 NONAME ; void AuthServer::RAuthClient::PluginsOfTypeL(enum AuthServer::TAuthPluginType, class RCPointerArray<class AuthServer::CPluginDesc const > &)
-	?PluginsWithTrainingStatusL@RAuthClient@AuthServer@@QAEXW4TAuthTrainingStatus@2@AAV?$RCPointerArray@$$CBVCPluginDesc@AuthServer@@@@@Z @ 15 NONAME ; void AuthServer::RAuthClient::PluginsWithTrainingStatusL(enum AuthServer::TAuthTrainingStatus, class RCPointerArray<class AuthServer::CPluginDesc const > &)
-	?PreferredTypePluginL@RAuthClient@AuthServer@@QAEKW4TAuthPluginType@2@@Z @ 16 NONAME ; unsigned long AuthServer::RAuthClient::PreferredTypePluginL(enum AuthServer::TAuthPluginType)
-	?RegisterIdentityL@RAuthMgrClient@AuthServer@@QAEXAAPAVCIdentity@2@ABVTDesC16@@AAVTRequestStatus@@@Z @ 17 NONAME ; void AuthServer::RAuthMgrClient::RegisterIdentityL(class AuthServer::CIdentity * &, class TDesC16 const &, class TRequestStatus &)
-	?RemoveIdentityL@RAuthMgrClient@AuthServer@@QAEXK@Z @ 18 NONAME ; void AuthServer::RAuthMgrClient::RemoveIdentityL(unsigned long)
-	?SetIdentityStringL@RAuthClient@AuthServer@@QAEXKABVTDesC16@@@Z @ 19 NONAME ; void AuthServer::RAuthClient::SetIdentityStringL(unsigned long, class TDesC16 const &)
-	?SetPreferredTypePluginL@RAuthMgrClient@AuthServer@@QAEXW4TAuthPluginType@2@K@Z @ 20 NONAME ; void AuthServer::RAuthMgrClient::SetPreferredTypePluginL(enum AuthServer::TAuthPluginType, unsigned long)
-	?TrainPlugin@RAuthMgrClient@AuthServer@@QAEXKKAAVTRequestStatus@@@Z @ 21 NONAME ; void AuthServer::RAuthMgrClient::TrainPlugin(unsigned long, unsigned long, class TRequestStatus &)
-	?AuthenticateL@RAuthClient@AuthServer@@QAEPAVCIdentity@2@ABVCAuthExpression@2@VTTimeIntervalSeconds@@HVTUid@@HABVTDesC16@@@Z @ 22 NONAME ; class AuthServer::CIdentity * AuthServer::RAuthClient::AuthenticateL(class AuthServer::CAuthExpression const &, class TTimeIntervalSeconds, int, class TUid, int, class TDesC16 const &)
-	?AuthenticateL@RAuthClient@AuthServer@@QAEXABVCAuthExpression@2@VTTimeIntervalSeconds@@HVTUid@@HABVTDesC16@@AAPAVCIdentity@2@AAVTRequestStatus@@@Z @ 23 NONAME ; void AuthServer::RAuthClient::AuthenticateL(class AuthServer::CAuthExpression const &, class TTimeIntervalSeconds, int, class TUid, int, class TDesC16 const &, class AuthServer::CIdentity * &, class TRequestStatus &)
-	?CreateAuthExpressionL@RAuthClient@AuthServer@@QBEPAVCAuthExpression@2@ABVTDesC16@@@Z @ 24 NONAME ; class AuthServer::CAuthExpression * AuthServer::RAuthClient::CreateAuthExpressionL(class TDesC16 const &) const
-	?ListAuthAliasesL@RAuthClient@AuthServer@@QAEXAAV?$RPointerArray@VHBufC16@@@@@Z @ 25 NONAME ; void AuthServer::RAuthClient::ListAuthAliasesL(class RPointerArray<class HBufC16> &)
-	?ResetIdentityL@RAuthMgrClient@AuthServer@@QAEXKAAV?$RArray@K@@AAV?$RPointerArray@$$CBVHBufC16@@@@@Z @ 26 NONAME ; void AuthServer::RAuthMgrClient::ResetIdentityL(unsigned long, class RArray<unsigned long> &, class RPointerArray<class HBufC16 const > &)
-	?ResetIdentityL@RAuthMgrClient@AuthServer@@QAEXKABVTDesC16@@@Z @ 27 NONAME ; void AuthServer::RAuthMgrClient::ResetIdentityL(unsigned long, class TDesC16 const &)
-	?ResetIdentityL@RAuthMgrClient@AuthServer@@QAEXKW4TAuthPluginType@2@ABVTDesC16@@@Z @ 28 NONAME ; void AuthServer::RAuthMgrClient::ResetIdentityL(unsigned long, enum AuthServer::TAuthPluginType, class TDesC16 const &)
-

--- a/authenticationservices/authenticationserver/bwins/authcommonU.def	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-EXPORTS
-	??1CIdAndString@AuthServer@@UAE@XZ @ 1 NONAME ; AuthServer::CIdAndString::~CIdAndString(void)
-	?AuthAnd@AuthServer@@YA?AVTAuthExpressionWrapper@1@PAVCAuthExpression@1@0@Z @ 2 NONAME ; class AuthServer::TAuthExpressionWrapper AuthServer::AuthAnd(class AuthServer::CAuthExpression *, class AuthServer::CAuthExpression *)
-	?AuthExpr@AuthServer@@YA?AVTAuthExpressionWrapper@1@K@Z @ 3 NONAME ; class AuthServer::TAuthExpressionWrapper AuthServer::AuthExpr(unsigned long)
-	?AuthExpr@AuthServer@@YA?AVTAuthExpressionWrapper@1@W4TAuthPluginType@1@@Z @ 4 NONAME ; class AuthServer::TAuthExpressionWrapper AuthServer::AuthExpr(enum AuthServer::TAuthPluginType)
-	?AuthOr@AuthServer@@YA?AVTAuthExpressionWrapper@1@PAVCAuthExpression@1@0@Z @ 5 NONAME ; class AuthServer::TAuthExpressionWrapper AuthServer::AuthOr(class AuthServer::CAuthExpression *, class AuthServer::CAuthExpression *)
-	?ClientKeyL@CProtectionKey@AuthServer@@QBEPAV12@H@Z @ 6 NONAME ; class AuthServer::CProtectionKey * AuthServer::CProtectionKey::ClientKeyL(int) const
-	?ConstructL@CIdAndString@AuthServer@@QAEXKABVTDesC16@@@Z @ 7 NONAME ; void AuthServer::CIdAndString::ConstructL(unsigned long, class TDesC16 const &)
-	?DoWriteL@TSizeStream@AuthServer@@UAEXPBXH@Z @ 8 NONAME ; void AuthServer::TSizeStream::DoWriteL(void const *, int)
-	?ExternalizeL@CAuthExpressionImpl@AuthServer@@UBEXAAVRWriteStream@@@Z @ 9 NONAME ; void AuthServer::CAuthExpressionImpl::ExternalizeL(class RWriteStream &) const
-	?ExternalizeL@CIdAndString@AuthServer@@QBEXAAVRWriteStream@@@Z @ 10 NONAME ; void AuthServer::CIdAndString::ExternalizeL(class RWriteStream &) const
-	?ExternalizeL@CIdentity@AuthServer@@QBEXAAVRWriteStream@@@Z @ 11 NONAME ; void AuthServer::CIdentity::ExternalizeL(class RWriteStream &) const
-	?ExternalizeL@CPluginDesc@AuthServer@@QBEXAAVRWriteStream@@@Z @ 12 NONAME ; void AuthServer::CPluginDesc::ExternalizeL(class RWriteStream &) const
-	?FalseNegativeRate@CPluginDesc@AuthServer@@QBEKXZ @ 13 NONAME ; unsigned long AuthServer::CPluginDesc::FalseNegativeRate(void) const
-	?FalsePositiveRate@CPluginDesc@AuthServer@@QBEKXZ @ 14 NONAME ; unsigned long AuthServer::CPluginDesc::FalsePositiveRate(void) const
-	?Id@CIdAndString@AuthServer@@QBEKXZ @ 15 NONAME ; unsigned long AuthServer::CIdAndString::Id(void) const
-	?Id@CIdentity@AuthServer@@QBEKXZ @ 16 NONAME ; unsigned long AuthServer::CIdentity::Id(void) const
-	?Id@CPluginDesc@AuthServer@@QBEKXZ @ 17 NONAME ; unsigned long AuthServer::CPluginDesc::Id(void) const
-	?InternalizeL@CIdAndString@AuthServer@@QAEXAAVRReadStream@@@Z @ 18 NONAME ABSENT ; void AuthServer::CIdAndString::InternalizeL(class RReadStream &)
-	?InternalizeL@CIdentity@AuthServer@@SAPAV12@AAVRReadStream@@@Z @ 19 NONAME ; class AuthServer::CIdentity * AuthServer::CIdentity::InternalizeL(class RReadStream &)
-	?Invariant@CAuthExpressionImpl@AuthServer@@ABEHXZ @ 20 NONAME ; int AuthServer::CAuthExpressionImpl::Invariant(void) const
-	?Key@CIdentity@AuthServer@@QBEABVCProtectionKey@2@XZ @ 21 NONAME ; class AuthServer::CProtectionKey const & AuthServer::CIdentity::Key(void) const
-	?KeyData@CProtectionKey@AuthServer@@QBE?AVTPtrC8@@XZ @ 22 NONAME ; class TPtrC8 AuthServer::CProtectionKey::KeyData(void) const
-	?MinEntropy@CPluginDesc@AuthServer@@QBEKXZ @ 23 NONAME ; unsigned long AuthServer::CPluginDesc::MinEntropy(void) const
-	?Name@CPluginDesc@AuthServer@@QBEPBVTDesC16@@XZ @ 24 NONAME ; class TDesC16 const * AuthServer::CPluginDesc::Name(void) const
-	?NewL@CAuthExpressionImpl@AuthServer@@SAPAV12@AAVRReadStream@@@Z @ 25 NONAME ; class AuthServer::CAuthExpressionImpl * AuthServer::CAuthExpressionImpl::NewL(class RReadStream &)
-	?NewL@CIdentity@AuthServer@@SAPAV12@KPAVCProtectionKey@2@PAVHBufC16@@@Z @ 26 NONAME ; class AuthServer::CIdentity * AuthServer::CIdentity::NewL(unsigned long, class AuthServer::CProtectionKey *, class HBufC16 *)
-	?NewL@CPluginDesc@AuthServer@@SAPAV12@KABVTDesC16@@W4TAuthPluginType@2@W4TAuthTrainingStatus@2@KKK@Z @ 27 NONAME ; class AuthServer::CPluginDesc * AuthServer::CPluginDesc::NewL(unsigned long, class TDesC16 const &, enum AuthServer::TAuthPluginType, enum AuthServer::TAuthTrainingStatus, unsigned long, unsigned long, unsigned long)
-	?NewL@CProtectionKey@AuthServer@@SAPAV12@H@Z @ 28 NONAME ; class AuthServer::CProtectionKey * AuthServer::CProtectionKey::NewL(int)
-	?NewL@CProtectionKey@AuthServer@@SAPAV12@PAVHBufC8@@@Z @ 29 NONAME ; class AuthServer::CProtectionKey * AuthServer::CProtectionKey::NewL(class HBufC8 *)
-	?NewLC@CIdAndString@AuthServer@@SAPAV12@AAVRReadStream@@@Z @ 30 NONAME ; class AuthServer::CIdAndString * AuthServer::CIdAndString::NewLC(class RReadStream &)
-	?NewLC@CIdAndString@AuthServer@@SAPAV12@KABVTDesC16@@@Z @ 31 NONAME ; class AuthServer::CIdAndString * AuthServer::CIdAndString::NewLC(unsigned long, class TDesC16 const &)
-	?NewLC@CIdentity@AuthServer@@SAPAV12@KPAVCProtectionKey@2@PAVHBufC16@@@Z @ 32 NONAME ; class AuthServer::CIdentity * AuthServer::CIdentity::NewLC(unsigned long, class AuthServer::CProtectionKey *, class HBufC16 *)
-	?NewLC@CPluginDesc@AuthServer@@SAPAV12@AAVRReadStream@@@Z @ 33 NONAME ; class AuthServer::CPluginDesc * AuthServer::CPluginDesc::NewLC(class RReadStream &)
-	?NewLC@CProtectionKey@AuthServer@@SAPAV12@H@Z @ 34 NONAME ; class AuthServer::CProtectionKey * AuthServer::CProtectionKey::NewLC(int)
-	?NewLC@CProtectionKey@AuthServer@@SAPAV12@PAVHBufC8@@@Z @ 35 NONAME ; class AuthServer::CProtectionKey * AuthServer::CProtectionKey::NewLC(class HBufC8 *)
-	?Panic@CAuthExpressionImpl@AuthServer@@CAXW4TPanic@12@@Z @ 36 NONAME ; void AuthServer::CAuthExpressionImpl::Panic(enum AuthServer::CAuthExpressionImpl::TPanic)
-	?String@CIdAndString@AuthServer@@QBEPAVHBufC16@@XZ @ 37 NONAME ; class HBufC16 * AuthServer::CIdAndString::String(void) const
-	?String@CIdentity@AuthServer@@QBEAAVTDesC16@@XZ @ 38 NONAME ; class TDesC16 & AuthServer::CIdentity::String(void) const
-	?TrainingStatus@CPluginDesc@AuthServer@@QBE?AW4TAuthTrainingStatus@2@XZ @ 39 NONAME ; enum AuthServer::TAuthTrainingStatus AuthServer::CPluginDesc::TrainingStatus(void) const
-	?Type@CPluginDesc@AuthServer@@QBE?AW4TAuthPluginType@2@XZ @ 40 NONAME ; enum AuthServer::TAuthPluginType AuthServer::CPluginDesc::Type(void) const
-	?InsertSpaceBetweenOperatorsL@CAuthExpressionImpl@AuthServer@@SAXABVTDesC16@@AAVRBuf16@@@Z @ 41 NONAME ; void AuthServer::CAuthExpressionImpl::InsertSpaceBetweenOperatorsL(class TDesC16 const &, class RBuf16 &)
-	?KEnablePostMarketAuthenticationPlugins@@3EB @ 42 NONAME ; unsigned char const KEnablePostMarketAuthenticationPlugins
-	?CreateAuthExprObjectL@CAuthExpressionImpl@AuthServer@@SAPAVCAuthExpression@2@ABVTDesC16@@@Z @ 43 NONAME ; class AuthServer::CAuthExpression * AuthServer::CAuthExpressionImpl::CreateAuthExprObjectL(class TDesC16 const &)
-	?AuthExpr@AuthServer@@YA?AVTAuthExpressionWrapper@1@XZ @ 44 NONAME ; class AuthServer::TAuthExpressionWrapper AuthServer::AuthExpr(void)
-	?InternalizeL@CAuthParams@AuthServer@@QAEXAAVRReadStream@@@Z @ 45 NONAME ; void AuthServer::CAuthParams::InternalizeL(class RReadStream &)
-	?ExternalizeL@CAuthParams@AuthServer@@QBEXAAVRWriteStream@@@Z @ 46 NONAME ; void AuthServer::CAuthParams::ExternalizeL(class RWriteStream &) const
-	?NewL@CAuthParams@AuthServer@@SAPAV12@VTTimeIntervalSeconds@@HVTUid@@HABVTDesC16@@@Z @ 47 NONAME ; class AuthServer::CAuthParams * AuthServer::CAuthParams::NewL(class TTimeIntervalSeconds, int, class TUid, int, class TDesC16 const &)
-	

--- a/authenticationservices/authenticationserver/eabi/authclientU.DEF	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-EXPORTS
-	_ZN10AuthServer11RAuthClient11IdentitiesLER6RArrayImE @ 1 NONAME
-	_ZN10AuthServer11RAuthClient13AuthenticateLERKNS_15CAuthExpressionE20TTimeIntervalSecondsii @ 2 NONAME
-	_ZN10AuthServer11RAuthClient13AuthenticateLERKNS_15CAuthExpressionE20TTimeIntervalSecondsiiRPNS_9CIdentityER14TRequestStatus @ 3 NONAME
-	_ZN10AuthServer11RAuthClient14ActivePluginsLER14RCPointerArrayIKNS_11CPluginDescEE @ 4 NONAME
-	_ZN10AuthServer11RAuthClient14PluginsOfTypeLENS_15TAuthPluginTypeER14RCPointerArrayIKNS_11CPluginDescEE @ 5 NONAME
-	_ZN10AuthServer11RAuthClient15DeauthenticateLEv @ 6 NONAME
-	_ZN10AuthServer11RAuthClient15IdentityStringLEm @ 7 NONAME
-	_ZN10AuthServer11RAuthClient18SetIdentityStringLEmRK7TDesC16 @ 8 NONAME
-	_ZN10AuthServer11RAuthClient20PreferredTypePluginLENS_15TAuthPluginTypeE @ 9 NONAME
-	_ZN10AuthServer11RAuthClient21IdentitiesWithStringLER14RCPointerArrayINS_12CIdAndStringEE @ 10 NONAME
-	_ZN10AuthServer11RAuthClient26PluginsWithTrainingStatusLENS_19TAuthTrainingStatusER14RCPointerArrayIKNS_11CPluginDescEE @ 11 NONAME
-	_ZN10AuthServer11RAuthClient5CloseEv @ 12 NONAME
-	_ZN10AuthServer11RAuthClient6CancelEv @ 13 NONAME
-	_ZN10AuthServer11RAuthClient7ConnectEv @ 14 NONAME
-	_ZN10AuthServer11RAuthClient8PluginsLER14RCPointerArrayIKNS_11CPluginDescEE @ 15 NONAME
-	_ZN10AuthServer11RAuthClientC1Ev @ 16 NONAME
-	_ZN10AuthServer11RAuthClientC2Ev @ 17 NONAME
-	_ZN10AuthServer14RAuthMgrClient11TrainPluginEmmR14TRequestStatus @ 18 NONAME
-	_ZN10AuthServer14RAuthMgrClient13ForgetPluginLEmm @ 19 NONAME
-	_ZN10AuthServer14RAuthMgrClient15RemoveIdentityLEm @ 20 NONAME
-	_ZN10AuthServer14RAuthMgrClient17RegisterIdentityLERPNS_9CIdentityERK7TDesC16R14TRequestStatus @ 21 NONAME
-	_ZN10AuthServer14RAuthMgrClient23SetPreferredTypePluginLENS_15TAuthPluginTypeEm @ 22 NONAME
-	_ZTIN10AuthServer21CAsyncResponseDecoderE @ 23 NONAME ; #<TI>#
-	_ZTVN10AuthServer21CAsyncResponseDecoderE @ 24 NONAME ; #<VT>#
-	_ZN10AuthServer11RAuthClient13AuthenticateLERKNS_15CAuthExpressionE20TTimeIntervalSecondsi4TUidiRK7TDesC16 @ 25 NONAME
-	_ZN10AuthServer11RAuthClient13AuthenticateLERKNS_15CAuthExpressionE20TTimeIntervalSecondsi4TUidiRK7TDesC16RPNS_9CIdentityER14TRequestStatus @ 26 NONAME
-	_ZN10AuthServer11RAuthClient16ListAuthAliasesLER13RPointerArrayI7HBufC16E @ 27 NONAME
-	_ZNK10AuthServer11RAuthClient21CreateAuthExpressionLERK7TDesC16 @ 28 NONAME
-	_ZN10AuthServer14RAuthMgrClient14ResetIdentityLEmNS_15TAuthPluginTypeERK7TDesC16 @ 29 NONAME
-	_ZN10AuthServer14RAuthMgrClient14ResetIdentityLEmR6RArrayImER13RPointerArrayIK7HBufC16E @ 30 NONAME
-	_ZN10AuthServer14RAuthMgrClient14ResetIdentityLEmRK7TDesC16 @ 31 NONAME
-

--- a/authenticationservices/authenticationserver/eabi/authcommonU.def	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-EXPORTS
-	_ZN10AuthServer11CPluginDesc4NewLEmRK7TDesC16NS_15TAuthPluginTypeENS_19TAuthTrainingStatusEmmm @ 1 NONAME
-	_ZN10AuthServer11CPluginDesc5NewLCER11RReadStream @ 2 NONAME
-	_ZN10AuthServer11TSizeStream8DoWriteLEPKvi @ 3 NONAME
-	_ZN10AuthServer12CIdAndString10ConstructLEmRK7TDesC16 @ 4 NONAME
-	_ZN10AuthServer12CIdAndString5NewLCER11RReadStream @ 5 NONAME
-	_ZN10AuthServer12CIdAndString5NewLCEmRK7TDesC16 @ 6 NONAME
-	_ZN10AuthServer12CIdAndStringD0Ev @ 7 NONAME
-	_ZN10AuthServer12CIdAndStringD1Ev @ 8 NONAME
-	_ZN10AuthServer12CIdAndStringD2Ev @ 9 NONAME
-	_ZN10AuthServer14CProtectionKey4NewLEP6HBufC8 @ 10 NONAME
-	_ZN10AuthServer14CProtectionKey4NewLEi @ 11 NONAME
-	_ZN10AuthServer14CProtectionKey5NewLCEP6HBufC8 @ 12 NONAME
-	_ZN10AuthServer14CProtectionKey5NewLCEi @ 13 NONAME
-	_ZN10AuthServer19CAuthExpressionImpl4NewLER11RReadStream @ 14 NONAME
-	_ZN10AuthServer19CAuthExpressionImpl5PanicENS0_6TPanicE @ 15 NONAME
-	_ZN10AuthServer6AuthOrEPNS_15CAuthExpressionES1_ @ 16 NONAME
-	_ZN10AuthServer7AuthAndEPNS_15CAuthExpressionES1_ @ 17 NONAME
-	_ZN10AuthServer8AuthExprENS_15TAuthPluginTypeE @ 18 NONAME
-	_ZN10AuthServer8AuthExprEm @ 19 NONAME
-	_ZN10AuthServer9CIdentity12InternalizeLER11RReadStream @ 20 NONAME
-	_ZN10AuthServer9CIdentity4NewLEmPNS_14CProtectionKeyEP7HBufC16 @ 21 NONAME
-	_ZN10AuthServer9CIdentity5NewLCEmPNS_14CProtectionKeyEP7HBufC16 @ 22 NONAME
-	_ZNK10AuthServer11CPluginDesc10MinEntropyEv @ 23 NONAME
-	_ZNK10AuthServer11CPluginDesc12ExternalizeLER12RWriteStream @ 24 NONAME
-	_ZNK10AuthServer11CPluginDesc14TrainingStatusEv @ 25 NONAME
-	_ZNK10AuthServer11CPluginDesc17FalseNegativeRateEv @ 26 NONAME
-	_ZNK10AuthServer11CPluginDesc17FalsePositiveRateEv @ 27 NONAME
-	_ZNK10AuthServer11CPluginDesc2IdEv @ 28 NONAME
-	_ZNK10AuthServer11CPluginDesc4NameEv @ 29 NONAME
-	_ZNK10AuthServer11CPluginDesc4TypeEv @ 30 NONAME
-	_ZNK10AuthServer12CIdAndString12ExternalizeLER12RWriteStream @ 31 NONAME
-	_ZNK10AuthServer12CIdAndString2IdEv @ 32 NONAME
-	_ZNK10AuthServer12CIdAndString6StringEv @ 33 NONAME
-	_ZNK10AuthServer14CProtectionKey10ClientKeyLEi @ 34 NONAME
-	_ZNK10AuthServer14CProtectionKey7KeyDataEv @ 35 NONAME
-	_ZNK10AuthServer19CAuthExpressionImpl12ExternalizeLER12RWriteStream @ 36 NONAME
-	_ZNK10AuthServer19CAuthExpressionImpl9InvariantEv @ 37 NONAME
-	_ZNK10AuthServer9CIdentity12ExternalizeLER12RWriteStream @ 38 NONAME
-	_ZNK10AuthServer9CIdentity2IdEv @ 39 NONAME
-	_ZNK10AuthServer9CIdentity3KeyEv @ 40 NONAME
-	_ZNK10AuthServer9CIdentity6StringEv @ 41 NONAME
-	_ZTIN10AuthServer11TSizeStreamE @ 42 NONAME ; #<TI>#
-	_ZTIN10AuthServer19CAuthExpressionImplE @ 43 NONAME ; #<TI>#
-	_ZTIN10AuthServer9CIdentityE @ 44 NONAME ; #<TI>#
-	_ZTVN10AuthServer11TSizeStreamE @ 45 NONAME ; #<VT>#
-	_ZTVN10AuthServer19CAuthExpressionImplE @ 46 NONAME ; #<VT>#
-	_ZTVN10AuthServer9CIdentityE @ 47 NONAME ; #<VT>#
-	KEnablePostMarketAuthenticationPlugins @ 48 NONAME DATA 1
-	_ZN10AuthServer19CAuthExpressionImpl21CreateAuthExprObjectLERK7TDesC16 @ 49 NONAME
-	_ZN10AuthServer19CAuthExpressionImpl28InsertSpaceBetweenOperatorsLERK7TDesC16R6RBuf16 @ 50 NONAME
-	_ZN10AuthServer11CAuthParams12InternalizeLER11RReadStream @ 51 NONAME
-	_ZN10AuthServer11CAuthParams4NewLE20TTimeIntervalSecondsi4TUidiRK7TDesC16 @ 52 NONAME
-	_ZN10AuthServer8AuthExprEv @ 53 NONAME
-	_ZNK10AuthServer11CAuthParams12ExternalizeLER12RWriteStream @ 54 NONAME
-	_ZTIN10AuthServer11CAuthParamsE @ 55 NONAME
-	_ZTVN10AuthServer11CAuthParamsE @ 56 NONAME
-

--- a/authenticationservices/authenticationserver/group/authclient.mmp	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* authclient.exe Implementation of authentication client
-*
-*/
-
-
-/**
- @file
-*/
-
-CAPABILITY ALL -TCB
-
-target authclient.dll
-targettype dll
-
-// this is a static, as opposed to polymorphic DLL
-UID				0x1000008D 0x102740FD
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-USERINCLUDE		../source/common
-USERINCLUDE		../source/client
-USERINCLUDE		../inc_private
-USERINCLUDE             ../inc/authserver
-
-SOURCEPATH		../source/client
-SOURCE			authclient.cpp
-SOURCE			authmgrclient.cpp
-SOURCE 			asyncresponsedecoder.cpp
-
-LIBRARY			euser.lib 
-LIBRARY			estor.lib 
-LIBRARY			efsrv.lib
-LIBRARY			random.lib
-LIBRARY			cryptography.lib
-LIBRARY			authcommon.lib scsclient.lib 
-SMPSAFE

--- a/authenticationservices/authenticationserver/group/authcommon.mmp	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* This DLL contains code which is common to the authentication
-* server and the client interface.
-*
-*/
-
-
-CAPABILITY All -TCB
-
-target			authcommon.dll
-targettype		dll
-
-// this is a static interface, as opposed to polymorphic DLL.
-UID				0x1000008D 0x102740FB
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-USERINCLUDE		../source/client
-
-USERINCLUDE		../source/common
-SOURCEPATH		../source/common
-SOURCE			identity.cpp
-SOURCE			protectionkey.cpp
-SOURCE			authexpression.cpp
-SOURCE			plugindesc.cpp
-SOURCE			idandstring.cpp
-SOURCE			authpatchdata.cpp
-SOURCE			authserveripc.cpp
-
-LIBRARY			estor.lib efsrv.lib euser.lib
-LIBRARY			cryptography.lib random.lib hash.lib
-SMPSAFE

--- a/authenticationservices/authenticationserver/group/authserver.mmp	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* authserver.exe Implementation of authentication server
-*
-*/
-
-
-/**
- @file
-*/
-
-CAPABILITY TrustedUI ProtServ ReadDeviceData WriteDeviceData Location SurroundingsDD UserEnvironment ReadUserData WriteUserData
-
-target authserver.exe
-targettype exe
-
-// this is an EXE and therefore does not need to
-// explicitly specify any further UIDs.  Therefore
-// specify the reserved UID twice.
-UID				0x102740FC 0x102740FC
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-USERINCLUDE		../source/server 
-USERINCLUDE		../source/common
-USERINCLUDE		../source/client
-USERINCLUDE		../inc/authserver
-USERINCLUDE		../inc_private
-
-SOURCEPATH		../source/server
-SOURCE			authserver.cpp
-SOURCE			authserversession.cpp
-SOURCE			authmain.cpp
-SOURCE			authdb.cpp
-SOURCE			transientkeyinfo.cpp
-SOURCE			encryptedprotectionkey.cpp
-SOURCE			transientkey.cpp
-
-SOURCE			evaluator.cpp
-SOURCE			pluginmgr.cpp
-SOURCE			pluginobserver.cpp
-SOURCE			trainingmgr.cpp
-SOURCE			authtransaction.cpp
-SOURCE			authrepository.cpp
-
-LIBRARY			ecom.lib edbms.lib estor.lib pbe.lib efsrv.lib euser.lib
-LIBRARY			cryptography.lib random.lib
-LIBRARY			authcommon.lib scsserver.lib
-LIBRARY			sectcbutil.lib
-LIBRARY			centralrepository.lib
-SMPSAFE
-

--- a/authenticationservices/authenticationserver/group/bld.inf	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Authentication Server implementation 
-*
-*/
-
-
-/**
- @file
-*/
-
-#include "../test/reftestplugin/group/bld.inf"
-
-PRJ_PLATFORMS
-DEFAULT GCCE
-
-PRJ_EXPORTS
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/authserver/authserver_client.h		/epoc32/include/authserver/authserver_client.h
-#endif
-../inc/authserver/authclient.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/authclient.h)
-../inc/authserver/authexpression.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/authexpression.h)
-../inc/authserver/authexpression.inl		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/authexpression.inl)
-../inc/authserver/auth_srv_errs.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/auth_srv_errs.h)
-../inc/authserver/authmgrclient.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/authmgrclient.h)
-../inc/authserver/authplugininterface.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/authplugininterface.h)
-../inc/authserver/authtypes.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/authtypes.h)
-../inc/authserver/identity.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/identity.h)
-../inc/authserver/plugindesc.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/plugindesc.h)
-../inc/authserver/plugindesc.inl			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/plugindesc.inl)
-../inc/authserver/protectionkey.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/protectionkey.h)
-../inc/authserver/aspubsubdefs.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/aspubsubdefs.h)
-../inc/authserver/idandstring.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/idandstring.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/authserver/log.h						/epoc32/include/authserver/log.h
-#endif
-../inc/authserver/authpatchdata.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(authserver/authpatchdata.h)
-
-
-// ROMKIT includes
-../inc/authserver.iby /epoc32/rom/include/authserver.iby
-
-
-#ifndef TOOLS
-#ifndef TOOLS2
-
-PRJ_MMPFILES
-
-authcommon.mmp
-authclient.mmp
-authserver.mmp
-
-
-PRJ_TESTMMPFILES
-../test/authtool/authtool.mmp
-../test/tauthkeys/tauthkeys.mmp
-../test/tauthdb/tauthdb.mmp
-../test/tauthcliserv/tauthcliserv.mmp
-../test/tauthplugins/testplugins.mmp
-../test/tauthplugins/tauthplugins.mmp
-../test/tAuthSvr/group/tAuthSvr.mmp
-../test/tAuthSvr/group/tAuthPlugin.mmp
-//Versions of tAuthSvr.mmp with different capabilities. wdd=WriteDeviceData, nc=NoCapabilities
-../test/tAuthSvr/group/tauthsvrwdd.mmp
-../test/tAuthSvr/group/tauthsvrnc.mmp
-../test/tAuthSvr/group/tauthpluginupgrade.mmp
-../test/tAuthSvr/group/tpostmarketramplugin.mmp
-../test/tauthplugins/testpluginsupgrade.mmp
-// Security Test.
-../test/securitytests/group/authsecuritytests.mmp
-
-makefile ../test/tAuthSvr/tpostmarketplugins/testdata/buildpostmarketplugintestdata.fil
-
-#endif // TOOLS2
-#endif // TOOLS
-
-PRJ_TESTEXPORTS
-../test/tauthkeys/scripts/tauthkeys.script /epoc32/winscw/c/tauth/tauthkeys/scripts/tauthkeys.script
-../test/tauthdb/scripts/tauthdb.script /epoc32/winscw/c/tauth/tauthdb/scripts/tauthdb.script
-../test/tauthcliserv/scripts/tauthcliserv.script /epoc32/winscw/c/tauth/tauthcliserv/scripts/tauthcliserv.script
-../test/tauthcliserv/scripts/tauthexpr.script /epoc32/winscw/c/tauth/tauthexpr/scripts/tauthexpr.script
-../test/tauthcliserv/scripts/tauthcliserv_debug.script /epoc32/winscw/c/tauth/tauthcliserv/scripts/tauthcliserv_debug.script
-../test/tauthplugins/scripts/tauthplugins.script /epoc32/winscw/c/tauth/tauthplugins/scripts/tauthplugins.script
-../test/tAuthSvr/scripts/tAuthSvr2.script   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tauthsvr2.script
-../test/tAuthSvr/scripts/tAuthSvr4.script   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tauthsvr4.script
-../test/tAuthSvr/scripts/tAuthSvr5.script   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tauthsvr5.script
-../test/tAuthSvr/scripts/tAuthSvr6.script   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tauthsvr6.script
-../test/tAuthSvr/scripts/tauthsvroom.script   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tauthsvroom.script
-../test/tAuthSvr/scripts/tauthsvrclock.script  	/epoc32/winscw/c/tauth/tauthsvr/scripts/tauthsvrclock.script
-../test/tAuthSvr/scripts/tauthsvroom.ini   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tauthsvroom.ini
-../test/tAuthSvr/scripts/tAuthSvr2.ini   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tauthsvr2.ini
-../test/tAuthSvr/scripts/tAuthSvr2_unicode.ini	/epoc32/winscw/c/tauth/tauthsvr/scripts/tauthsvr2_unicode.ini
-../test/tAuthSvr/testdata/AuthSvrPolicy.ini			/epoc32/winscw/c/tauth/tauthsvr/testdata/authsvrpolicy.ini
-../test/tAuthSvr/testdata/initialisation_Info.ini	/epoc32/winscw/c/tauth/tauthsvr/testdata/initialisation_info.ini
-../test/tAuthSvr/testdata/Pin11113100Db.ini		/epoc32/winscw/c/tauth/tauthsvr/testdata/pin11113100db.ini
-../test/tAuthSvr/testdata/Pin11113101Db.ini		/epoc32/winscw/c/tauth/tauthsvr/testdata/pin11113101db.ini
-../test/tAuthSvr/testdata/Pin11113102Db.ini		/epoc32/winscw/c/tauth/tauthsvr/testdata/pin11113102db.ini
-../test/tAuthSvr/testdata/Pin11113103Db.ini		/epoc32/winscw/c/tauth/tauthsvr/testdata/pin11113103db.ini
-../test/tAuthSvr/testdata/Pin11113104Db.ini		/epoc32/winscw/c/tauth/tauthsvr/testdata/pin11113104db.ini
-../test/tAuthSvr/testdata/cenrep1.txt			/epoc32/winscw/c/tauth/tauthsvr/testdata/cenrep1.txt
-../test/tAuthSvr/testdata/cenrep2.txt			/epoc32/winscw/c/tauth/tauthsvr/testdata/cenrep2.txt
-../test/tAuthSvr/testdata/cenrep3.txt			/epoc32/winscw/c/tauth/tauthsvr/testdata/cenrep3.txt
-../test/tAuthSvr/scripts/batchfiles/te_tauthsvr4_pre1.bat /epoc32/winscw/c/tauth/tauthsvr/scripts/batchfiles/te_tauthsvr4_pre1.bat
-../test/tAuthSvr/scripts/batchfiles/pretauthsvroom.bat	 /epoc32/winscw/c/tauth/tauthsvr/scripts/batchfiles/pretauthsvroom.bat
-../test/tAuthSvr/scripts/batchfiles/posttauthsvroom.bat	 /epoc32/winscw/c/tauth/tauthsvr/scripts/batchfiles/posttauthsvroom.bat
-../test/tAuthSvr/scripts/batchfiles/te_tauthsvr4_pre2.bat /epoc32/winscw/c/tauth/tauthsvr/scripts/batchfiles/te_tauthsvr4_pre2.bat
-../test/tAuthSvr/scripts/batchfiles/te_tauthsvr4_pre3.bat /epoc32/winscw/c/tauth/tauthsvr/scripts/batchfiles/te_tauthsvr4_pre3.bat
-../test/tAuthSvr/scripts/batchfiles/te_tauthsvr4_post1.bat /epoc32/winscw/c/tauth/tauthsvr/scripts/batchfiles/te_tauthsvr4_post1.bat
-../test/tAuthSvr/testdata/pinplugin_inactive.txt	/epoc32/winscw/c/tauth/tauthsvr/testdata/pinplugin_inactive.txt
-../inc/tAuthSvr.iby /epoc32/rom/include/tauthsvr.iby
-../test/tAuthSvr/scripts/batchfiles/post_tauthsvr.bat		/epoc32/winscw/c/tauth/tauthsvr/scripts/batchfiles/post_tauthsvr.bat
-
-
-
-// Files for PostMarketPlugin Support tests.
-../test/tAuthSvr/scripts/tpostmarketplugin.script   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tpostmarketplugin.script
-../test/tAuthSvr/scripts/tpostmarketpluginenabled_winscw.script   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tpostmarketpluginenabled_winscw.script
-../test/tAuthSvr/scripts/tpostmarketpluginenabled1_winscw.script   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tpostmarketpluginenabled1_winscw.script
-../test/tAuthSvr/scripts/tpostmarketplugin_macroenabled.script	/epoc32/winscw/c/tauth/tauthsvr/scripts/tpostmarketplugin_macroenabled.script
-../test/tAuthSvr/scripts/tpostmarketplugin.ini   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tpostmarketplugin.ini
-../test/tAuthSvr/tpostmarketplugins/testdata/epoc_enablepostmarketplugin.ini	/epoc32/data/epoc_enablepostmarketplugin.ini
-../test/tAuthSvr/tpostmarketplugins/testdata/epoc_patchdatapositive.ini	/epoc32/data/epoc_patchdatapositive.ini
-../test/tAuthSvr/tpostmarketplugins/testdata/epoc_patchdatanegative.ini	/epoc32/data/epoc_patchdatanegative.ini
-../test/tAuthSvr/scripts/batchfiles/pre_postmarketplugin.bat	/epoc32/winscw/c/tauth/tauthsvr/scripts/batchfiles/pre_postmarketplugin.bat
-../test/tAuthSvr/scripts/batchfiles/post_postmarketplugin.bat	/epoc32/winscw/c/tauth/tauthsvr/scripts/batchfiles/post_postmarketplugin.bat
-../test/tAuthSvr/scripts/batchfiles/pre_patchdata_negative.bat	/epoc32/winscw/c/tauth/tauthsvr/scripts/batchfiles/pre_patchdata_negative.bat
-../test/tAuthSvr/scripts/batchfiles/pre_patchdata_positive.bat	/epoc32/winscw/c/tauth/tauthsvr/scripts/batchfiles/pre_patchdata_positive.bat
-../test/tAuthSvr/testdata/Pin10234100Db.ini		/epoc32/winscw/c/tauth/tauthsvr/testdata/pin10234100db.ini
-
-// Files for ClientSid Support tests.
-../test/tAuthSvr/scripts/tclientsidsupport.script   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tclientsidsupport.script
-../test/tAuthSvr/scripts/tclientsidsupport.ini   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tclientsidsupport.ini
-../test/tAuthSvr/scripts/batchfiles/post_tclientsidsupport.bat		/epoc32/winscw/c/tauth/tauthsvr/scripts/batchfiles/post_tclientsidsupport.bat
-
-//Files for Auth Security Tests.
-../test/securitytests/scripts/authsecuritytests.script	/epoc32/winscw/c/tauth/securitytests/scripts/authsecuritytests.script
-../test/securitytests/scripts/authsecuritytests.ini	/epoc32/winscw/c/tauth/securitytests/scripts/authsecuritytests.ini
-
-//Files for performance tests.
-../test/tAuthSvr/scripts/tauthsvr_performance.script   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tauthsvr_performance.script
-../test/tAuthSvr/scripts/tauthsvr_performance.ini   	/epoc32/winscw/c/tauth/tauthsvr/scripts/tauthsvr_performance.ini
-../test/tAuthSvr/scripts/performance_log_parser.pl  	/epoc32/winscw/c/tauth/tauthsvr/scripts/performance_log_parser.pl 

--- a/authenticationservices/authenticationserver/group/security_authserver.history.xml	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<relnotes name="Authentication Services">
-  <purpose>
-  </purpose>
-
-  <minorchange revision="011">
-    Modifications to Interface classification and status from publishedall released to publishedpartner prototype
-  </minorchange>
-  
- <deliverystep number="211" name="Security: Enabling Authentication Provider Partners" osproject="Diran" revision="010">
-    <milestone project="GT0433" number="MS3.5"/>
-    <preq number="219" title="Enabling Authentication Provider Partners">
-      Reference Pin plugin added for the authentication Server
-    </preq>
-  </deliverystep>
-
- <deliverystep number="136" name="Security: Authentication Server" osproject="Diran" revision="009">
-    <milestone project="GT00433" number="MS3.4"/>
-    <preq number="218" title="Authentication Server">
-      This delivery step includes the new component Authentication Server and it's associated test code.
-    </preq>
-  </deliverystep>
-
-  <deliverystep number="496" name="EC073: Security: Crypto Services Header File Refactoring" osproject="Oghma" revision="008">
-	  <milestone project="GT0313" number="MS3.7"/>
-	  <ec number="73" title="Crypto Services Header File Refactoring (to simplify the SDK creation process)">
-		  Non-exported published functions made internal.
-	  </ec>
-  </deliverystep>
-  
-  <deliverystep number="708" name="Security - Alignment of CBR and System Model components" osproject="Oghma" revision="007">
-    <milestone project="GT0313" number="MS3.7"/>
-    <preq number="775" title="Alignment of CBR and System Model components">
-      Modified the ipr category of authtool.
-    </preq>
-  </deliverystep>
-
-  <defect number="DEF106230" title="Clean up build's tagscan errors" revision="006">
-    Removed tagscan errors.
-  </defect>
-
-  <ec number="075" title="Triage and address Coverity Errors in Security Subsystem" revision="005">
-    Fixed two problems in the trainingmgr.cpp file. The iResult variable was put on the CleanupStack in the CTrainingMgr::RegisterFirstIdentityL() method. It was a problem because this variable was already kept on the CleanupStack as a class member. Moreover, a potential memory leak was fixed in this method.
-  </ec>
-
-  <preq number="1182" title="GNU Make-based build system" revision="004">
-    TOOLS2 macro is added with TOOLS.
-  </preq>
-
-  <preq number="1182" title="GNU Make-based build system" revision="003">
-    Changed according to filename policy to support the building of Symbian OS on both Windows and Linux for the test code.
-  </preq>
-
-  <minorchange revision="002">
-    Removed the compile errors and the armv5 warning notes.
-  </minorchange>
-
-  <defect number="DEF102043" title="Makesis &amp; SWI assumes system drive is c:" revision="001">
-    Removed hardcoded references to C drive and replaced with system drive.
-  </defect>
-</relnotes>

--- a/authenticationservices/authenticationserver/group/security_authserver.mrp	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-component	security_authserver
-source	\sf\os\security\authenticationservices\authenticationserver
-binary	\sf\os\security\authenticationservices\authenticationserver\group	all
-exports	\sf\os\security\authenticationservices\authenticationserver\group
-
-notes_source	\component_defs\release.src
-
-
-#  == IPR section auto-inserted from distribution.policy files  ==
-ipr E 
-ipr T \sf\os\security\authenticationservices\authenticationserver\test
-
-# == end auto-inserted section ==

--- a/authenticationservices/authenticationserver/inc/authserver.iby	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-#ifndef __AUTHSERV_IBY__
-#define __AUTHSERV_IBY__
-
-define ZDRIVE \epoc32\data\z
-
-REM Authentication Server
-
-file=ABI_DIR\BUILD_DIR\authserver.exe		sys\bin\authserver.exe
-file=ABI_DIR\BUILD_DIR\authclient.dll		sys\bin\authclient.dll
-file=ABI_DIR\BUILD_DIR\authcommon.dll		sys\bin\authcommon.dll
-
-
-// When SYMBIAN_ENABLE_POST_MARKET_AUTHENTICATION_PLUGINS is defined, all plugins visible to 
-// the ECOM service will be loaded. By default it is not defined - only ROM based plugins 
-// will be loaded
-
-#ifdef SYMBIAN_ENABLE_POST_MARKET_AUTHENTICATION_PLUGINS
-patchdata authcommon.dll@KEnablePostMarketAuthenticationPlugins 0x01
-#endif
-
-#endif

--- a/authenticationservices/authenticationserver/inc/authserver/aspubsubdefs.h	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Authserver publish and subscribe properties.  
-*
-*/
-
-
-/**
- @file  
- @publishedAll
- @released
-*/
-
-#ifndef ASPUBSUBDEFS_H
-#define ASPUBSUBDEFS_H
-
-namespace AuthServer
-{
-/**
- * Used to write to and read from the publish and subscribe property
- * KUidAuthServerLastAuth. 
- *
- * @see KUidAuthServerLastAuth
- **/
-NONSHARABLE_STRUCT(TLastAuth)
-	{
-	TLastAuth() { Mem::FillZ(this, sizeof(TLastAuth)); }
-	/// The identities id number or KUnknownIdentity
-	TIdentityId iId;
-	/// The time of the authentication, 0 if unknown 
-	TTime       iAuthTime;
-	/// The highest number of combinations of the authentication methods
-	/// used
-	TEntropy    iMaxCombinations;
-	/// the lowest false positive rate of the methods used
-	TPercentage iFalsePositiveRate;
-	/// the lowest false negative rate of the methods used
-	TPercentage iFalseNegativeRate;
-	/// the number of factors (i.e. plugins) combined to make the
-	/// authentication
-	TInt32      iNumFactors;
-	};
-
-/**
- * This is the publish and subscribe property used by the Authentication
- * Server to publish the details of the last authentication. The
- * value is of type TLastAuth and can be retrieved using code such as:
- * <code>
- * TLastAuth lastAuth;
- * TPckg<TLastAuth> authPkg(lastAuth);
- * RProperty::Get(KAuthServerSecureId, KUidAuthServerLastAuth, authPkg);
- * </code>
- *
- * The property is published each time an authentication or deauthentication
- * is made, even if the same identity is authenticated. To be notified only
- * when the identity changes, subscribe to KUidAuthServerAuthChangeEvent.
- *
- */
-const TUint KUidAuthServerLastAuth = { 0x10281843 };
-
-
-/**
- * This is the publish and subscribe property used by the Authentication
- * Server to notify subscribers of a change of authenticated identity.  The
- * published value is of type TUint and will contain the id number of the last
- * identity authenticated.
- *
- * The property is published only when the identity changes, reauthentication
- * with a different method will not result in notification.
- *
- */
-const TUint KUidAuthServerAuthChangeEvent = { 0x10281845 };
-
-}
-
-#endif /*ASPUBSUBDEFS_H*/
-

--- a/authenticationservices/authenticationserver/inc/authserver/auth_srv_errs.h	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,183 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Contains the list of error values that may be returned. 
-*
-*/
-
-
-/**
- @file 
- @publishedAll
- @released
-*/
-
-#ifndef AUTH_SRV_ERRS_H
-#define AUTH_SRV_ERRS_H
-
-#include <e32def.h>
-
-/**
-	Attempted to internalize an invalid authentication expression stream.
-	
-	If this error occurs on the server side because the client
-	has sent an invalid externalization buffer they are panicked
-	with "AUTHSERVER 3", instead of being completed with this
-	error code.
-
-	This error should not occur if clients use the supplied
-	RAuthClient API.
- */
-const TInt KErrAuthServInvalidInternalizeExpr = -10800;
-
-/**
-	Attempted to internalize an authentication expression stream
-	with an unsupported version.
-	
-	The authentication server will complete an authentication
-	request with this value if the supplied stream has an
-	unsupported version number.
-
-	This error code is rare and is caused by sending a corrupt
-	externalized expression to the server, or if the expression
-	was internalized with an older version of the client code.
-	This error should not occur if clients use the supplied
-	RAuthClient API.
- */
-const TInt KErrAuthServUnsupportedExprVersion = -10801;
-
-/**
-    An attempt was made to reference a plugin by id number and no such 
-    plugin exists  
- **/
-const TInt KErrAuthServNoSuchPlugin = -10802;
-
-
-/**
-    An attempt was made to reference an identity by id number and no such 
-    identity exists  
- **/
-const TInt KErrAuthServNoSuchIdentity = -10803;
-
-/**
-    A plugin returns this on behalf of a user wanting to skip it.
- **/
-const TInt KErrAuthServPluginCancelled = -10804;
-
-/**
-    A plugin returns this on behalf of a user wanting to completely quit the
-    current operation.
- **/
-const TInt KErrAuthServPluginQuit = -10805;
-
-
-/**
-    This error is reported when an operation is attempted for which an
-    authentication must have already been performed.
- **/
-const TInt KErrAuthServAuthenticationRequired = -10806;
-
-/**
-	Attempted to add a new identity to the authentication
-	server database with an existing ID.
- */
-const TInt KErrAuthServIdentityAlreadyExists = -10807;
-
-/**
-	Attempted to set or retrieve a description for an identity,
-	or remove an identity which was not in the authentication database.
- */
-const TInt KErrAuthServIdentityNotFound = -10808;
-
-/**
-	Attempted to remove or retrieve the key info for
-	a training record that was not in the authentication
-	database.
- */
-const TInt KErrAuthServTrainingNotFound = -10809;
-
-/**
-    This error is reported when the authserver has not been able to register a
-    new identity due to no plugins training successfully.
- **/
-const TInt KErrAuthServRegistrationFailed = -10810;
-
-
-/**
-    This error is reported when an authclient attempts to remove the last
-    identity.
- **/
-const TInt KErrAuthServCanNotRemoveLastIdentity = -10811;
-
-
-/**
-    This error is reported when an authclient attempts to remove the last
-    trained plugin for an identity.
- **/
-const TInt KErrAuthServCanNotRemoveLastPlugin = -10812;
-
-
-/**
-    This error is reported when an attempt to use an inactive plugin is made.
- **/
-const TInt KErrAuthServPluginNotActive = -10813;
-
-/**
-	Client attempted to create an identity with a description
-	longer than 255 characters, or to change an existing identity's
-	description to use more than 255 characters.
- */
-const TInt KErrAuthServDescTooLong = -10814;
-
-/**
-	This error is reported when the authentication strength alias
-	supplied by the client is not found in the authserver's
-	central repository file.
- */
-
-const TInt KErrUnknownAuthStrengthAlias = -10815;
-
-/**
-	This error is reported when an authentication strength in 
-	the authserver's central repository file is undefined.
- */
-
-const TInt KErrAuthStrengthAliasNotDefined = -10816;
-
-/**
-	This error is reported when an alias string defining an
-	authentication strength in the authserver's central repository 
-	file contains expression other than plugin Id, plugin Types 
-	and operators ("& and "|").
- */
-
-const TInt KErrAuthServInvalidAliasStringExpression = -10817;
-
-
-/**
-    This error is reported when an authclient attempts to remove the default
-    identity.
- */
-const TInt KErrAuthServCanNotRemoveDefaultIdentity = KErrAuthServCanNotRemoveLastIdentity;
-
-/**
-    This error is reported when an authentication manager client attempts to 
-    reset an identity and this may result in zero plugins registering the new identity data.
-    This can happen if a reset request is issued for all plugins registered for an identity 
-    and none of the plugins are of knowledge type.
- */
-const TInt KErrAuthServResetMayLoseIdentity = -10818;
-
-#endif	// #ifndef AUTH_SRV_ERRS_H
-

--- a/authenticationservices/authenticationserver/inc/authserver/authclient.h	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* RAuthclient - external authentication client session interface
-* The defined fuctionality is used by clients to access the authentication
-* server.
-* The access to a specific functionality is dependant on the client 
-* capabilities and may be restricted.             
-*
-*/
-
-
-/**
- @file 
- @publishedAll
- @released
-*/
-
-#ifndef AUTHCLIENT_H
-#define AUTHCLIENT_H
-
-#include "authserver/identity.h"
-#include "authserver/authexpression.h"
-#include "authserver/plugindesc.h"
-#include "authserver/idandstring.h"
-#include <scs/scsclient.h>
-namespace AuthServer
-{
-
-class CAsyncResponseDecoder;
-
-/**
- * Client side interface to the authentication server providing general
- * authentication and plugin query services.
- *
- */	
-class RAuthClient : public RScsClientBase
-	{
-	
-	friend class CAsyncResponseDecoder;
-	
-public:
-
-    IMPORT_C RAuthClient();
-    
-	IMPORT_C TInt Connect();
-
-	IMPORT_C void AuthenticateL(
-	    const CAuthExpression& aExpression,
-	    TTimeIntervalSeconds   aTimeout,
-		TBool                  aClientSpecificKey,
-		TBool                  aWithString,
-	    CIdentity*&            aIdentityResult, 
-	    TRequestStatus&        aStatus);
-	
-	IMPORT_C CIdentity* AuthenticateL(
-	    const CAuthExpression& aExpression,
-	    TTimeIntervalSeconds   aTimeout,
-		TBool                  aClientSpecificKey,
-		TBool                  aWithString);
-
-	IMPORT_C CIdentity* AuthenticateL(
-			const CAuthExpression& 	aAuthExpression,
-		    TTimeIntervalSeconds   	aTimeout,
-			TBool                  	aClientSpecificKey,
-			TUid 				   	aClientSid,
-			TBool                  	aWithString,
-			const TDesC&			aClientMessage);
-			
-	IMPORT_C void AuthenticateL(
-		const CAuthExpression& 	aAuthExpression,
-	    TTimeIntervalSeconds   	aTimeout,
-		TBool                  	aClientSpecificKey,
-		TUid 					aClientSid,
-		TBool                  	aWithString,
-	    const TDesC&			aClientMessage,
-	    CIdentity*&            	aIdentityResult,
-	    TRequestStatus&        	aStatus
-		);
-
-	IMPORT_C void DeauthenticateL();
-	
-	IMPORT_C void PluginsL(RPluginDescriptions& aPluginList);
-	IMPORT_C void ActivePluginsL(RPluginDescriptions& aPluginList);
-	IMPORT_C void PluginsOfTypeL(TAuthPluginType aType,
-								  RPluginDescriptions& aPluginList);
-	
-	IMPORT_C void PluginsWithTrainingStatusL(
-        TAuthTrainingStatus aStatus,
-		RPluginDescriptions& aPluginList);
-	
-	IMPORT_C void IdentitiesL(RIdentityIdArray& aIdList);
-	IMPORT_C void IdentitiesWithStringL(RIdAndStringArray& aList);
-
-	IMPORT_C HBufC* IdentityStringL(TIdentityId aId);
-	IMPORT_C void SetIdentityStringL(TIdentityId aId, const TDesC& aString);
-	
-	IMPORT_C TPluginId PreferredTypePluginL(TAuthPluginType aPluginType);
-	
-	IMPORT_C TUint Cancel();
-	IMPORT_C void Close();
-	
-	IMPORT_C void ListAuthAliasesL(RPointerArray<HBufC>& aAuthAliasList);
-	
-	IMPORT_C CAuthExpression* CreateAuthExpressionL(const TDesC& aAuthString) const;
-	
-protected:
-	/* @internalComponent */
-	void CheckAsyncDecoderL();
-	/* @internalComponent */
-	HBufC8* SendReceiveBufferLC(TInt aMessage);
-	/* @internalComponent */
-	HBufC8* SendReceiveBufferLC(TInt aMessage, TIpcArgs& aArgs);
-	
-private:
-	TInt StartAuthServer();
-
-protected:
-	CAsyncResponseDecoder* iAsyncResponseDecoder;
-};
-  
-} // namespace
-#endif
-

--- a/authenticationservices/authenticationserver/inc/authserver/authexpression.h	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* CAuthExpression declaration
-*
-*/
-
-
-/**
- @file 
- @publishedAll
- @released
-*/
-
-#ifndef AUTHEXPRESSION_H
-#define AUTHEXPRESSION_H
-
-#include <s32strm.h>
-#include "authserver/authtypes.h"
-
-
-namespace AuthServer
-{
-
-
-class CAuthExpression : public CBase
-/**
-	Describes an authentication expression.
-
-	AuthServer clients construct expressions using
-	AuthExpr, combined with AuthAnd and AuthOr, or
-	the equivalent overloaded & and | operators.
-
-	@see AuthExpr
-	@see AuthAnd
-	@see AuthOr
- */
-	{
-public:
-	/**
-		Externalize this object to the supplied stream.
-
-		@param	aWriteStream Stream to write persistent state to.
-	 */
-	virtual void ExternalizeL(RWriteStream& aWriteStream) const = 0;
-	};
-
-
-class TAuthExpressionWrapper
-/**
-	Simple wrapper around a pointer to an authentication
-	expression.  It is defined so the binary & and | operators
-	can be overloaded to generate concise expressions.
-	
-	Like CAuthExpression, this class should not be
-	used directly by clients, but via the AuthExpr,
-	AuthAnd, and AuthOr functions, or via the overloaded
-	& and | operators.  For this reason, the constructors
-	are not exported.
-	
-	@see AuthExpr
-	@see AuthAnd
-	@see AuthOr
- */
-	{
-public:
-	/* @internalComponent*/
-	TAuthExpressionWrapper(CAuthExpression* aExpression);
-	/* @internalComponent */
-	TAuthExpressionWrapper(TAuthPluginType aType);
-	/* @internalComponent */
-	TAuthExpressionWrapper(TPluginId aPluginId);
-	/* @internalComponent */
-	TAuthExpressionWrapper();
-	
-	inline operator CAuthExpression*();
-	
-private:
-	/**
-		Pointer to the referenced authentication expression.
-		This is NULL in OOM.
-	 */
-	CAuthExpression*const iPtr;
-	};
-
-
-IMPORT_C TAuthExpressionWrapper AuthExpr(TAuthPluginType aType);
-IMPORT_C TAuthExpressionWrapper AuthExpr(TPluginId aPluginId);
-IMPORT_C TAuthExpressionWrapper AuthExpr();
-
-IMPORT_C TAuthExpressionWrapper AuthOr(CAuthExpression* aLeft, CAuthExpression* aRight);
-IMPORT_C TAuthExpressionWrapper AuthAnd(CAuthExpression* aLeft, CAuthExpression* aRight);
-
-
-#define AUTH_EXPR_BINARY_OPS
-#ifdef AUTH_EXPR_BINARY_OPS
-
-// These binary operators provide a more concise way to write
-// authentication expressions than AuthOr and AuthAnd.  However,
-// their behaviour - dynamically allocating from the heap - is
-// non-obvious to a reader, so they are left as a build-time
-// option.
-
-inline TAuthExpressionWrapper operator&(TAuthExpressionWrapper aLeft, TAuthExpressionWrapper aRight);
-inline TAuthExpressionWrapper operator|(TAuthExpressionWrapper aLeft, TAuthExpressionWrapper aRight);
-
-#endif
-
-
-}	// namespace AuthServer
-
-#include "authserver/authexpression.inl"
-
-#endif // EXPRESSION_H

--- a/authenticationservices/authenticationserver/inc/authserver/authexpression.inl	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* @publishedAll
-* @released
-*
-*/
-
-
-#ifndef AUTHEXPRESSION_INL
-#define AUTHEXPRESSION_INL
-
-#include "authserver/authexpression.h"
-
-namespace AuthServer
-{
-
-
-// -------- TAuthExpressionWrapper --------
-
-
-inline TAuthExpressionWrapper::operator CAuthExpression*()
-/**
-	Conversion operator recasts this object as a
-	pointer to the contained authorisation expression.
- */
-	{
-	return iPtr;
-	}
-
-
-#ifdef AUTH_EXPR_BINARY_OPS
-
-
-inline TAuthExpressionWrapper operator&(TAuthExpressionWrapper aLeft, TAuthExpressionWrapper aRight)
-/**
-	This overloaded operator is a wrapper around a call to AuthAnd.
-	See AuthAnd for a full description.	
-	
-	@param	aLeft			Left subexpression.
-	@param	aRight			Right subexpression.
-	@return					Wrapper around new complex AND expression,
-							which is NULL if could not allocate.
-	@see AuthAnd
- */
-	{
-	return AuthAnd(aLeft, aRight);
-	}
-
-
-inline TAuthExpressionWrapper operator|(TAuthExpressionWrapper aLeft, TAuthExpressionWrapper aRight)
-/**
-	This overloaded operator is a wrapper around a call to AuthOr
-	See AuthOr for a full description.	
-	
-	@param	aLeft			Left subexpression.
-	@param	aRight			Right subexpression.
-	@return					Wrapper around new complex OR expression,
-							which is NULL if could not allocate.
-	@see AuthOr
- */
-	{
-	return AuthOr(aLeft, aRight);
-	}
-
-
-#endif	// #ifdef AUTH_EXPR_BINARY_OPS
-
-
-}	// namespace AuthServer
-
-
-#endif	// AUTHEXPRESSION_INL
-

--- a/authenticationservices/authenticationserver/inc/authserver/authmgrclient.h	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* RAuthMgrClient - external authentication client session interface
-* The defined fuctionality is used by clients to access the authentication
-* server for the purpose of managing identities.
-* The access to a specific functionality is dependant on the client 
-* capabilities and may be restricted.             
-*
-*/
-
-
-/**
- @file 
- @publishedAll
- @released
-*/
-
-#ifndef AUTHMGRCLIENT_H
-#define AUTHMGRCLIENT_H
-
-#include "authserver/authclient.h"
-
-namespace AuthServer
-{
-
-/**
- * Client side interface to the authentication server providing identity
- * management services.
- */	
-class RAuthMgrClient : public RAuthClient
-	{
-public:
-
-	IMPORT_C void RegisterIdentityL(CIdentity*& aIdentity,
-								   const TDesC& aDescription,  
-								   TRequestStatus& aRequest);
-
-	IMPORT_C void RemoveIdentityL(TIdentityId aId);
-
-
-	IMPORT_C void TrainPlugin(TIdentityId aId,
-							  TPluginId aPlugin,
-							  TRequestStatus& aRequest);
-
-	IMPORT_C void ForgetPluginL(TIdentityId aId,
-					  TPluginId aPlugin);
-
-	IMPORT_C void SetPreferredTypePluginL(TAuthPluginType aPluginType,
-										  TPluginId aPluginId);
-
-	IMPORT_C void ResetIdentityL(TIdentityId aId,
-								const TDesC& aRegistrationInformation);
-
-	IMPORT_C void ResetIdentityL(TIdentityId aId,
-								TAuthPluginType aPluginType,
-								const TDesC& aRegistrationInformation);
-
-	IMPORT_C void ResetIdentityL(TIdentityId aId,
-								RArray<TPluginId>& aPluginIdList,
-								RPointerArray<const HBufC>& aRegistrationInformation);
-	};
-} // namespace
-#endif

--- a/authenticationservices/authenticationserver/inc/authserver/authpatchdata.h	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-/**
- @file 
- @publishedPartner
- @released
-*/
-
-#include <e32base.h>
-
- /**
-   This 8-bit variable is used in agent resolution. It is used to override AuthServer's 
-   default resolution behaviour of only loading plugins from the ROM drive. 
-   Compile time value is 0 - default behaviour. 
-   When non-zero, Authserver will load all plugins visible to the ECOM service regardless of 
-   the drive. 
-   This variable is changed at ROM build time using the patchdata obey keyword.
-   See Symbian OS Developer Library documentation on how to patch DLL data exports.
-   */
-   
-IMPORT_C extern const TUint8 KEnablePostMarketAuthenticationPlugins;
-

--- a/authenticationservices/authenticationserver/inc/authserver/authplugininterface.h	Thu Apr 01 00:24:41 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,276 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* CAuthPluginInterface 
-*
-*/
-
-
-/**
- @file 
- @publishedAll
- @released
-*/
-
-#ifndef AUTHPLUGININTERFACE_H
-#define AUTHPLUGININTERFACE_H
-
-
-#include <authserver/authtypes.h>
-#include <ecom/implementationinformation.h>
-
-namespace AuthServer
-{
-
-/// The interface UID for the authentication plugin interface
-const TUid KCAuthPluginInterfaceUid = { 0x102740FE }; 
-
-
-/**
- * The ECOM interface for authentication plugins. An authentication plugin is
- * used to help identify the current device holder. When a plugin is asked to
- * identify the holder, it interacts with the user and potentially hardware or
- * services provided by other servers. The plugin then generates some data
- * which is unique and repeatable for the input recieved. This data should
- * not be persisted on the device in any form that can easily be used to
- * recover the data.
- *
- * For example, a plugin might request a PIN number from the user. The plugin
- * will take the number, perhaps compare the hash of the number against the
- * hashes recorded during training and if a match is found return the identity
- * along with some unique data associated with it.
- *
- */	
-class CAuthPluginInterface : public CBase
-	{
-public:
-
-	/**
-	 * @return the id of the plugin. This should be the ECOM implementation id.
-	 **/
-	virtual TPluginId Id() const = 0;
-
-	/**
-	 *
-	 * @return the name of the plugin.
-	 * 
-	 **/
-	virtual const TPtrC& Name() const = 0;
-	
-	/**
-	 *
-	 * @return a description of the plugin.
-	 * 
-	 **/
-	virtual const TPtrC& Description() const = 0;
-
-	/**
-	 *
-	 * @return the minimum entropy of the plugin.
-	 * 
-	 **/
-	virtual TEntropy MinEntropy() const = 0;
-	
-	/**
-	 *
-	 * @return the rate of false positive identifications.
-	 * 
-	 **/
-	virtual TPercentage FalsePositiveRate() const = 0;
-
-	/**
-	 *
-	 * @return the rate of false negative identifications.
-	 * 
-	 **/
-	virtual TPercentage FalseNegativeRate() const = 0;
-
-	/**
-	 *
-	 * @return the type of plugin
-	 * 
-	 **/
-	virtual TAuthPluginType Type() const = 0;
-
-	/**
-	 * Performs actions required to identify the current device holder. 
-	 *
-	 * For details see the reference/test implementation of a knowledge-type 
-	 * plugin called the pinplugin.
-	 *
-	 * @param aId in the event of a successfull call, aId will be set to the
-	 * id of the identity. The value is not modified otherwise. It should be
-	 * noted that a successful call includes the possibility of not
-	 * recognising the user in which case aId should be set to
-	 * KUnknownIdentity.
-	 *
-	 * @param aClientMessage A displayable text string parameter for authentication
-	 * requests.It shall be passed to plug-ins to display to the users.
-	 *
-	 * @param aResult in the event of a successfull call, aResult contains the
-	 * data generated from the identification process. This data is used by
-	 * the authentication server to generate a transient key which in turn is
-	 * used to decrypt the identities protection key. If the call was
-	 * unsuccessful or the user is unknown no buffer will be created. Ownership of 
-	 * the buffer is transfered to the caller.
-	 *
-	 * @param aRequest the request status through which the caller will be
-	 * notified of completion. Upon completion, the status value will be one of the
-	 * following :
-	 * KErrNone if the identification process is successful.
-	 * KErrAuthServPluginCancelled if the user cancels the identification process for
-	 * this plugin.
-	 * KErrAuthServPluginQuit if the user quits the whole identification
-	 * process.
-	 * ... or any of the system wide error codes.
-	 **/
-
-
-	virtual void Identify(TIdentityId& aId, const TDesC& aClientMessage, 
-						  HBufC8*& aResult, TRequestStatus& aRequest) = 0;
-
-	/**
-	 * Cancel the current action. This method must complete with KErrCancel
-	 * any outstanding asyncronous requests such as Train or Identify.
-	 **/
-
-
-	virtual void Cancel() = 0;
-	
-	/**
-	 * This method tells the plugin to operate in training mode. After the
-	 * successful this method the plugin should be able to correctly identify
-	 * the specified identity using the Identify method. If the plugin already
-	 * has existing training data for the identity then the data should be
-	 * replaced. Care should be taken to allow the user to cancel or quit the
-	 * training without losing the existing training.  
-	 * 
-	 * @param aId the identity for whom to train the plugin. This allows the
-	 * plugin to persist training data associated with the identity and delete
-	 * or update that data later on.
-	 *
-	 * @param aResult this buffer will be filled with data that matches the
-	 * current device holder. This should be the same data as is returned by
-	 * the Identify method for the same identity. Ownership of the buffer is 
-	 * transfered to the caller.
-	 *
-	 * @param aRequest the request status through which the caller will be
-	 * notified of completion. Upon completion the status value will be one of the
-	 * following :
-	 * KErrNone if the training process is successful.
-	 * KErrAuthServPluginCancelled if the user cancels the training process for
-	 * this plugin.
-	 * KErrAuthServPluginQuit if the user quits the whole training
-	 * process.
-	 * ... or any of the system wide error codes.
-	 **/
-
-
-	 virtual void Train(TIdentityId aId, HBufC8*& aResult,
-						TRequestStatus& aRequest) = 0;
-
-	/**
-	 * @return true if the plugin can be used for identification or training
-	 * purposes without further user intervention. 
-	 **/
-
-
-	virtual TBool IsActive() const = 0;
-	
-	/**
-	 * Remove any stored training data for the specified identity. This is
-	 * used if an identity is being removed from the device. No user
-	 * interaction should take place as a result of this call.
-	 *
-	 * @param aId the identity for whom to remove any persisted training data.
-	 *
-	 * @return KErrNone if the operation is successful.
-	 * @return KErrAuthServNoSuchIdentity if the TIdentityId wasn't recognised.
-	 * @return ... or any of the system wide error codes.
-	 **/
-
-
-	 virtual TInt Forget(TIdentityId aId) = 0;
-
-	/**
-	 * Pretend the device holder has identified themselves using a default
-	 * entry. For example, a pin number plugin would return the same data as
-	 * if the holder had entered the default pin. This call is used during the
-	 * creation of the initial device identity and allows the device to be
-	 * operated without the user being forced to train plugins the first time
-	 * the device is started. No user interaction should take place as a
-	 * result of this call.
-	 *
-	 * Only plugins of type EAuthKnowledge should support default
-	 * data. Plugins of other types will be ignored.
-	 *
-	 * @param aId The identity that will be registered using the default data. 
-	 * 
-	 * @param aOutputBuf This buffer should be filled with the data that would
-	 * be generated if the phone holder identified themselves using the
-	 * default manner. Ownership of the buffer is transfered to the caller. 
-	 *
-	 * @return KErrNone if the plugin supports default data.
-	 * @return KErrNotSupported if the plugin doesn't support default data.
-	 * @return ... or any of the system wide error codes.
-	 **/
-
-
-	 virtual TInt DefaultData(TIdentityId aId, HBufC8*& aOutputBuf) = 0;
-
-	/**
-	 * This method tells the plugin to remove the training data held for the given identity 
-	 * and to regenerate it using the supplied registration data. The intent of this method 
-	 * is to allow a backend reset of user credentials in situations where the user is not 
-	 * able to provide the credentials for some reason (for instance the user has forgotten 
-	 * the password). Note that no user interaction should take place as a result of this call. 
-	 * Since the registration data may not be usable by all plugin types it is expected that only 
-	 * EAuthKnowledge type plugins (those based on pins, passphrases, etc.) use this data for 
-	 * registering the user and return the result.
-	 *
-	 * @param aId The identity whose training data should be reset. 
-	 * 
-	 * @param aRegistrationData The data that can be used to register the identity. 
-	 * This data is meaningful for EAuthKnowledge type plugins. Other plugins may choose to 
-	 * ignore this parameter. An empty descriptor signifies the absence of registration data.
-	 *
-	 * @param aResult This buffer will be filled with data that matches the specified identity. 
-	 * This should be the same data subsequently returned by the Identify method for the same identity. 
-	 * Note that plugins that aren't supplied registration data or those that don't use the supplied 
-	 * registration data for the reset can return NULL. Ownership of the buffer is transfered to 
-	 * the caller.
-	 *
-	 * @return KErrNone if the plugin is successfully able to either remove and/or reset the training data.
-	 * @return KErrNotSupported if the plugin doesn't support a reset functionality.
-	 * @return ... or any of the system wide error codes.
-	 **/
-
-
-	 virtual TInt Reset(TIdentityId aId, const TDesC& aRegistrationData, 
-			 			HBufC8*& aResult) = 0;
-	
-	/**
-	 * 
-	 * Destructor.
-	 * 
-	 **/
-
-
-	virtual ~CAuthPluginInterface() {};
-	
-};	
-
-} // namespace
-
-#endif