equal
deleted
inserted
replaced
21 #include "CSWICertStoreEntry.h" |
21 #include "CSWICertStoreEntry.h" |
22 #include "CSWICertStoreTokenType.h" |
22 #include "CSWICertStoreTokenType.h" |
23 #include "CSWICertStoreToken.h" |
23 #include "CSWICertStoreToken.h" |
24 #include "unifiedcertstore.h" |
24 #include "unifiedcertstore.h" |
25 #include "log.h" |
25 #include "log.h" |
26 #include "certstorepatchdata.h" |
26 |
|
27 #include <certstorepatchdata.h> |
27 #include <ccertattributefilter.h> |
28 #include <ccertattributefilter.h> |
28 #include <sectcbutil.h> |
29 #include <f32file.h> |
29 #include <u32hal.h> |
30 #include <u32hal.h> |
30 |
31 |
31 _LIT(KSWICertStoreZFilename,"z:\\resource\\swicertstore.dat"); |
32 _LIT(KSWICertStoreZFilename,"z:\\resource\\swicertstore.dat"); |
32 _LIT(KSWIWritableCertStorePath,"!:\\resource\\swicertstore\\dat\\"); |
33 _LIT(KSWIWritableCertStorePath,"!:\\resource\\swicertstore\\dat\\"); |
33 _LIT(KSWIROMCertStoreFilenamePattern,"z:\\resource\\swicertstore*.dat"); |
34 _LIT(KSWIROMCertStoreFilenamePattern,"z:\\resource\\swicertstore*.dat"); |
131 // Open the store if it is there |
132 // Open the store if it is there |
132 RFile file; |
133 RFile file; |
133 CDir* entryList = NULL; |
134 CDir* entryList = NULL; |
134 |
135 |
135 TPath writableSwiCertStorePath(KSWIWritableCertStorePath); |
136 TPath writableSwiCertStorePath(KSWIWritableCertStorePath); |
136 TChar systemDriveChar = SecTcbUtil::GetSystemDriveChar(SecTcbUtil::GetSystemDrive()); |
137 |
|
138 TChar systemDriveChar = RFs::GetSystemDriveChar(); |
|
139 |
137 writableSwiCertStorePath[0] = systemDriveChar; |
140 writableSwiCertStorePath[0] = systemDriveChar; |
138 |
141 |
139 if (KErrNone == iFs.GetDir (writableSwiCertStorePath, KEntryAttNormal, |
142 if (KErrNone == iFs.GetDir (writableSwiCertStorePath, KEntryAttNormal, |
140 ESortByName|EDirsFirst, entryList)) |
143 ESortByName|EDirsFirst, entryList)) |
141 { |
144 { |
511 { |
514 { |
512 const CSWICertStoreEntry& entry = aEntryList.GetByIndex(index); |
515 const CSWICertStoreEntry& entry = aEntryList.GetByIndex(index); |
513 AddIfMatchesFilterL(aCerts, aFilter, entry); |
516 AddIfMatchesFilterL(aCerts, aFilter, entry); |
514 } |
517 } |
515 } |
518 } |
|
519 |
|
520 |