diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2016-05-19 17:22:57 +0100 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2016-05-19 22:43:00 +0100 |
commit | 2197494da6a2f4b1cc7024bb647c775f277f53c5 (patch) | |
tree | a2dad59145200bddc550e347d684d9e62c3f385e /apps/cms.c | |
parent | 6c4be50a5d775866e79b2f58fafb23a862bd38b2 (diff) |
Use correct EOL in headers.
RT#1817
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps/cms.c')
-rw-r--r-- | apps/cms.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/cms.c b/apps/cms.c index 1c3069f764..3a9b7af7b9 100644 --- a/apps/cms.c +++ b/apps/cms.c @@ -216,6 +216,7 @@ int cms_main(int argc, char **argv) unsigned char *pwri_pass = NULL, *pwri_tmp = NULL; unsigned char *secret_key = NULL, *secret_keyid = NULL; long ltmp; + const char *mime_eol = "\n"; OPTION_CHOICE o; if ((vpm = X509_VERIFY_PARAM_new()) == NULL) @@ -348,6 +349,7 @@ int cms_main(int argc, char **argv) flags |= CMS_NOOLDMIMETYPE; break; case OPT_CRLFEOL: + mime_eol = "\r\n"; flags |= CMS_CRLFEOL; break; case OPT_NOOUT: @@ -1040,11 +1042,11 @@ int cms_main(int argc, char **argv) CMS_ContentInfo_print_ctx(out, cms, 0, NULL); } else if (outformat == FORMAT_SMIME) { if (to) - BIO_printf(out, "To: %s\n", to); + BIO_printf(out, "To: %s%s", to, mime_eol); if (from) - BIO_printf(out, "From: %s\n", from); + BIO_printf(out, "From: %s%s", from, mime_eol); if (subject) - BIO_printf(out, "Subject: %s\n", subject); + BIO_printf(out, "Subject: %s%s", subject, mime_eol); if (operation == SMIME_RESIGN) ret = SMIME_write_CMS(out, cms, indata, flags); else |