From: Richard Levitte <levitte@openssl.org>
Date: Thu, 18 Jul 2002 08:47:47 +0000 (+0000)
Subject: Make S/MIME output conform with the mail and MIME standards.
X-Git-Tag: OpenSSL_0_9_6e~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4f27f6be7377c800b3b311f30afbcdc2d1f8ad5a;p=oweals%2Fopenssl.git

Make S/MIME output conform with the mail and MIME standards.
PR: 151
---

diff --git a/apps/smime.c b/apps/smime.c
index ebdac15d06..756f2500d4 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -473,9 +473,9 @@ int MAIN(int argc, char **argv)
 	} else if(operation == SMIME_PK7OUT) {
 		PEM_write_bio_PKCS7(out, p7);
 	} else {
-		if(to) BIO_printf(out, "To: %s\n", to);
-		if(from) BIO_printf(out, "From: %s\n", from);
-		if(subject) BIO_printf(out, "Subject: %s\n", subject);
+		if(to) BIO_printf(out, "To: %s\r\n", to);
+		if(from) BIO_printf(out, "From: %s\r\n", from);
+		if(subject) BIO_printf(out, "Subject: %s\r\n", subject);
 		if(outformat == FORMAT_SMIME) 
 			SMIME_write_PKCS7(out, p7, in, flags);
 		else if(outformat == FORMAT_PEM) 
diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c
index 086d394270..fd1a962f23 100644
--- a/crypto/pkcs7/pk7_mime.c
+++ b/crypto/pkcs7/pk7_mime.c
@@ -164,34 +164,34 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
 			bound[i] = c;
 		}
 		bound[32] = 0;
-		BIO_printf(bio, "MIME-Version: 1.0\n");
+		BIO_printf(bio, "MIME-Version: 1.0\r\n");
 		BIO_printf(bio, "Content-Type: multipart/signed;");
 		BIO_printf(bio, " protocol=\"application/x-pkcs7-signature\";");
-		BIO_printf(bio, " micalg=sha1; boundary=\"----%s\"\n\n", bound);
+		BIO_printf(bio, " micalg=sha1; boundary=\"----%s\"\r\n\r\n", bound);
 		BIO_printf(bio, "This is an S/MIME signed message\n\n");
 		/* Now write out the first part */
 		BIO_printf(bio, "------%s\n", bound);
-		if(flags & PKCS7_TEXT) BIO_printf(bio, "Content-Type: text/plain\n\n");
+		if(flags & PKCS7_TEXT) BIO_printf(bio, "Content-Type: text/plain\r\n\r\n");
 		while((i = BIO_read(data, linebuf, MAX_SMLEN)) > 0) 
 						BIO_write(bio, linebuf, i);
-		BIO_printf(bio, "\n------%s\n", bound);
+		BIO_printf(bio, "\n------%s\r\n", bound);
 
 		/* Headers for signature */
 
-		BIO_printf(bio, "Content-Type: application/x-pkcs7-signature; name=\"smime.p7s\"\n");
-		BIO_printf(bio, "Content-Transfer-Encoding: base64\n");
-		BIO_printf(bio, "Content-Disposition: attachment; filename=\"smime.p7s\"\n\n");
+		BIO_printf(bio, "Content-Type: application/x-pkcs7-signature; name=\"smime.p7s\"\r\n");
+		BIO_printf(bio, "Content-Transfer-Encoding: base64\r\n");
+		BIO_printf(bio, "Content-Disposition: attachment; filename=\"smime.p7s\"\r\n\r\n");
 		B64_write_PKCS7(bio, p7);
-		BIO_printf(bio,"\n------%s--\n\n", bound);
+		BIO_printf(bio,"\r\n------%s--\r\n\r\n", bound);
 		return 1;
 	}
 	/* MIME headers */
-	BIO_printf(bio, "MIME-Version: 1.0\n");
-	BIO_printf(bio, "Content-Disposition: attachment; filename=\"smime.p7m\"\n");
-	BIO_printf(bio, "Content-Type: application/x-pkcs7-mime; name=\"smime.p7m\"\n");
-	BIO_printf(bio, "Content-Transfer-Encoding: base64\n\n");
+	BIO_printf(bio, "MIME-Version: 1.0\r\n");
+	BIO_printf(bio, "Content-Disposition: attachment; filename=\"smime.p7m\"\r\n");
+	BIO_printf(bio, "Content-Type: application/x-pkcs7-mime; name=\"smime.p7m\"\r\n");
+	BIO_printf(bio, "Content-Transfer-Encoding: base64\r\n\r\n");
 	B64_write_PKCS7(bio, p7);
-	BIO_printf(bio, "\n");
+	BIO_printf(bio, "\r\n");
 	return 1;
 }