equal
deleted
inserted
replaced
16 */ |
16 */ |
17 |
17 |
18 |
18 |
19 #include "keytool_commands.h" |
19 #include "keytool_commands.h" |
20 |
20 |
|
21 #ifdef KEYTOOL |
|
22 _LIT(KDefaultKeyFile,"c:\\newkeys.dat"); |
|
23 #endif // KEYTOOL |
21 CKeyToolParameters::CKeyToolParameters() |
24 CKeyToolParameters::CKeyToolParameters() |
22 { |
25 { |
23 } |
26 } |
24 |
27 |
25 CKeyToolParameters* CKeyToolParameters::NewLC() |
28 CKeyToolParameters* CKeyToolParameters::NewLC() |
35 delete iDefault; |
38 delete iDefault; |
36 delete iLabel; |
39 delete iLabel; |
37 delete iPrivate; |
40 delete iPrivate; |
38 delete iOwnerType; |
41 delete iOwnerType; |
39 iUIDs.Close(); |
42 iUIDs.Close(); |
|
43 #ifdef KEYTOOL |
|
44 delete iOldKeyFile; |
|
45 delete iNewKeyFile; |
|
46 delete iAuthExpression; |
|
47 delete iPassphrase; |
|
48 #endif // KEYTOOL |
40 } |
49 } |
41 |
50 |
42 void CKeyToolParameters::ConstructL() |
51 void CKeyToolParameters::ConstructL() |
43 { |
52 { |
44 iAccess = CCTKeyInfo::EExtractable; |
53 iAccess = CCTKeyInfo::EExtractable; |
46 iCertstoreIndex = -1; |
55 iCertstoreIndex = -1; |
47 iKeystoreIndex = -1; |
56 iKeystoreIndex = -1; |
48 iPageWise = EFalse; |
57 iPageWise = EFalse; |
49 iRemoveKey = EFalse; |
58 iRemoveKey = EFalse; |
50 iPolicy = ENone; |
59 iPolicy = ENone; |
|
60 #ifdef KEYTOOL |
|
61 iFreshness = -1; |
|
62 iNewKeyFile = KDefaultKeyFile().AllocL(); |
|
63 #endif // KEYTOOL |
51 } |
64 } |
|
65 |