equal
deleted
inserted
replaced
23 #include <hash.h> |
23 #include <hash.h> |
24 #include <asn1dec.h> |
24 #include <asn1dec.h> |
25 #include <x509cert.h> |
25 #include <x509cert.h> |
26 #include <etelmm.h> |
26 #include <etelmm.h> |
27 #include <mmtsy_names.h> |
27 #include <mmtsy_names.h> |
|
28 #include <featmgr.h> |
28 |
29 |
29 #ifdef RD_MULTIPLE_DRIVE |
30 #ifdef RD_MULTIPLE_DRIVE |
30 #include <driveinfo.h> |
31 #include <driveinfo.h> |
31 #endif |
32 #endif |
32 |
33 |
208 |
209 |
209 LOG(_L("CDrmStdKeyStorage::ConstructL ->")); |
210 LOG(_L("CDrmStdKeyStorage::ConstructL ->")); |
210 User::LeaveIfError(iFs.Connect()); |
211 User::LeaveIfError(iFs.Connect()); |
211 iFileMan = CFileMan::NewL(iFs); |
212 iFileMan = CFileMan::NewL(iFs); |
212 |
213 |
213 #ifdef __DRM_OMA2 |
214 FeatureManager::InitializeLibL(); |
214 TRAP_IGNORE( SelectDefaultRootL() ); // Allow startup anyway. |
215 |
215 #endif |
216 #ifdef __DRM_OMA2 |
216 |
217 if ( FeatureManager::FeatureSupported( KFeatureIdFfOmadrm2Support ) ) |
|
218 { |
|
219 TRAP_IGNORE( SelectDefaultRootL() ); |
|
220 } |
|
221 #endif |
|
222 |
|
223 FeatureManager::UnInitializeLib(); |
|
224 |
217 iDeviceSpecificKey.Copy(KDefaultKey); |
225 iDeviceSpecificKey.Copy(KDefaultKey); |
218 |
226 |
219 LOG(_L("CDrmStdKeyStorage::ConstructL <-")); |
227 LOG(_L("CDrmStdKeyStorage::ConstructL <-")); |
220 } |
228 } |
221 |
229 |
574 iFs.GetDir(KSingingCertPattern, KEntryAttNormal, ESortByName, dir); |
582 iFs.GetDir(KSingingCertPattern, KEntryAttNormal, ESortByName, dir); |
575 CleanupStack::PushL(dir); |
583 CleanupStack::PushL(dir); |
576 for (i = 0; i < dir->Count(); i++) |
584 for (i = 0; i < dir->Count(); i++) |
577 { |
585 { |
578 ReadFileL(iFs, (*dir)[i].iName, cert); |
586 ReadFileL(iFs, (*dir)[i].iName, cert); |
579 CleanupStack::PushL( cert ); |
|
580 aCertChain.AppendL(cert); |
587 aCertChain.AppendL(cert); |
581 CleanupStack::Pop( cert ); |
|
582 } |
588 } |
583 CleanupStack::PopAndDestroy(); // dir |
589 CleanupStack::PopAndDestroy(); // dir |
584 LOG(_L("CDrmStdKeyStorage::GetCertificateChainL <-")); |
590 LOG(_L("CDrmStdKeyStorage::GetCertificateChainL <-")); |
585 } |
591 } |
586 |
592 |