FCL/sf/mw/securitysrv: comparison cpsecplugins/cpadvancedsecplugin/src/cpcertdetailview.cpp

equal deleted inserted replaced

-:aad866c37519
+:7bad16cccaca
 #include <HbGroupBox>
 #include <hbpushbutton.h>
 #include <hbdataform.h>
 #include <hbdataformmodel.h>
 #include <hbdataformmodelitem.h>
+#include <../../inc/cpsecplugins.h>
 #include "cpcertdetailview.h"
 #include "cpcertview.h"
 #include "cpcertdatacontainer.h"
 #include "cpcertmanuisyncwrapper.h"
 #include "../../../pkiutilities/DeviceToken/Inc/TrustedSitesStore.h"
 CpCertDetailView::~CpCertDetailView()
 	{}
 void CpCertDetailView::viewCertificateDetailsL( TInt aIndex, CpCertView::TCertificateViews aType )
 	{
+	RDEBUG("0", 0);
 	QGraphicsLinearLayout *layout = q_check_ptr(new QGraphicsLinearLayout(Qt::Vertical));
 	setLayout(layout);
 	HbListWidget* mCertDetails = q_check_ptr(new HbListWidget(this));
 }
 else
 {
 		addLabel(*entry, *mCertDetails);
 }
+		RDEBUG("0", 0);
 // certificate issuer and owner
 if( certificateFormat == EX509Certificate )
 {
 		addIssuerL(*details, *mCertDetails);
 		addSubjectL(*details, *mCertDetails);
 if(( aType == CpCertView::EPersonalView ) || ( aType == CpCertView::EDeviceView ))
 {
 		TKeyUsagePKCS15 usage = keyUsageAndLocationL( *entry, &keyLocation );
 addCertUsage(usage, *mCertDetails);
 }
+		RDEBUG("0", 0);
 if( certificateFormat == EX509Certificate )
 {
 		addValidityPeriod( *details, *mCertDetails );
 TUid certLoc;
 certLoc.iUid = entry->Token().TokenType().Type().iUid;
 }
 else
 {
 // SetUrlCertAlgorihm()
 }
+		RDEBUG("0", 0);
 if( certificateFormat != EX509CertificateUrl )
 {
 CleanupStack::PopAndDestroy( details );
 }
 else
 layout->addItem(mCertDetails);
 }
 const CCTCertInfo* CpCertDetailView::certInfo( TInt index, CpCertView::TCertificateViews certView )
 	{
+	RDEBUG("0", 0);
 	const CCTCertInfo* certinfo = NULL;
 	if( certView == CpCertView::EAuthorityView )
 		{
 		certinfo = ( mCertDataContainer.iCALabelEntries )[ index ]->iCAEntry;
 	return certinfo;
 	}
 void CpCertDetailView::addTrustedSitesL( const CCertificate& certDetails, HbListWidget& certDisplayDetails )
 	{
+	RDEBUG("0", 0);
 	CTrustSitesStore* trustedSitesStore = CTrustSitesStore::NewL();
 	CleanupStack::PushL( trustedSitesStore );
 	RPointerArray<HBufC> trustedSites;
 	CleanupResetAndDestroyPushL( trustedSites );
 	}
 void CpCertDetailView::addLabel( const CCTCertInfo& aCertInfo, HbListWidget& certDisplayDetails )
 	{
+	RDEBUG("0", 0);
 	QString sLabel("Label:");
 	QString sLabelDetails = "(No label)";
 	if(aCertInfo.Label().Length()  != 0)
 		{
 		sLabelDetails = QString((QChar*)(aCertInfo.Label().Ptr()),aCertInfo.Label().Length());
 	}
 void CpCertDetailView::addSubjectL( const CCertificate& aCertDetails,
 									HbListWidget& certDisplayDetails )
 	{
+	RDEBUG("0", 0);
 	HBufC* subject = NULL;
 	X509CertNameParser::SubjectFullNameL( (CX509Certificate&)aCertDetails, subject );
 	CleanupStack::PushL( subject );
 	QString sSubject = "Subject:";
 	CleanupStack::PopAndDestroy( subject );
 	}
 void CpCertDetailView::addCertUsage( TKeyUsagePKCS15 usage, HbListWidget& certDisplayDetails )
 	{
+	RDEBUG("0", 0);
 	QString strUsage;
 	switch( usage )
 		{
 		case EPKCS15UsageSignSignRecover:
 		case EPKCS15UsageSignDecrypt:
 void CpCertDetailView::addValidityPeriod( 	const CCertificate& aCertDetails,
 											HbListWidget& certDisplayDetails)
 	{
+	RDEBUG("0", 0);
 	// Certificate validity period
 	// Hometime's offset to UTC
 	TLocale locale;
 	TTimeIntervalSeconds offSet = locale.UniversalTimeOffset();
 	}
 void CpCertDetailView::setURLLocation( HBufC8& urlDetails, HbListWidget& certDisplayDetails )
 	{
+	RDEBUG("0", 0);
 	TPtr8 urlPtr = urlDetails.Des();
 	QString certUrl = "Location:";
 	QString certURLDetail = "(Not defined)";
 	TInt length = urlPtr.Length();
 	addToListWidget(certDisplayDetails, certUrl, certURLDetail);
 	}
 void CpCertDetailView::addCertFormat( TCertificateFormat aCertFormat, HbListWidget& certDisplayDetails )
 	{
+	RDEBUG("0", 0);
 	// certificate format
 	QString certFormat = "Certificate format:";
 	QString certFormatDetails = "(Not defined)";
 	if( aCertFormat == EX509Certificate || aCertFormat == EX509CertificateUrl)
 		{
 	}
 void CpCertDetailView::addAlgoDetails( 	const CCertificate& certificate,
 										HbListWidget& certDisplayDetails )
 	{
+	RDEBUG("0", 0);
 	// certificate algorithms
 	QString sDgstAlgoDetails = "Unknown";
 	// digest algorithm
 	TAlgorithmId algorithmId = certificate.SigningAlgorithm().DigestAlgorithm().Algorithm();
 	switch( algorithmId )
 	}
 void CpCertDetailView::addSerialNo( const CCertificate& certificate,
 									HbListWidget& certDisplayDetails )
 	{
+	RDEBUG("0", 0);
 	// certificate serial number
 	QString sCertSerialNo("Serial number:");
 	QString sCertSerialNoDetails = 0;
 	TPtrC8 serialNumber = certificate.SerialNumber();
 	TBuf<KMaxLengthTextSerialNumberFormatting> buf2;
 	}
 void CpCertDetailView::addFingerprint(	const CCertificate& certificate,
 										HbListWidget& certDisplayDetails)
 	{
+	RDEBUG("0", 0);
 	// certificate fingerprint SHA-1
 	QString sSha1("Fingerprint (SHA1):");
 	TPtrC8 sha1_fingerprint = certificate.Fingerprint();
 	HBufC* finalSha1 = NULL;
-	QT_TRAP_THROWING(	 finalSha1 = HBufC::NewLC(100));
+	QString sSha1Details = NULL;
-	TPtr finalShaPtr = finalSha1->Des();
-	divideIntoBlocks( sha1_fingerprint, finalShaPtr );
+	QT_TRAP_THROWING
-	QString sSha1Details = QString( (QChar*)finalShaPtr.Ptr(), finalShaPtr.Length() );
+		(
-	CleanupStack::PopAndDestroy(finalSha1);
+		finalSha1 = HBufC::NewLC(100);
+		TPtr finalShaPtr = finalSha1->Des();
+		divideIntoBlocks( sha1_fingerprint, finalShaPtr );
+		sSha1Details = QString( (QChar*)finalShaPtr.Ptr(), finalShaPtr.Length() );
+		CleanupStack::PopAndDestroy(finalSha1);
+		)
 	addToListWidget(certDisplayDetails, sSha1, sSha1Details);
 	// certificate fingerprint MD5
 	QString sMd5("Fingerprint (MD5):");
 	CMD5* md5= NULL;
-	QT_TRAP_THROWING(	 md5 = CMD5::NewL());
+	QT_TRAP_THROWING
-	QT_TRAP_THROWING(CleanupStack::PushL( md5 ));
+		(
-	TBuf8<20> fingerprint = md5->Hash( certificate.Encoding() );
+		md5 = CMD5::NewL();
-	CleanupStack::PopAndDestroy( md5 );
+		CleanupStack::PushL( md5 );
-	HBufC* finalMd5 = NULL;
+		TBuf8<20> fingerprint = md5->Hash( certificate.Encoding() );
-	QT_TRAP_THROWING(	finalMd5 = HBufC::NewLC(100));
+		CleanupStack::PopAndDestroy( md5 );
-	TPtr finalMd5Ptr = finalMd5->Des();
+		HBufC* finalMd5 = NULL;
-	divideIntoBlocks( fingerprint, finalMd5Ptr );
+		finalMd5 = HBufC::NewLC(100);
-	QString sMd5Details = QString( (QChar*)finalMd5Ptr.Ptr(), finalMd5Ptr.Length());
+		TPtr finalMd5Ptr = finalMd5->Des();
-	CleanupStack::PopAndDestroy(finalMd5);
+		divideIntoBlocks( fingerprint, finalMd5Ptr );
-	addToListWidget(certDisplayDetails, sMd5, sMd5Details);
+		QString sMd5Details = QString( (QChar*)finalMd5Ptr.Ptr(), finalMd5Ptr.Length());
+		CleanupStack::PopAndDestroy(finalMd5);
+		addToListWidget(certDisplayDetails, sMd5, sMd5Details);
+		)
 	}
 void CpCertDetailView::addPublicKeyDetailsL(	const CCertificate& certificate,
 											HbListWidget& certDisplayDetails )
 	{
+	RDEBUG("0", 0);
 	// Public key
 // Should look like: "Public key (%0U %1N bit):"
 	QString sPublicKey("Public key ("); // %S %d bits):");
 	sPublicKey.append(asymmetricAlgoId(certificate));
 	addToListWidget(certDisplayDetails, sPublicKey, sPublicKeyDetails);
 	}
 QString CpCertDetailView::asymmetricAlgoId( const CCertificate& certificate )
 	{
+	RDEBUG("0", 0);
 	QString sAsymmetricAlgoId = 0;
 	// public-key algorithm
 	TAlgorithmId algorithmId = certificate.SigningAlgorithm().AsymmetricAlgorithm().Algorithm();
 	switch( algorithmId )
 		{
 	}
 void CpCertDetailView::validateCertificateL(
 TInt aIndex, const CCertificate& certDetails, const CCTCertInfo& aCertInfo, CpCertView::TCertificateViews aType )
 {
+RDEBUG("0", 0);
 TInt poppableItems = 0;
 // Check allways first the validity period
 // Show Expired/Not yet valid notes
 const CValidityPeriod& validityPeriod = certDetails.ValidityPeriod();
 const TTime& startValue = validityPeriod.Start();
 CleanupStack::PopAndDestroy( poppableItems );
 }
 CArrayFixFlat<TValidationError>* CpCertDetailView::validateX509CertificateL( const CX509Certificate& certDetails )
 {
+RDEBUG("0", 0);
 TInt poppableItems = 0;
 CArrayFixFlat<TValidationError>* validationError =
 new ( ELeave ) CArrayFixFlat<TValidationError>( 1 );
 CleanupStack::PushL( validationError ); //This is returned, so it isn't destroyed at the end.
 TKeyUsagePKCS15 CpCertDetailView::keyUsageAndLocationL( const CCTCertInfo& certEntry,
 TUid* keyLocation )
 {
 TKeyUsagePKCS15 keyUsage;
+		RDEBUG("0", 0);
 // Check whether we have key for this certificate
 RMPointerArray<CCTKeyInfo> keyEntry;
 TCTKeyAttributeFilter filter;
 filter.iKeyId = certEntry.SubjectKeyId();
 // Adds certificate/private key's location info to certificate details
 // ---------------------------------------------------------
 //
 void CpCertDetailView::setLocationInfo(TBool certificate, TUid locUid, HbListWidget& certDisplayDetails)
 {
+RDEBUG("0", 0);
 QString locationDetails = "(Not defined)";
 switch ( locUid.iUid )
 {
 case KFileCertStoreUid:
 // CCertManUICertificateHelper::divideIntoBlocks
 // ---------------------------------------------------------
 //
 void CpCertDetailView::divideIntoBlocks( const TDesC8& input, TPtr& output )
 {
+RDEBUG("0", 0);
 const TInt KBlockLength = 2;
 TInt blockIndex = 0;
 for ( TInt j = 0 ; j < input.Length() ; j++ )
 {
 if ( blockIndex == KBlockLength )

changeset 37	7bad16cccaca
parent 26	aad866c37519