diff -r 000000000000 -r 2c201484c85f cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/ini/cb003.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/ini/cb003.ini	Wed Jul 08 11:25:26 2009 +0100
@@ -0,0 +1,192 @@
+;Keybag=1
+;ShroudedBag=2
+;Certbag=3
+;CrlBag=4
+;SecretBag=5
+;SafeContentsBag=6
+
+
+
+[main]
+file=C:\tpkcs12intg\data\pkcs12_cb003.p12
+integritymode=password
+integritypassword=password
+PrivacyPassword1=password
+PrivacyPassword2=password
+verifyintegritypassword =password
+MacPresent=True
+
+integrity_valid=1
+unittest=True
+; optional / unit tests
+[MacData]
+Mac=c:\tpkcs12intg\data\cb003_mac
+MacSalt=c:\tpkcs12intg\data\cb003_macsalt
+IterationCount=2048
+ExpectedError=-6 ; KErrArgument
+
+[authsafe]
+numcontentinfos=1
+contentinfo1=ContentInfo_1
+; optional / unit tests
+ExpectedError = -6;KErrArgument	
+
+[ContentInfo_1]
+ContentInfoType=1
+privacypassword=password
+;unit test/optional
+ExpectedError1=-6; KErrArgument
+ExpectedError2=-5; KErrNotSupported
+		
+[BagData1]
+BagType=6
+SafeBagsCount=3
+
+[BagData2]
+BagType=1
+BagValue=c:\tpkcs12intg\data\root5ca_key.pk8
+numattributes=2
+attr1=bag2attr1
+attr2=bag2attr2
+;unit test/optional
+ExpectedError=-6; KErrArgument
+
+
+[bag2attr1]
+id=1.2.840.113549.1.9.21
+numvalues=1
+value1=c:\tpkcs12intg\data\localkeyid.der
+
+[bag2attr2]
+id=1.2.840.113549.1.9.20
+numvalues=1
+value1=c:\tpkcs12intg\data\friendlyname.der
+
+
+[BagData3]
+BagType=3	
+BagValue=c:\tpkcs12intg\data\root5ca.der
+numattributes=2
+attr1=bag3attr1
+attr2=bag3attr2
+CertType=1.2.840.113549.1.9.22.1
+CertValue=
+;unit test/optional
+ExpectedError=-6 ; KErrArgument
+
+[bag3attr1]
+id=1.2.840.113549.1.9.21
+numvalues=1
+value1=c:\tpkcs12intg\data\localkeyid.der
+
+[bag3attr2]
+id=1.2.840.113549.1.9.20
+numvalues=1
+value1=c:\tpkcs12intg\data\friendlyname.der
+
+
+[BagData4]
+BagType=2
+safeBagprivacypassword=password
+EncodedBagValue=c:\tpkcs12intg\data\root5ca_key.pk8
+numattributes=2
+attr1=bag4attr1
+attr2=bag4attr2
+;optional / unit tests
+
+;unit test/optional
+ExpectedError1=-6; KErrArgument
+ExpectedError2=-5; KErrNotSupported
+
+[bag4attr1]
+id=1.2.840.113549.1.9.21
+numvalues=1
+value1=c:\tpkcs12intg\data\localkeyid.der
+
+[bag4attr2]
+id=1.2.840.113549.1.9.20
+numvalues=1
+value1=c:\tpkcs12intg\data\friendlyname.der
+
+[BagData5]
+BagType=6
+SafeBagsCount=0
+
+[BagData6]
+BagType=6
+SafeBagsCount=5
+
+
+[BagData7]
+BagType=1
+BagValue=c:\tpkcs12intg\data\root5ca_key.pk8
+numattributes=2
+attr1=bag7attr1
+attr2=bag7attr2
+;unit test/optional
+ExpectedError=-6 ; KErrArgument
+
+[bag7attr1]
+id=1.2.840.113549.1.9.21
+numvalues=1
+value1=c:\tpkcs12intg\data\localkeyid.der
+
+[bag7attr2]
+id=1.2.840.113549.1.9.20
+numvalues=1
+value1=c:\tpkcs12intg\data\friendlyname.der
+
+[BagData8]
+BagType=3
+BagValue=c:\tpkcs12intg\data\root5ca.der
+numattributes=2
+attr1=bag8attr1
+attr2=bag8attr2
+CertType=1.2.840.113549.1.9.22.1
+;unit test/optional
+ExpectedError=-6 ; KErrArgument 
+
+[bag8attr1]
+id=1.2.840.113549.1.9.21
+numvalues=1
+value1=c:\tpkcs12intg\data\localkeyid.der
+
+[bag8attr2]
+id=1.2.840.113549.1.9.20
+numvalues=1
+value1=c:\tpkcs12intg\data\friendlyname.der
+	
+
+
+[BagData9]
+BagType=4 This is CRL bag, check for bagvalue, bagattributes
+;unit test/optional
+ExpectedError=-6 ; KErrArgument
+
+[BagData10]
+BagType=5 This is CRL bag, check for bagvalue, bagattributes
+;unit test/optional
+ExpectedError=-6 ; KErrArgument
+
+
+[BagData11]
+BagType=2
+password=password
+EncodedBagValue=c:\tpkcs12intg\data\root5ca_key.pk8
+numattributes=2
+attr1=bag11attr1
+attr2=bag11attr2
+;optional / unit tests
+
+ExpectedError1=-6 ; KErrArgument
+ExpectedError2=-5 ; KErrNotSupported
+
+[bag11attr1]
+id=1.2.840.113549.1.9.21
+numvalues=1
+value1=c:\tpkcs12intg\data\localkeyid.der
+
+[bag11attr2]
+id=1.2.840.113549.1.9.20
+numvalues=1
+value1=c:\tpkcs12intg\data\friendlyname.der