--- a/group/vpnclient_version_update.flm Tue Jan 26 12:56:20 2010 +0200
+++ b/group/vpnclient_version_update.flm Tue Feb 02 00:53:00 2010 +0200
@@ -2,9 +2,9 @@
# 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 "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/group/vpnclient_version_update.xml Tue Jan 26 12:56:20 2010 +0200
+++ b/group/vpnclient_version_update.xml Tue Feb 02 00:53:00 2010 +0200
@@ -4,9 +4,9 @@
# 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 "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/vpnengine/ikecert/bwins/IKECERTU.DEF Tue Jan 26 12:56:20 2010 +0200
+++ b/vpnengine/ikecert/bwins/IKECERTU.DEF Tue Feb 02 00:53:00 2010 +0200
@@ -1,40 +1,40 @@
EXPORTS
- ??0CIkeCaList@@QAE@H@Z @ 1 NONAME ; CIkeCaList::CIkeCaList(int)
- ??1CIkeCaElem@@UAE@XZ @ 2 NONAME ; CIkeCaElem::~CIkeCaElem(void)
- ??1CIkeV1PkiService@@UAE@XZ @ 3 NONAME ; CIkeV1PkiService::~CIkeV1PkiService(void)
- ??1CIkeV2PkiService@@UAE@XZ @ 4 NONAME ; CIkeV2PkiService::~CIkeV2PkiService(void)
- ?CaList@CIkeV1PkiService@@QAEPAVCIkeCaList@@XZ @ 5 NONAME ; class CIkeCaList * CIkeV1PkiService::CaList(void)
- ?CaList@CIkeV2PkiService@@QBEABVCIkeCaList@@XZ @ 6 NONAME ; class CIkeCaList const & CIkeV2PkiService::CaList(void) const
- ?CastCertArray@IkePkiUtils@@CAPBV?$CArrayFixFlat@PAVTCertPayloadIkev2@@@@PBV?$CArrayFixFlat@PB$$CBVTCertificateISAKMP@@@@@Z @ 7 NONAME ; class CArrayFixFlat<class TCertPayloadIkev2 *> const * IkePkiUtils::CastCertArray(class CArrayFixFlat<class TCertificateISAKMP const *> const *)
- ?Certificate@CIkeCaElem@@QBEPAVCX509Certificate@@XZ @ 8 NONAME ; class CX509Certificate * CIkeCaElem::Certificate(void) const
- ?CertifyIdentityL@IkePkiUtils@@SAHPBVCX509Certificate@@AAVTDesC8@@H@Z @ 9 NONAME ; int IkePkiUtils::CertifyIdentityL(class CX509Certificate const *, class TDesC8 &, int)
- ?GetCertSubjectNameDERL@IkePkiUtils@@SAHPBVCX509Certificate@@AAVTDes8@@@Z @ 10 NONAME ; int IkePkiUtils::GetCertSubjectNameDERL(class CX509Certificate const *, class TDes8 &)
- ?GetCertificate@CIkeV1PkiService@@QAEPAVHBufC8@@XZ @ 11 NONAME ; class HBufC8 * CIkeV1PkiService::GetCertificate(void)
- ?GetCertificateFieldDERL@IkeCert@@SAPAVHBufC8@@PAV2@H@Z @ 12 NONAME ; class HBufC8 * IkeCert::GetCertificateFieldDERL(class HBufC8 *, int)
- ?GetCertificateFieldDERL@IkeCert@@SAPAVHBufC8@@PBVCX509Certificate@@H@Z @ 13 NONAME ; class HBufC8 * IkeCert::GetCertificateFieldDERL(class CX509Certificate const *, int)
- ?GetIdentityFromCertL@IkePkiUtils@@SAPAVHBufC8@@EABVTDesC8@@@Z @ 14 NONAME ; class HBufC8 * IkePkiUtils::GetIdentityFromCertL(unsigned char, class TDesC8 const &)
- ?GetSubjectAltNameDataL@IkeCert@@SAPAVHBufC8@@PBVCX509Certificate@@E@Z @ 15 NONAME ; class HBufC8 * IkeCert::GetSubjectAltNameDataL(class CX509Certificate const *, unsigned char)
- ?GetTrustedCA@CIkeV1PkiService@@QAEPAVHBufC8@@XZ @ 16 NONAME ; class HBufC8 * CIkeV1PkiService::GetTrustedCA(void)
- ?GetTrustedICA1@CIkeV1PkiService@@QAEPAVHBufC8@@XZ @ 17 NONAME ; class HBufC8 * CIkeV1PkiService::GetTrustedICA1(void)
- ?GetTrustedICA2@CIkeV1PkiService@@QAEPAVHBufC8@@XZ @ 18 NONAME ; class HBufC8 * CIkeV1PkiService::GetTrustedICA2(void)
- ?I1CertificateData@CIkeV2PkiService@@QBEABVTDesC8@@XZ @ 19 NONAME ; class TDesC8 const & CIkeV2PkiService::I1CertificateData(void) const
- ?I2CertificateData@CIkeV2PkiService@@QBEABVTDesC8@@XZ @ 20 NONAME ; class TDesC8 const & CIkeV2PkiService::I2CertificateData(void) const
- ?Ikev1SignatureL@CIkeV1PkiService@@QAEHABVTDesC8@@PAVCIkeData@@0AAVTDes8@@@Z @ 21 NONAME ; int CIkeV1PkiService::Ikev1SignatureL(class TDesC8 const &, class CIkeData *, class TDesC8 const &, class TDes8 &)
- ?Ikev2SignatureL@CIkeV2PkiService@@QAEHABVTDesC8@@ABVTOwnCertInfo@@0AAVTDes8@@E@Z @ 22 NONAME ; int CIkeV2PkiService::Ikev2SignatureL(class TDesC8 const &, class TOwnCertInfo const &, class TDesC8 const &, class TDes8 &, unsigned char)
- ?ImportCACertsL@CIkeV1PkiService@@QAEHPAV?$CArrayFixFlat@PAUTCertInfo@@@@@Z @ 23 NONAME ; int CIkeV1PkiService::ImportCACertsL(class CArrayFixFlat<struct TCertInfo *> *)
- ?InitIkeV2PkiService@CIkeV2PkiService@@QAEXPBVCIkeData@@@Z @ 24 NONAME ; void CIkeV2PkiService::InitIkeV2PkiService(class CIkeData const *)
- ?KeyHash@CIkeCaElem@@QBEABVTDesC8@@XZ @ 25 NONAME ; class TDesC8 const & CIkeCaElem::KeyHash(void) const
- ?NewL@CIkeCaElem@@SAPAV1@PAVHBufC8@@@Z @ 26 NONAME ; class CIkeCaElem * CIkeCaElem::NewL(class HBufC8 *)
- ?NewL@CIkeV1PkiService@@SAPAV1@PAVCIkeData@@AAVMIkeDebug@@@Z @ 27 NONAME ; class CIkeV1PkiService * CIkeV1PkiService::NewL(class CIkeData *, class MIkeDebug &)
- ?NewL@CIkeV2PkiService@@SAPAV1@AAVMIkeV2PkiServiceObserver@@AAVMIkeDebug@@@Z @ 28 NONAME ; class CIkeV2PkiService * CIkeV2PkiService::NewL(class MIkeV2PkiServiceObserver &, class MIkeDebug &)
- ?ReadChainL@CIkeV1PkiService@@QAEHPAVCIkeData@@PBVHBufC8@@@Z @ 29 NONAME ; int CIkeV1PkiService::ReadChainL(class CIkeData *, class HBufC8 const *)
- ?ReadTrustedUserCertificateL@CIkeV2PkiService@@AAEXXZ @ 30 NONAME ; void CIkeV2PkiService::ReadTrustedUserCertificateL(void)
- ?ReadUserCertWithNameL@CIkeV1PkiService@@QAEHABVTDesC8@@PAVCIkeData@@H@Z @ 31 NONAME ; int CIkeV1PkiService::ReadUserCertWithNameL(class TDesC8 const &, class CIkeData *, int)
+ ?Ikev2SignatureL@CIkeV2PkiService@@QAEHABVTDesC8@@ABUTOwnCertInfo@@0AAVTDes8@@E@Z @ 1 NONAME ; int CIkeV2PkiService::Ikev2SignatureL(class TDesC8 const &, struct TOwnCertInfo const &, class TDesC8 const &, class TDes8 &, unsigned char)
+ ?VerifyIkev2SignatureL@IkePkiUtils@@SAHABVTDesC8@@0ABVCX509Certificate@@@Z @ 2 NONAME ; int IkePkiUtils::VerifyIkev2SignatureL(class TDesC8 const &, class TDesC8 const &, class CX509Certificate const &)
+ ?CaList@CIkeV2PkiService@@QBEABVCIkeCaList@@XZ @ 3 NONAME ; class CIkeCaList const & CIkeV2PkiService::CaList(void) const
+ ?NewL@CIkeV1PkiService@@SAPAV1@PAVCIkeData@@AAVMIkeDebug@@@Z @ 4 NONAME ; class CIkeV1PkiService * CIkeV1PkiService::NewL(class CIkeData *, class MIkeDebug &)
+ ?NewL@CIkeCaElem@@SAPAV1@PAVHBufC8@@@Z @ 5 NONAME ; class CIkeCaElem * CIkeCaElem::NewL(class HBufC8 *)
+ ??1CIkeV2PkiService@@UAE@XZ @ 6 NONAME ; CIkeV2PkiService::~CIkeV2PkiService(void)
+ ?KeyHash@CIkeCaElem@@QBEABVTDesC8@@XZ @ 7 NONAME ; class TDesC8 const & CIkeCaElem::KeyHash(void) const
+ ?Ikev1SignatureL@CIkeV1PkiService@@QAEHABVTDesC8@@PAVCIkeData@@0AAVTDes8@@@Z @ 8 NONAME ; int CIkeV1PkiService::Ikev1SignatureL(class TDesC8 const &, class CIkeData *, class TDesC8 const &, class TDes8 &)
+ ?GetTrustedCA@CIkeV1PkiService@@QAEPAVHBufC8@@XZ @ 9 NONAME ; class HBufC8 * CIkeV1PkiService::GetTrustedCA(void)
+ ?GetTrustedICA2@CIkeV1PkiService@@QAEPAVHBufC8@@XZ @ 10 NONAME ; class HBufC8 * CIkeV1PkiService::GetTrustedICA2(void)
+ ?ReadChainL@CIkeV1PkiService@@QAEHPAVCIkeData@@PBVHBufC8@@@Z @ 11 NONAME ; int CIkeV1PkiService::ReadChainL(class CIkeData *, class HBufC8 const *)
+ ?I1CertificateData@CIkeV2PkiService@@QBEABVTDesC8@@XZ @ 12 NONAME ; class TDesC8 const & CIkeV2PkiService::I1CertificateData(void) const
+ ??0CIkeCaList@@QAE@H@Z @ 13 NONAME ; CIkeCaList::CIkeCaList(int)
+ ??1CIkeV1PkiService@@UAE@XZ @ 14 NONAME ; CIkeV1PkiService::~CIkeV1PkiService(void)
+ ?NewL@CIkeV2PkiService@@SAPAV1@AAVMIkeV2PkiServiceObserver@@AAVMIkeDebug@@@Z @ 15 NONAME ; class CIkeV2PkiService * CIkeV2PkiService::NewL(class MIkeV2PkiServiceObserver &, class MIkeDebug &)
+ ?GetCertificateFieldDERL@IkeCert@@SAPAVHBufC8@@PBVCX509Certificate@@H@Z @ 16 NONAME ; class HBufC8 * IkeCert::GetCertificateFieldDERL(class CX509Certificate const *, int)
+ ?UserCertificateData@CIkeV2PkiService@@QBEABVTDesC8@@XZ @ 17 NONAME ; class TDesC8 const & CIkeV2PkiService::UserCertificateData(void) const
+ ?GetCertificate@CIkeV1PkiService@@QAEPAVHBufC8@@XZ @ 18 NONAME ; class HBufC8 * CIkeV1PkiService::GetCertificate(void)
+ ?VerifyCertChainL@IkePkiUtils@@SAPAVCX509Certificate@@ABV?$CArrayFixFlat@PAVCX509Certificate@@@@AAPAV2@ABVCIkeCaList@@@Z @ 19 NONAME ; class CX509Certificate * IkePkiUtils::VerifyCertChainL(class CArrayFixFlat<class CX509Certificate *> const &, class CX509Certificate * &, class CIkeCaList const &)
+ ?InitIkeV2PkiService@CIkeV2PkiService@@QAEXPBVCIkeData@@@Z @ 20 NONAME ; void CIkeV2PkiService::InitIkeV2PkiService(class CIkeData const *)
+ ?Certificate@CIkeCaElem@@QBEPAVCX509Certificate@@XZ @ 21 NONAME ; class CX509Certificate * CIkeCaElem::Certificate(void) const
+ ?CaList@CIkeV1PkiService@@QAEPAVCIkeCaList@@XZ @ 22 NONAME ; class CIkeCaList * CIkeV1PkiService::CaList(void)
+ ?VerifyIkev1SignatureL@IkePkiUtils@@SAHABVTDesC8@@0ABVCX509Certificate@@@Z @ 23 NONAME ; int IkePkiUtils::VerifyIkev1SignatureL(class TDesC8 const &, class TDesC8 const &, class CX509Certificate const &)
+ ?CertifyIdentityL@IkePkiUtils@@SAHPBVCX509Certificate@@AAVTDesC8@@H@Z @ 24 NONAME ; int IkePkiUtils::CertifyIdentityL(class CX509Certificate const *, class TDesC8 &, int)
+ ?I2CertificateData@CIkeV2PkiService@@QBEABVTDesC8@@XZ @ 25 NONAME ; class TDesC8 const & CIkeV2PkiService::I2CertificateData(void) const
+ ?ImportCACertsL@CIkeV1PkiService@@QAEHPAV?$CArrayFixFlat@PAUTCertInfo@@@@@Z @ 26 NONAME ; int CIkeV1PkiService::ImportCACertsL(class CArrayFixFlat<struct TCertInfo *> *)
+ ?VerifyCertificateL@IkePkiUtils@@SAPAVCX509Certificate@@ABV?$CArrayFixFlat@PB$$CBVTCertificateISAKMP@@@@ABVCIkeCaList@@@Z @ 27 NONAME ; class CX509Certificate * IkePkiUtils::VerifyCertificateL(class CArrayFixFlat<class TCertificateISAKMP const *> const &, class CIkeCaList const &)
+ ?GetCertificateFieldDERL@IkeCert@@SAPAVHBufC8@@PAV2@H@Z @ 28 NONAME ; class HBufC8 * IkeCert::GetCertificateFieldDERL(class HBufC8 *, int)
+ ?ReadTrustedUserCertificateL@CIkeV2PkiService@@AAEXXZ @ 29 NONAME ; void CIkeV2PkiService::ReadTrustedUserCertificateL(void)
+ ?GetTrustedICA1@CIkeV1PkiService@@QAEPAVHBufC8@@XZ @ 30 NONAME ; class HBufC8 * CIkeV1PkiService::GetTrustedICA1(void)
+ ?GetCertSubjectNameDERL@IkePkiUtils@@SAHPBVCX509Certificate@@AAVTDes8@@@Z @ 31 NONAME ; int IkePkiUtils::GetCertSubjectNameDERL(class CX509Certificate const *, class TDes8 &)
?TrustedCaName@CIkeV2PkiService@@QBEABVTDesC8@@XZ @ 32 NONAME ; class TDesC8 const & CIkeV2PkiService::TrustedCaName(void) const
- ?UserCertificateData@CIkeV2PkiService@@QBEABVTDesC8@@XZ @ 33 NONAME ; class TDesC8 const & CIkeV2PkiService::UserCertificateData(void) const
- ?VerifyCertChainL@IkePkiUtils@@SAPAVCX509Certificate@@ABV?$CArrayFixFlat@PAVCX509Certificate@@@@AAPAV2@ABVCIkeCaList@@@Z @ 34 NONAME ; class CX509Certificate * IkePkiUtils::VerifyCertChainL(class CArrayFixFlat<class CX509Certificate *> const &, class CX509Certificate * &, class CIkeCaList const &)
- ?VerifyCertificateL@IkePkiUtils@@SAPAVCX509Certificate@@ABV?$CArrayFixFlat@PAVTCertPayloadIkev2@@@@ABVCIkeCaList@@@Z @ 35 NONAME ; class CX509Certificate * IkePkiUtils::VerifyCertificateL(class CArrayFixFlat<class TCertPayloadIkev2 *> const &, class CIkeCaList const &)
- ?VerifyCertificateL@IkePkiUtils@@SAPAVCX509Certificate@@ABV?$CArrayFixFlat@PB$$CBVTCertificateISAKMP@@@@ABVCIkeCaList@@@Z @ 36 NONAME ; class CX509Certificate * IkePkiUtils::VerifyCertificateL(class CArrayFixFlat<class TCertificateISAKMP const *> const &, class CIkeCaList const &)
- ?VerifyIkev1SignatureL@IkePkiUtils@@SAHABVTDesC8@@0ABVCX509Certificate@@@Z @ 37 NONAME ; int IkePkiUtils::VerifyIkev1SignatureL(class TDesC8 const &, class TDesC8 const &, class CX509Certificate const &)
- ?VerifyIkev2SignatureL@IkePkiUtils@@SAHABVTDesC8@@0ABVCX509Certificate@@@Z @ 38 NONAME ; int IkePkiUtils::VerifyIkev2SignatureL(class TDesC8 const &, class TDesC8 const &, class CX509Certificate const &)
+ ?GetSubjectAltNameDataL@IkeCert@@SAPAVHBufC8@@PBVCX509Certificate@@E@Z @ 33 NONAME ; class HBufC8 * IkeCert::GetSubjectAltNameDataL(class CX509Certificate const *, unsigned char)
+ ?ReadUserCertWithNameL@CIkeV1PkiService@@QAEHABVTDesC8@@PAVCIkeData@@H@Z @ 34 NONAME ; int CIkeV1PkiService::ReadUserCertWithNameL(class TDesC8 const &, class CIkeData *, int)
+ ??1CIkeCaElem@@UAE@XZ @ 35 NONAME ; CIkeCaElem::~CIkeCaElem(void)
+ ?CastCertArray@IkePkiUtils@@CAPBV?$CArrayFixFlat@PAVTCertPayloadIkev2@@@@PBV?$CArrayFixFlat@PB$$CBVTCertificateISAKMP@@@@@Z @ 36 NONAME ; class CArrayFixFlat<class TCertPayloadIkev2 *> const * IkePkiUtils::CastCertArray(class CArrayFixFlat<class TCertificateISAKMP const *> const *)
+ ?VerifyCertificateL@IkePkiUtils@@SAPAVCX509Certificate@@ABV?$CArrayFixFlat@PAVTCertPayloadIkev2@@@@ABVCIkeCaList@@@Z @ 37 NONAME ; class CX509Certificate * IkePkiUtils::VerifyCertificateL(class CArrayFixFlat<class TCertPayloadIkev2 *> const &, class CIkeCaList const &)
+ ?GetIdentityFromCertL@IkePkiUtils@@SAPAVHBufC8@@EABVTDesC8@@@Z @ 38 NONAME ; class HBufC8 * IkePkiUtils::GetIdentityFromCertL(unsigned char, class TDesC8 const &)
--- a/vpnengine/pkiservice/inc/pkisupport.h Tue Jan 26 12:56:20 2010 +0200
+++ b/vpnengine/pkiservice/inc/pkisupport.h Tue Feb 02 00:53:00 2010 +0200
@@ -96,17 +96,14 @@
void AttachCertificateL(const TDesC &aLabel,
const TDesC8 &aBufferPtr, TRequestStatus& aStatus);
- void RetrieveCertificateL(const TDesC &aLabel,
- const TPKIKeyIdentifier& aCertificateKeyId,
+ void RetrieveCertificateL(const TDesC &aLabel,
TPtr8 &aBufferPtr, const TPKICertificateOwnerType& aType,
TRequestStatus& aStatus);
void RemoveCertificateL(const TDesC &aLabel,
- const TPKIKeyIdentifier& aCertificateKeyId,
TRequestStatus& aStatus);
void SelectCertificateL(const TDesC &aLabel,
- const TPKIKeyIdentifier& aCertificateKeyId,
const TPKICertificateOwnerType& aType = EPKICACertificate);
// Asynchronous sertificate store request
@@ -116,15 +113,14 @@
TInt GetRequiredBufferSize();
void SetCallerStatusPending(TRequestStatus& aStatus);
void CompleteCallerStatus(TInt aError);
- void SetTrustL(const TDesC &aLabel, const TPKIKeyIdentifier& aCertificateKeyId,
+ void SetTrustL(const TDesC &aLabel,
TBool aTrusted, TRequestStatus& aStatus);
- void TrustedL(const TDesC &aLabel, const TPKIKeyIdentifier& aCertificateKeyId,
+ void TrustedL(const TDesC &aLabel,
TRequestStatus& aStatus);
- void SetApplicabilityL(const TDesC &aLabel,
- const TPKIKeyIdentifier& aCertificateKeyId,
+ void SetApplicabilityL(const TDesC &aLabel,
const RArray<TUid>& aApplUids,
TRequestStatus& Status);
- void ApplicationsL(const TDesC &aLabel, const TPKIKeyIdentifier& aCertificateKeyId,
+ void ApplicationsL(const TDesC &aLabel,
TRequestStatus& Status);
inline void SetCertStoreType(TPkiServiceStoreType aStoreType)
--- a/vpnengine/pkiservice/src/keymanager.cpp Tue Jan 26 12:56:20 2010 +0200
+++ b/vpnengine/pkiservice/src/keymanager.cpp Tue Feb 02 00:53:00 2010 +0200
@@ -367,6 +367,11 @@
PKISERVICE_ASSERT(tempLength <= publicKeyPtr.MaxLength());
publicKeyPtr.Copy(publicKeyPtr.Ptr() + skip, tempLength);
}
+ else
+ {
+ delete *iPublicKeyData;
+ *iPublicKeyData = NULL;
+ }
Cleanup();
User::RequestComplete(iClientStatus, iStatus.Int());
}
--- a/vpnengine/pkiservice/src/pkisupport.cpp Tue Jan 26 12:56:20 2010 +0200
+++ b/vpnengine/pkiservice/src/pkisupport.cpp Tue Feb 02 00:53:00 2010 +0200
@@ -725,7 +725,6 @@
// ---------------------------------------------------------------------------
//
void CPKISupport::RetrieveCertificateL(const TDesC &aLabel,
- const TPKIKeyIdentifier& aCertificateKeyId,
TPtr8 &aBufferPtr, const TPKICertificateOwnerType& aType,
TRequestStatus& aStatus)
{
@@ -735,7 +734,7 @@
iSubState = ESSContinue;
iOutBufferPtr = &aBufferPtr;
SetCallerStatusPending( aStatus );
- SelectCertificateL(aLabel, aCertificateKeyId, aType);
+ SelectCertificateL(aLabel, aType);
}
// ---------------------------------------------------------------------------
@@ -1071,7 +1070,6 @@
// ---------------------------------------------------------------------------
//
void CPKISupport::RemoveCertificateL(const TDesC &aLabel,
- const TPKIKeyIdentifier& aCertificateKeyId,
TRequestStatus& aStatus)
{
LOG(Log::Printf(_L("Remove certificate\n")));
@@ -1079,7 +1077,7 @@
iCerts.Close();
iSubState = ESSContinue;
SetCallerStatusPending( aStatus );
- SelectCertificateL(aLabel, aCertificateKeyId);
+ SelectCertificateL(aLabel);
}
// ---------------------------------------------------------------------------
@@ -1100,7 +1098,6 @@
// ---------------------------------------------------------------------------
//
void CPKISupport::SetTrustL(const TDesC &aLabel,
- const TPKIKeyIdentifier& aCertificateKeyId,
TBool aTrusted, TRequestStatus& aStatus)
{
LOG(Log::Printf(_L("SetTrust\n")));
@@ -1109,7 +1106,7 @@
iSubState = ESSContinue;
iTrusted = aTrusted;
SetCallerStatusPending( aStatus );
- SelectCertificateL(aLabel, aCertificateKeyId);
+ SelectCertificateL(aLabel);
}
// ---------------------------------------------------------------------------
@@ -1129,7 +1126,6 @@
// ---------------------------------------------------------------------------
//
void CPKISupport::TrustedL(const TDesC &aLabel,
- const TPKIKeyIdentifier& aCertificateKeyId,
TRequestStatus& aStatus)
{
LOG(Log::Printf(_L("Trusted\n")));
@@ -1137,7 +1133,7 @@
iCerts.Close();
iSubState = ESSContinue;
SetCallerStatusPending( aStatus );
- SelectCertificateL(aLabel, aCertificateKeyId);
+ SelectCertificateL(aLabel);
}
// ---------------------------------------------------------------------------
@@ -1157,7 +1153,6 @@
// ---------------------------------------------------------------------------
//
void CPKISupport::SetApplicabilityL(const TDesC &aLabel,
- const TPKIKeyIdentifier& aCertificateKeyId,
const RArray<TUid>& aApplUids, TRequestStatus& aStatus)
{
LOG(Log::Printf(_L("SetApplicability\n")));
@@ -1170,7 +1165,7 @@
iApplUids.Append(aApplUids[i]);
}
SetCallerStatusPending( aStatus );
- SelectCertificateL(aLabel, aCertificateKeyId);
+ SelectCertificateL(aLabel);
}
// ---------------------------------------------------------------------------
@@ -1190,7 +1185,7 @@
// ?description_if_needed
// ---------------------------------------------------------------------------
//
-void CPKISupport::ApplicationsL(const TDesC &aLabel, const TPKIKeyIdentifier& aCertificateKeyId,
+void CPKISupport::ApplicationsL(const TDesC &aLabel,
TRequestStatus& aStatus)
{
LOG(Log::Printf(_L("Applications\n")));
@@ -1198,7 +1193,7 @@
iCerts.Close();
iSubState = ESSContinue;
SetCallerStatusPending( aStatus );
- SelectCertificateL(aLabel, aCertificateKeyId);
+ SelectCertificateL(aLabel);
}
// ---------------------------------------------------------------------------
@@ -1220,7 +1215,6 @@
// ---------------------------------------------------------------------------
//
void CPKISupport::SelectCertificateL(const TDesC &aLabel,
- const TPKIKeyIdentifier& aCertificateKeyId,
const TPKICertificateOwnerType& aType )
{
delete iCertFilter;
@@ -1229,7 +1223,7 @@
LOG(Log::Printf(_L(" Select by label: %S\n"), &aLabel));
iCertFilter->SetLabel(aLabel);
- iCertFilter->SetSubjectKeyId(aCertificateKeyId);
+
if (aType != 0)
{
LOG_1(" Select by owner type: %d", aType);
--- a/vpnengine/pkiservice/src/pkiwrapper.cpp Tue Jan 26 12:56:20 2010 +0200
+++ b/vpnengine/pkiservice/src/pkiwrapper.cpp Tue Feb 02 00:53:00 2010 +0200
@@ -310,7 +310,6 @@
const CMapDescriptor& mapping = iMapper.GetMapDescriptorAtIndex(index);
iCurrentState = EComplete;
iPKISupport->RetrieveCertificateL(mapping.Label(),
- mapping.CertificateKeyId(),
iPtrCertBuffer, mapping.OwnerType(), iStatus);
SetActive();
}
@@ -413,9 +412,7 @@
storeType);
CleanupStack::PushL(newMapping);
newMapping->SetMapDeletable(iCurrentDescriptor().iIsDeletable);
-
-
-
+
iCurrentStatus = KErrNone;
iCurrentState = EComplete;
LOG(Log::Printf(_L("Attaching certificate")));
@@ -446,11 +443,9 @@
iPKISupport->CertStoreType());
if(iCurrentStatus == KErrNone)
{
- const CMapDescriptor& mapping = iMapper.GetMapDescriptorAtIndex(index);
- TPKIKeyIdentifier keyId = mapping.CertificateKeyId();
iMapper.DeleteMapping(index);
iCurrentState = EComplete;
- iPKISupport->RemoveCertificateL(*iObjectName, keyId, iStatus);
+ iPKISupport->RemoveCertificateL(*iObjectName, iStatus);
SetActive();
}
}
@@ -473,7 +468,7 @@
if (mapping.OwnerType() == EPKICACertificate)
{
iCurrentState = EComplete;
- iPKISupport->SetTrustL(*iObjectName, mapping.CertificateKeyId(),
+ iPKISupport->SetTrustL(*iObjectName,
iTrusted, iStatus);
SetActive();
}
@@ -498,9 +493,8 @@
iPKISupport->CertStoreType());
if(iCurrentStatus == KErrNone)
{
- const CMapDescriptor& mapping = iMapper.GetMapDescriptorAtIndex(index);
iCurrentState = EComplete;
- iPKISupport->TrustedL(*iObjectName, mapping.CertificateKeyId(), iStatus);
+ iPKISupport->TrustedL(*iObjectName, iStatus);
SetActive();
}
}
@@ -521,9 +515,8 @@
if(iCurrentStatus == KErrNone)
{
LOG_1("ExecuteSetApplicabilityL:%d", iIndex);
- const CMapDescriptor& mapping = iMapper.GetMapDescriptorAtIndex(index);
iCurrentState = EComplete;
- iPKISupport->SetApplicabilityL(*iObjectName, mapping.CertificateKeyId(), iUidArray, iStatus);
+ iPKISupport->SetApplicabilityL(*iObjectName, iUidArray, iStatus);
SetActive();
}
}
@@ -543,9 +536,8 @@
iUidArray.Close();
if(iCurrentStatus == KErrNone)
{
- const CMapDescriptor& mapping = iMapper.GetMapDescriptorAtIndex(index);
iCurrentState = EComplete;
- iPKISupport->ApplicationsL(*iObjectName, mapping.CertificateKeyId(), iStatus);
+ iPKISupport->ApplicationsL(*iObjectName, iStatus);
SetActive();
}
}