--- a/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/ini/pm001.ini	Tue Jul 21 01:04:32 2009 +0100
+++ b/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/ini/pm001.ini	Thu Sep 10 14:01:51 2009 +0300
@@ -1,79 +1,79 @@
-;Keybag=1
-;ShroudedBag=2
-;Certbag=3
-;CrlBag=4
-;SecretBag=5
-;SafeContentsBag=6
-
-[main]
-file=C:\tpkcs12intg\data\pkcs12_pm001.p12
-integritymode=password
-integritypassword=password
-PrivacyPassword1=password
-PrivacyPassword2=password
-verifyintegritypassword =password
-MacPresent=True
-
-integrity_valid=1
-unittest=False
-; optional / unit tests
-[MacData]
-Mac=C:\tpkcs12intg\data\pm001_mac
-MacSalt=C:\tpkcs12intg\data\pm001_macsalt
-IterationCount=2048
-;KErrArgument
-ExpectedError=-6
-[authsafe]
-numcontentinfos=2
-contentinfo1=ContentInfo_1
-contentinfo2=ContentInfo_2
-; optional / unit tests
-;KErrArgument	
-ExpectedError=-6
-
-[ContentInfo_1]
-ContentInfoType=6
-; optional / unit tests
-Cipher=5 ; ECipherRC2_CBC_40
-IV=
-Salt=7C:B4:71:C1:79:C7:48:7E
-IterationCount=2048
-ExpectedError1=-6; KErrArgument
-ExpectedError2=-5; KErrNotSupported
-
-[ContentInfo_2]
-ContentInfoType=1
-; optional / unit tests
-ExpectedError1=-6; KErrArgument
-ExpectedError2=-5; KErrNotSupported			
-	
-;Certbag=3
-[BagData1]
-BagType=3
-BagValue=c:\tpkcs12intg\data\root5ca.der
-CertType=1.2.840.113549.1.9.22.1
-;unit test/optional
-ExpectedError=-6 ; KErrArgument
-
-;ShroudedBag=2
-[BagData2]
-BagType=2
-safeBagprivacypassword=password
-BagValue=c:\tpkcs12intg\data\safebag_shrouded_pm002.der
-EncodedBagValue=c:\tpkcs12intg\data\root5ca_key.pk8
-numattributes=1
-attr1=bag2attr1
-
-;unit test/optional
-PrivateKeyInfoVersion=0
-PrivateKeyInfoAlgorithm=ERSA
-
- ; KErrArgument
-ExpectedError1=-6
- ; KErrNotSupported
-ExpectedError2=-5
-
-[bag2attr1]
-id=1.2.840.113549.1.9.21
-numvalues=1
-value1=c:\tpkcs12intg\data\localkeyid.der
+;Keybag=1
+;ShroudedBag=2
+;Certbag=3
+;CrlBag=4
+;SecretBag=5
+;SafeContentsBag=6
+
+[main]
+file=C:\tpkcs12intg\data\pkcs12_pm001.p12
+integritymode=password
+integritypassword=password
+PrivacyPassword1=password
+PrivacyPassword2=password
+verifyintegritypassword =password
+MacPresent=True
+
+integrity_valid=1
+unittest=False
+; optional / unit tests
+[MacData]
+Mac=C:\tpkcs12intg\data\pm001_mac
+MacSalt=C:\tpkcs12intg\data\pm001_macsalt
+IterationCount=2048
+;KErrArgument
+ExpectedError=-6
+[authsafe]
+numcontentinfos=2
+contentinfo1=ContentInfo_1
+contentinfo2=ContentInfo_2
+; optional / unit tests
+;KErrArgument	
+ExpectedError=-6
+
+[ContentInfo_1]
+ContentInfoType=6
+; optional / unit tests
+Cipher=5 ; ECipherRC2_CBC_40
+IV=
+Salt=7C:B4:71:C1:79:C7:48:7E
+IterationCount=2048
+ExpectedError1=-6; KErrArgument
+ExpectedError2=-5; KErrNotSupported
+
+[ContentInfo_2]
+ContentInfoType=1
+; optional / unit tests
+ExpectedError1=-6; KErrArgument
+ExpectedError2=-5; KErrNotSupported			
+	
+;Certbag=3
+[BagData1]
+BagType=3
+BagValue=c:\tpkcs12intg\data\root5ca.der
+CertType=1.2.840.113549.1.9.22.1
+;unit test/optional
+ExpectedError=-6 ; KErrArgument
+
+;ShroudedBag=2
+[BagData2]
+BagType=2
+safeBagprivacypassword=password
+BagValue=c:\tpkcs12intg\data\safebag_shrouded_pm002.der
+EncodedBagValue=c:\tpkcs12intg\data\root5ca_key.pk8
+numattributes=1
+attr1=bag2attr1
+
+;unit test/optional
+PrivateKeyInfoVersion=0
+PrivateKeyInfoAlgorithm=ERSA
+
+ ; KErrArgument
+ExpectedError1=-6
+ ; KErrNotSupported
+ExpectedError2=-5
+
+[bag2attr1]
+id=1.2.840.113549.1.9.21
+numvalues=1
+value1=c:\tpkcs12intg\data\localkeyid.der