--- a/eapol/eapol_framework/eapol_symbian/am/include/EapTlsPeapCertInterface.h Tue Aug 31 15:16:37 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/include/EapTlsPeapCertInterface.h Wed Sep 01 12:23:57 2010 +0100
@@ -16,7 +16,7 @@
*/
/*
-* %version: %
+* %version: 13.1.2 %
*/
#ifndef _EAPTLSPEAPCERTINTERFACE_H_
@@ -48,20 +48,17 @@
virtual ~CEapTlsPeapCertInterface();
- void ReadCertificateL(EapCertificateEntry& aCertInfo, const TBool aRetrieveChain);
+ void ReadCertificateL(SCertEntry& aCertInfo, const TBool aRetrieveChain);
- void ReadCACertificateL(EapCertificateEntry& aCertInfo);
+ void ReadCACertificateL(SCertEntry& aCertInfo);
void ReadPrivateKeyL(TKeyIdentifier& aHash);
- void ValidateChainL(
- TDesC8& aCertChain,
- RPointerArray<EapCertificateEntry>& aCACerts,
- const TBool aUseAutomaticCaCertificate);
+ void ValidateChainL(TDesC8& aCertChain, RArray<SCertEntry>& aCACerts);
void GetMatchingCertificatesL(
- const RPointerArray<EapCertificateEntry>& aAllowedUserCerts,
+ const RArray<SCertEntry>& aAllowedUserCerts,
const TBool aUseCertAuthoritiesFilter,
EAP_TEMPLATE_CONST eap_array_c<eap_variable_data_c> * const aCertAuthorities,
const TBool aUseCertTypesFilter,
@@ -70,12 +67,12 @@
const RArray<TUint>& aAllowedCipherSuites);
void SignL(
- const TKeyIdentifier& aKeyId,
+ TKeyIdentifier& aKeyId,
const TDesC8& aHashIn,
const TUint aSignatureLength);
void DecryptL(
- const TKeyIdentifier& aKeyId,
+ TKeyIdentifier& aKeyId,
const TDesC8& aData);
void CancelSignWithPrivateKey();
@@ -137,7 +134,7 @@
RFs iFs;
- RPointerArray<EapCertificateEntry> iAllowedUserCerts;
+ RArray<SCertEntry> iAllowedUserCerts;
TBool iUseCertAuthoritiesFilter;
@@ -148,9 +145,9 @@
TBool iRSACertsAllowed;
TBool iDSACertsAllowed;
-
+
RPointerArray<CX500DistinguishedName> iCertAuthorities;
-
+
const eap_array_c<u8_t>* iCertTypes;
RMPointerArray<CCTCertInfo> iCertInfos;
@@ -176,17 +173,17 @@
RPointerArray<CX509Certificate> iUserCertChain;
- RPointerArray<EapCertificateEntry> iMatchingUserCertInfos;
+ CArrayFixFlat<SCertEntry> iMatchingUserCertInfos;
TUint iCAIndex;
TUint iUserCertIndex;
- RPointerArray<EapCertificateEntry> iAllowedCACerts;
+ RArray<SCertEntry> iAllowedCACerts;
HBufC8* iInputCertChain;
- EapCertificateEntry iCertInfo;
+ SCertEntry iCertInfo;
TAny *iResArray;
@@ -212,9 +209,6 @@
CUnifiedKeyStore* iKeyStore;
TBool iRetrieveChain;
-
- TBool iUseAutomaticCaCertificate;
-
};
#endif // _EAPTLSPEAPCERTINTERFACE_H_