diff -r 675a964f4eb5 -r 35751d3474b7 cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/ini/cb001.ini
--- a/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/ini/cb001.ini	Tue Jul 21 01:04:32 2009 +0100
+++ b/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/ini/cb001.ini	Thu Sep 10 14:01:51 2009 +0300
@@ -1,108 +1,108 @@
-;Keybag=1
-;ShroudedBag=2
-;Certbag=3
-;CrlBag=4
-;SecretBag=5
-;SafeContentsBag=6
-
-[main]
-file=C:\tpkcs12intg\data\pkcs12_cb001.p12
-integritymode=password
-integritypassword=password
-PrivacyPassword1=password
-PrivacyPassword2=password
-verifyintegritypassword =password
-
-MacPresent=True
-
-integrity_valid=1
-unittest=False
-; optional / unit tests
-ExpectedError1=-6
-ExpectedError2=-5
-[MacData]
-Mac=c:\tpkcs12intg\data\cb001_mac
-MacSalt=c:\tpkcs12intg\data\cb001_macsalt
-IterationCount=2048
-
-[authsafe]
-numcontentinfos=1
-contentinfo1=ContentInfo_1
-; optional / unit tests
-ExpectedError = -6;KErrArgument			
-
-[ContentInfo_1]
-ContentInfoType=1.2.840.113549.1.7.1
-privacypassword=password
-;unit test/optional
-ExpectedError1=-6; KErrArgument
-ExpectedError2=-5; KErrNotSupported
-
-[BagData1]
-BagType=1
-BagValue=c:\tpkcs12intg\data\root5ca_key.pk8
-numattributes=2
-attr1=bag1attr1
-attr2=bag1attr2
-;unit test/optional
-ExpectedError=-6; KErrArgument
-
-[bag1attr1]
-id=1.2.840.113549.1.9.21
-numvalues=1
-value1=c:\tpkcs12intg\data\localkeyid.der
-
-[bag1attr2]
-id=1.2.840.113549.1.9.20
-numvalues=1
-value1=c:\tpkcs12intg\data\friendlyname.der
-
-
-[BagData2]
-BagType=3
-BagValue=c:\tpkcs12intg\data\root5ca.der
-CertType=1.2.840.113549.1.9.22.1
-numattributes=2
-attr1=bag2attr1
-attr2=bag2attr2
-CertValue=
-;unit test/optional
-ExpectedError=-6; KErrArgument
-
-[bag2attr1]
-id=1.2.840.113549.1.9.21
-numvalues=1
-value1=c:\tpkcs12intg\data\localkeyid_cert.der
-
-[bag2attr2]
-id=1.2.840.113549.1.9.20
-numvalues=1
-value1=c:\tpkcs12intg\data\friendlyname.der
-
-[BagData3]
-BagType=6
-SafeBagsCount=0
-
-[BagData4]
-BagType=2
-safeBagprivacypassword=password
-EncodedBagValue=c:\tpkcs12intg\data\root5ca_key.pk8
-numattributes=2
-attr1=bag4attr1
-attr2=bag4attr2
-;unit test/optional
-ExpectedError=-6
-
-[bag4attr1]
-id=1.2.840.113549.1.9.21
-numvalues=1
-value1=c:\tpkcs12intg\data\localkeyid_shrouded.der
-
-[bag4attr2]
-id=1.2.840.113549.1.9.20
-numvalues=1
-value1=c:\tpkcs12intg\data\friendlyname.der
-
-
-
-	
+;Keybag=1
+;ShroudedBag=2
+;Certbag=3
+;CrlBag=4
+;SecretBag=5
+;SafeContentsBag=6
+
+[main]
+file=C:\tpkcs12intg\data\pkcs12_cb001.p12
+integritymode=password
+integritypassword=password
+PrivacyPassword1=password
+PrivacyPassword2=password
+verifyintegritypassword =password
+
+MacPresent=True
+
+integrity_valid=1
+unittest=False
+; optional / unit tests
+ExpectedError1=-6
+ExpectedError2=-5
+[MacData]
+Mac=c:\tpkcs12intg\data\cb001_mac
+MacSalt=c:\tpkcs12intg\data\cb001_macsalt
+IterationCount=2048
+
+[authsafe]
+numcontentinfos=1
+contentinfo1=ContentInfo_1
+; optional / unit tests
+ExpectedError = -6;KErrArgument			
+
+[ContentInfo_1]
+ContentInfoType=1.2.840.113549.1.7.1
+privacypassword=password
+;unit test/optional
+ExpectedError1=-6; KErrArgument
+ExpectedError2=-5; KErrNotSupported
+
+[BagData1]
+BagType=1
+BagValue=c:\tpkcs12intg\data\root5ca_key.pk8
+numattributes=2
+attr1=bag1attr1
+attr2=bag1attr2
+;unit test/optional
+ExpectedError=-6; KErrArgument
+
+[bag1attr1]
+id=1.2.840.113549.1.9.21
+numvalues=1
+value1=c:\tpkcs12intg\data\localkeyid.der
+
+[bag1attr2]
+id=1.2.840.113549.1.9.20
+numvalues=1
+value1=c:\tpkcs12intg\data\friendlyname.der
+
+
+[BagData2]
+BagType=3
+BagValue=c:\tpkcs12intg\data\root5ca.der
+CertType=1.2.840.113549.1.9.22.1
+numattributes=2
+attr1=bag2attr1
+attr2=bag2attr2
+CertValue=
+;unit test/optional
+ExpectedError=-6; KErrArgument
+
+[bag2attr1]
+id=1.2.840.113549.1.9.21
+numvalues=1
+value1=c:\tpkcs12intg\data\localkeyid_cert.der
+
+[bag2attr2]
+id=1.2.840.113549.1.9.20
+numvalues=1
+value1=c:\tpkcs12intg\data\friendlyname.der
+
+[BagData3]
+BagType=6
+SafeBagsCount=0
+
+[BagData4]
+BagType=2
+safeBagprivacypassword=password
+EncodedBagValue=c:\tpkcs12intg\data\root5ca_key.pk8
+numattributes=2
+attr1=bag4attr1
+attr2=bag4attr2
+;unit test/optional
+ExpectedError=-6
+
+[bag4attr1]
+id=1.2.840.113549.1.9.21
+numvalues=1
+value1=c:\tpkcs12intg\data\localkeyid_shrouded.der
+
+[bag4attr2]
+id=1.2.840.113549.1.9.20
+numvalues=1
+value1=c:\tpkcs12intg\data\friendlyname.der
+
+
+
+