diff -r 675a964f4eb5 -r 35751d3474b7 cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/testdatainput/sb003/safebag_sb003.txt
--- a/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/testdatainput/sb003/safebag_sb003.txt	Tue Jul 21 01:04:32 2009 +0100
+++ b/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/testdatainput/sb003/safebag_sb003.txt	Thu Sep 10 14:01:51 2009 +0300
@@ -1,239 +1,239 @@
-// 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
-
-// First key bag
-
-SEQUENCE
-	OID=PKCS12_BAGTYPES_KEYBAG
-	EXPLICIT
-		INCLUDE_BINARY_FILE=$7
-	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
-
-// Second Key bag
-
-SEQUENCE
-	OID=PKCS12_BAGTYPES_KEYBAG
-	EXPLICIT
-		INCLUDE_BINARY_FILE=$7
-	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
-
-
-// certbag
-SEQUENCE
-	OID=PKCS12_BAGTYPES_CERTBAG
-	EXPLICIT
-		// CertBag
-		SEQUENCE
-			OID=PKCS9_CERTTYPES_PKCS12_X509
-			EXPLICIT
-				OCTETSTRING
-					INCLUDE_BINARY_FILE=$8
-				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
-
-
-// first shrouded key bag
-SEQUENCE
-	OID=PKCS12_BAGTYPES_PKCS8SHROUDEDKEYBAG
-	EXPLICIT
-		OUTPUT_BINARY_FILE=safebag.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
-
-// second shrouded key bag
-SEQUENCE
-	OID=PKCS12_BAGTYPES_PKCS8SHROUDEDKEYBAG
-	EXPLICIT
-		// 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
-	// 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
-
-
-// Third shrouded key bag
-SEQUENCE
-	OID=PKCS12_BAGTYPES_PKCS8SHROUDEDKEYBAG
-	EXPLICIT
-		// 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
-	// 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
+
+// First key bag
+
+SEQUENCE
+	OID=PKCS12_BAGTYPES_KEYBAG
+	EXPLICIT
+		INCLUDE_BINARY_FILE=$7
+	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
+
+// Second Key bag
+
+SEQUENCE
+	OID=PKCS12_BAGTYPES_KEYBAG
+	EXPLICIT
+		INCLUDE_BINARY_FILE=$7
+	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
+
+
+// certbag
+SEQUENCE
+	OID=PKCS12_BAGTYPES_CERTBAG
+	EXPLICIT
+		// CertBag
+		SEQUENCE
+			OID=PKCS9_CERTTYPES_PKCS12_X509
+			EXPLICIT
+				OCTETSTRING
+					INCLUDE_BINARY_FILE=$8
+				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
+
+
+// first shrouded key bag
+SEQUENCE
+	OID=PKCS12_BAGTYPES_PKCS8SHROUDEDKEYBAG
+	EXPLICIT
+		OUTPUT_BINARY_FILE=safebag.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
+
+// second shrouded key bag
+SEQUENCE
+	OID=PKCS12_BAGTYPES_PKCS8SHROUDEDKEYBAG
+	EXPLICIT
+		// 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
+	// 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
+
+
+// Third shrouded key bag
+SEQUENCE
+	OID=PKCS12_BAGTYPES_PKCS8SHROUDEDKEYBAG
+	EXPLICIT
+		// 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
+	// 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
+
+
+