diff -r 675a964f4eb5 -r 35751d3474b7 cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/testdatainput/pm003/safebag_shroudedkeybag.txt --- a/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/testdatainput/pm003/safebag_shroudedkeybag.txt Tue Jul 21 01:04:32 2009 +0100 +++ b/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/testdatainput/pm003/safebag_shroudedkeybag.txt Thu Sep 10 14:01:51 2009 +0300 @@ -1,56 +1,56 @@ -// SafeContents -// PARAM1: salt -// PARAM2: iteration count -// PARAM3: cipher_oid -// PARAM4: cipher -// PARAM5: key -// PARAM6: iv -// PARAM7: The filename of the DER encoded keyfile -// PARAM8: The name of the certificate file -// PARAM9: The 'friendly' name of the certificate -// SafeBag -SEQUENCE - OID=PKCS12_BAGTYPES_PKCS8SHROUDEDKEYBAG - EXPLICIT - OUTPUT_BINARY_FILE=safebag_shrouded_pm003.der,1 - // KeyBag - SEQUENCE - SEQUENCE - OID=$3 - SEQUENCE - OCTETSTRING - RAW=$1 - END - INTEGER=$2 - END - END - OCTETSTRING - ENCRYPT=$4,$5,$6 - INCLUDE_BINARY_FILE=$7 - END - END - END - END - END - // Attributes - SET - SEQUENCE - OID=PKCS9_LOCAL_KEYID - SET - OCTETSTRING - HASH=sha1 - INCLUDE_BINARY_FILE=$8 - END - END - END - END - SEQUENCE - OID=PKCS9_FRIENDLY_NAME - SET - BMPSTRING=symbian - END - END - END -END - - +// SafeContents +// PARAM1: salt +// PARAM2: iteration count +// PARAM3: cipher_oid +// PARAM4: cipher +// PARAM5: key +// PARAM6: iv +// PARAM7: The filename of the DER encoded keyfile +// PARAM8: The name of the certificate file +// PARAM9: The 'friendly' name of the certificate +// SafeBag +SEQUENCE + OID=PKCS12_BAGTYPES_PKCS8SHROUDEDKEYBAG + EXPLICIT + OUTPUT_BINARY_FILE=safebag_shrouded_pm003.der,1 + // KeyBag + SEQUENCE + SEQUENCE + OID=$3 + SEQUENCE + OCTETSTRING + RAW=$1 + END + INTEGER=$2 + END + END + OCTETSTRING + ENCRYPT=$4,$5,$6 + INCLUDE_BINARY_FILE=$7 + END + END + END + END + END + // Attributes + SET + SEQUENCE + OID=PKCS9_LOCAL_KEYID + SET + OCTETSTRING + HASH=sha1 + INCLUDE_BINARY_FILE=$8 + END + END + END + END + SEQUENCE + OID=PKCS9_FRIENDLY_NAME + SET + BMPSTRING=symbian + END + END + END +END + +