diff -r 675a964f4eb5 -r 35751d3474b7 cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/ini/pm006.ini --- a/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/ini/pm006.ini Tue Jul 21 01:04:32 2009 +0100 +++ b/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/ini/pm006.ini Thu Sep 10 14:01:51 2009 +0300 @@ -1,74 +1,74 @@ -;Keybag=1 -;ShroudedBag=2 -;Certbag=3 -;CrlBag=4 -;SecretBag=5 -;SafeContentsBag=6 - -[main] -file=C:\tpkcs12intg\data\pkcs12_pm006.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\pm006_mac -MacSalt=c:\tpkcs12intg\data\pm006_macsalt -IterationCount=1024 -ExpectedError=-6 ;KErrArgument - -[authsafe] -numcontentinfos=2 -contentinfo1=ContentInfo_1 -contentinfo2=ContentInfo_2 -; optional / unit tests -ExpectedError=-6 ;KErrArgument - -[ContentInfo_1] -ContentInfoType=6 -;unit test/optional -Cipher=12 ; ECipherRC2_CBC_40_5 -IV= -Salt=07:EE:43:28:2E:FF:F9:D4 -IterationCount=2048 -ExpectedError1=-6; KErrArgument -ExpectedError2=-5; KErrNotSupported - -[ContentInfo_2] -ContentInfoType=1 -;unit test/optional -ExpectedError1=-6; KErrArgument -ExpectedError2=-5; KErrNotSupported - -[BagData1] -BagType=3 -BagValue=c:\tpkcs12intg\data\root5ca.der -CertType=1.2.840.113549.1.9.22.1 -numattributes=0 - -;unit test/optional -ExpectedError=-6 ; KErrArgument - -[BagData2] -BagType=2 -safeBagprivacypassword=password -BagValue=c:\tpkcs12intg\data\safebag_shrouded_pm006.der -EncodedBagValue=c:\tpkcs12intg\data\root5ca_key.pk8 -numattributes=1 -attr1=bag2attr1 -;optional / unit tests - -ExpectedError1=-6 ; KErrArgument -ExpectedError2=-5 ; KErrNotSupported - -[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_pm006.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\pm006_mac +MacSalt=c:\tpkcs12intg\data\pm006_macsalt +IterationCount=1024 +ExpectedError=-6 ;KErrArgument + +[authsafe] +numcontentinfos=2 +contentinfo1=ContentInfo_1 +contentinfo2=ContentInfo_2 +; optional / unit tests +ExpectedError=-6 ;KErrArgument + +[ContentInfo_1] +ContentInfoType=6 +;unit test/optional +Cipher=12 ; ECipherRC2_CBC_40_5 +IV= +Salt=07:EE:43:28:2E:FF:F9:D4 +IterationCount=2048 +ExpectedError1=-6; KErrArgument +ExpectedError2=-5; KErrNotSupported + +[ContentInfo_2] +ContentInfoType=1 +;unit test/optional +ExpectedError1=-6; KErrArgument +ExpectedError2=-5; KErrNotSupported + +[BagData1] +BagType=3 +BagValue=c:\tpkcs12intg\data\root5ca.der +CertType=1.2.840.113549.1.9.22.1 +numattributes=0 + +;unit test/optional +ExpectedError=-6 ; KErrArgument + +[BagData2] +BagType=2 +safeBagprivacypassword=password +BagValue=c:\tpkcs12intg\data\safebag_shrouded_pm006.der +EncodedBagValue=c:\tpkcs12intg\data\root5ca_key.pk8 +numattributes=1 +attr1=bag2attr1 +;optional / unit tests + +ExpectedError1=-6 ; KErrArgument +ExpectedError2=-5 ; KErrNotSupported + +[bag2attr1] +id=1.2.840.113549.1.9.21 +numvalues=1 +value1=c:\tpkcs12intg\data\localkeyid.der +