diff -r 675a964f4eb5 -r 35751d3474b7 cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/testdatainput/oomencrypteddata/oomencrypteddata.txt --- a/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/testdatainput/oomencrypteddata/oomencrypteddata.txt Tue Jul 21 01:04:32 2009 +0100 +++ b/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/testdatainput/oomencrypteddata/oomencrypteddata.txt Thu Sep 10 14:01:51 2009 +0300 @@ -1,49 +1,49 @@ -// A simple PKCS#12 file containing a certificate and a private key. - -SEQUENCE - // Version - INTEGER=3 - - // authSafe - PFX - SEQUENCE - OID=PKCS7_DATA - EXPLICIT - OCTETSTRING - OUTPUT_BINARY_FILE=authsafecontents.der,1 - // First PDU - SEQUENCE - INCLUDE=encrypted_contentinfo.txt,07:EE:43:28:2E:FF:F9:D4,1024,PKCS12_PBEIDS_SHAAND40BITRC2CBC,rc2-40-cbc,928fc8bcc6,f59b7405f41d3314,../safecontents.txt,safebag_certbag.txt,../root5ca.der,Encrypted ContentInfo - - END - END - END - END - END - - // macData - SEQUENCE - // DigestInfo - SEQUENCE - SEQUENCE - OID=SHA1 - NULL - END - // DIGEST - OCTETSTRING - OUTPUT_BINARY_FILE=pm001_mac,1 - HMAC=SHA1,d9c9d4803178c611251ccefef608bda2bf7ec183 - INCLUDE_BINARY_FILE=authsafecontents.der - END - END - END - END - // macSalt - OCTETSTRING - OUTPUT_BINARY_FILE=pm001_macsalt,1 - RAW=6F:85:5D:15:3C:61:8D:4C - END - END - // iterations - INTEGER=2048 - END +// A simple PKCS#12 file containing a certificate and a private key. + +SEQUENCE + // Version + INTEGER=3 + + // authSafe - PFX + SEQUENCE + OID=PKCS7_DATA + EXPLICIT + OCTETSTRING + OUTPUT_BINARY_FILE=authsafecontents.der,1 + // First PDU + SEQUENCE + INCLUDE=encrypted_contentinfo.txt,07:EE:43:28:2E:FF:F9:D4,1024,PKCS12_PBEIDS_SHAAND40BITRC2CBC,rc2-40-cbc,928fc8bcc6,f59b7405f41d3314,../safecontents.txt,safebag_certbag.txt,../root5ca.der,Encrypted ContentInfo + + END + END + END + END + END + + // macData + SEQUENCE + // DigestInfo + SEQUENCE + SEQUENCE + OID=SHA1 + NULL + END + // DIGEST + OCTETSTRING + OUTPUT_BINARY_FILE=pm001_mac,1 + HMAC=SHA1,d9c9d4803178c611251ccefef608bda2bf7ec183 + INCLUDE_BINARY_FILE=authsafecontents.der + END + END + END + END + // macSalt + OCTETSTRING + OUTPUT_BINARY_FILE=pm001_macsalt,1 + RAW=6F:85:5D:15:3C:61:8D:4C + END + END + // iterations + INTEGER=2048 + END END \ No newline at end of file