FCL/sf/mw/securitysrv: comparison boottimeintegritycheck/src/IntegrityCheck.cpp

equal deleted inserted replaced

-:b75757c81051
+:318c4eab2439
 using namespace Swi;
 // DATA TYPES
 // FUNCTION PROTOTYPES
+template <class T>
+class CleanupResetAndDestroy
+{
+public:
+inline static void PushL(T& aRef);
+private:
+static void ResetAndDestroy(TAny *aPtr);
+};
+template <class T>
+inline void CleanupResetAndDestroyPushL(T& aRef);
+template <class T>
+inline void CleanupResetAndDestroy<T>::PushL(T& aRef)
+{
+CleanupStack::PushL(TCleanupItem(&ResetAndDestroy,&aRef));
+}
+template <class T>
+void CleanupResetAndDestroy<T>::ResetAndDestroy(TAny *aPtr)
+{
+static_cast<T*>(aPtr)->ResetAndDestroy();
+}
+template <class T>
+inline void CleanupResetAndDestroyPushL(T& aRef)
+{
+CleanupResetAndDestroy<T>::PushL(aRef);
+}
 LOCAL_C TInt ThreadStartL();
 LOCAL_C TInt ReadCertificatesL(
 RFs& aFs,
 }
 BTIC_TRACE_PRINT_NUM("Updated store read enabled(1) = %d",certFileFound);
 BTIC_TRACE_PRINT_NUM("Binaries check enabled(0) = %d",binariesCheckEnbled);
+//FIX
 // Create pointer array for root certificates.
 RPointerArray<CX509Certificate> x509CertArray;
+CleanupResetAndDestroyPushL( x509CertArray );
+pushToStack++;
 RPointerArray<TCapabilitySet> certCapaArray;
+CleanupResetAndDestroyPushL( certCapaArray );
+pushToStack++;
 TInt fileError = 0;
 // Read root certificates if needed.
 if ( certFileFound || binariesCheckEnbled )
 {
 // Let's return and try this in next boot.
 if ( fileError || x509CertArray.Count() == 0 )
 {
 BTIC_TRACE_PRINT("ERROR Can't read root certificates ! ! !");
 CleanupStack::PopAndDestroy( pushToStack );
-x509CertArray.ResetAndDestroy();
-certCapaArray.ResetAndDestroy();
 User::Leave( fileError );
 }
 }
 // Create temporary pointer array for C-drive updated certificates.
 RPointerArray<CX509Certificate> tempCertArray;
-RPointerArray<TCapabilitySet> tempCapaArray;
+CleanupResetAndDestroyPushL( tempCertArray );
+pushToStack++;
+RPointerArray<TCapabilitySet> tempCapaArray;
+CleanupResetAndDestroyPushL( tempCapaArray );
+pushToStack++;
 // If candidate for certstore file is found read it and validate file.
 if ( certFileFound )
 {
 BTIC_TRACE_PRINT("Read certificates from C");
 #endif //__BTIC_BINARIES_CHECK_ENABLED
 */
 BTIC_TRACE_PRINT("\nProgram complete\n");
 // DELETE ALL ARRAYS AND ARRAY CONTENT
-x509CertArray.ResetAndDestroy();
+// x509CertArray, tempCertArray, certCapaArray, tempCapaArray, fs,  buffers
-tempCertArray.ResetAndDestroy();
+CleanupStack::PopAndDestroy( pushToStack );
-certCapaArray.ResetAndDestroy();
-tempCapaArray.ResetAndDestroy();
-CleanupStack::PopAndDestroy( pushToStack ); //fs, buffers
 BTIC_TRACE_PRINT("UHEAP MARK END");
 __UHEAP_MARKEND;
 BTIC_TRACE_PRINT_ALLOC_CELLS("End Cell count = %d");
 {
 BTIC_TRACE_PRINT("[BOOT INTECRITY CHECK] ValidateCertStoreL v2->");
 __UHEAP_MARK;
 TBool storeOK = EFalse;
 RPointerArray<HBufC> updaterExePaths;
+CleanupResetAndDestroyPushL( updaterExePaths );
+RPointerArray<CSisRegistryPackage> sisPackages;
+CleanupResetAndDestroyPushL( sisPackages );
 Swi::RSisRegistrySession sisRegSession;
 // Leave if we can not connect to sis register. Othervice we have a risk
 // that valid files will be renamed if updated certstore is left out.
 User::LeaveIfError( sisRegSession.Connect() );
 CleanupClosePushL( sisRegSession );
-RPointerArray<CSisRegistryPackage> sisPackages;
 // Find installed packages.
 sisRegSession.InstalledPackagesL( sisPackages );
 Swi::RSisRegistryEntry entry;
 entry,
 updaterExePaths );
 }
 }
 }
-// Cleanup array.
-sisPackages.ResetAndDestroy();
 if ( entryOpen )
 {
 CleanupStack::PopAndDestroy(); //RSisRegistryEntry
 }
 // close SisRegistryEntry before running updater.
 if ( storeOK && packageUID == KBTICSymbianSWIUpdaterUID )
 {
 storeOK = RunUpdaterL( aFs, updaterExePaths );
 }
-updaterExePaths.ResetAndDestroy();
+CleanupStack::PopAndDestroy( 1, &sisPackages );
+CleanupStack::PopAndDestroy( 1, &updaterExePaths );
 BTIC_TRACE_PRINT("UHEAP MARK END");
 __UHEAP_MARKEND;
 BTIC_TRACE_PRINT("[BOOT INTECRITY CHECK] ValidateCertStoreL v2 <-");
 const TDesC& aCertStoreFilePath,
 RSisRegistryEntry& aEntry )
 {
 BTIC_TRACE_PRINT("[BOOT INTECRITY CHECK] ValidateProvisonerStoreL --->");
 __UHEAP_MARK;
 TBool retOK = EFalse;
 // installedFiles array owns entry's files.
 RPointerArray<HBufC> installedFilesArray;
 RPointerArray<HBufC> foundFilesArray;
 RPointerArray<HBufC> fileArray;  // Files that need to be cheked.
 RPointerArray<HBufC8> hashArray; // Hash for each fileArray's file.
 RArray<TUint64> capaArray;
 RPointerArray<HBufC> stringArray;
 HBufC* string = NULL;
+CleanupResetAndDestroyPushL( installedFilesArray );
+CleanupResetAndDestroyPushL( foundFilesArray );
+CleanupResetAndDestroyPushL( fileArray );
+CleanupResetAndDestroyPushL( hashArray );
+CleanupResetAndDestroyPushL( stringArray );
 TUint64* capaVector = new( ELeave ) TUint64[KBTICCapaCount];
 CleanupArrayDeletePushL( capaVector );
 capaVector[0] = KBTIC_TCB;
 }
 }
 CleanupStack::PopAndDestroy(); //capaVector
+CleanupStack::Pop( &stringArray );
+CleanupStack::Pop( &hashArray );
+CleanupStack::Pop( &fileArray );
+CleanupStack::Pop( &foundFilesArray );
+CleanupStack::Pop( &installedFilesArray );
 // Reset only. InstalledFiles array owns buffers.
 foundFilesArray.Reset();
 fileArray.Reset();
 hashArray.ResetAndDestroy();
 installedFilesArray.ResetAndDestroy();
 RPointerArray<HBufC> fileArray;  // Files that need to be cheked.
 RPointerArray<HBufC8> hashArray; // Hash for each fileArray's file.
 RArray<TUint64> capaArray;
 RPointerArray<HBufC> stringArray;
 HBufC* string = NULL;
+CleanupResetAndDestroyPushL( installedFilesArray );
+CleanupResetAndDestroyPushL( foundFilesArray );
+CleanupResetAndDestroyPushL( fileArray );
+CleanupResetAndDestroyPushL( hashArray );
+CleanupResetAndDestroyPushL( stringArray );
 TUint64* capaVector = new( ELeave ) TUint64[KBTICCapaCount];
 CleanupArrayDeletePushL( capaVector );
 capaVector[0] = KBTIC_TCB;
 User::LeaveIfError( aUpdaterExePaths.Append( path ) );
 CleanupStack::Pop(); //path
 }
 CleanupStack::PopAndDestroy(); //capaVector
+CleanupStack::Pop( &stringArray );
+CleanupStack::Pop( &hashArray );
+CleanupStack::Pop( &fileArray );
+CleanupStack::Pop( &foundFilesArray );
+CleanupStack::Pop( &installedFilesArray );
 // Reset only. InstalledFiles array owns buffers.
 foundFilesArray.Reset();
 fileArray.Reset();
 hashArray.ResetAndDestroy();
 installedFilesArray.ResetAndDestroy();
 TUint64 aCapability )                           // Needed capabiltiy
 {
 BTIC_TRACE_PRINT("[BOOT INTECRITY CHECK] SearchValidCertificate v2.1 --->");
 RPointerArray<HBufC8> binaryCertChainArray;
+CleanupResetAndDestroyPushL( binaryCertChainArray );
 // Get certificates in binary format.
 aEntry.CertificateChainsL( binaryCertChainArray );
 TInt chainCount = binaryCertChainArray.Count();
 BTIC_TRACE_PRINT_NUM("Entry chain count (1) = %d", chainCount );
 TBool retVal = EFalse;
 RPointerArray<CX509Certificate> chainCertArray;
+CleanupResetAndDestroyPushL( chainCertArray );
 // Check all entry's chains
 for ( TInt chain = 0; chain < chainCount; chain++ )
 {
 BTIC_TRACE_PRINT_NUM("Check chain nr = %d", chain);
 // If this is a valid certificate chain, break to loop.
 if ( retVal )
 {
 break;
 }
 } // FOR LOOP
-binaryCertChainArray.ResetAndDestroy();
+CleanupStack::PopAndDestroy( &chainCertArray );
+CleanupStack::PopAndDestroy( &binaryCertChainArray );
 BTIC_TRACE_PRINT("[BOOT INTECRITY CHECK] SearchValidCertificate v2.1 <---");
 return retVal;
 }

changeset 15	318c4eab2439
parent 0	164170e6151a