diff -r 675a964f4eb5 -r 35751d3474b7 cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/ini/im001.ini --- a/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/ini/im001.ini Tue Jul 21 01:04:32 2009 +0100 +++ b/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/ini/im001.ini Thu Sep 10 14:01:51 2009 +0300 @@ -1,57 +1,57 @@ -;Keybag=1 -;ShroudedBag=2 -;Certbag=3 -;CrlBag=4 -;SecretBag=5 -;SafeContentsBag=6 - -[main] -file=C:\tpkcs12intg\data\pkcs12_im001.p12 -integritymode=password -integritypassword=password -PrivacyPassword1=password -verifyintegritypassword=password -MacPresent=True - -integrity_valid=1 -unittest=True -; optional / unit tests -[MacData] -Mac=c:\tpkcs12intg\data\im001_mac -MacSalt=c:\tpkcs12intg\data\im001_macsalt -IterationCount=2048 -ExpectedError = -6;KErrArgument - -[authsafe] -numcontentinfos=1 -contentinfo1=ContentInfo_1 -; optional / unit tests -ExpectedError = -6;KErrArgument - -[ContentInfo_1] -ContentInfoType=1.2.840.113549.1.7.1 -; optional / unit tests -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 - - +;Keybag=1 +;ShroudedBag=2 +;Certbag=3 +;CrlBag=4 +;SecretBag=5 +;SafeContentsBag=6 + +[main] +file=C:\tpkcs12intg\data\pkcs12_im001.p12 +integritymode=password +integritypassword=password +PrivacyPassword1=password +verifyintegritypassword=password +MacPresent=True + +integrity_valid=1 +unittest=True +; optional / unit tests +[MacData] +Mac=c:\tpkcs12intg\data\im001_mac +MacSalt=c:\tpkcs12intg\data\im001_macsalt +IterationCount=2048 +ExpectedError = -6;KErrArgument + +[authsafe] +numcontentinfos=1 +contentinfo1=ContentInfo_1 +; optional / unit tests +ExpectedError = -6;KErrArgument + +[ContentInfo_1] +ContentInfoType=1.2.840.113549.1.7.1 +; optional / unit tests +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 + +