summaryrefslogtreecommitdiffstats
path: root/apps/cms.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2015-09-04 02:46:47 +0200
committerRichard Levitte <levitte@openssl.org>2015-09-06 01:29:36 +0200
commitd303b9d85e1888494785f87ebd9bd233e63564a9 (patch)
treeefb8e31a76f8c4541d79246b10a4fb70f79347c7 /apps/cms.c
parente9daa8150abc8d96dd1e4dcd764355851f06ef2b (diff)
Make the handling of output and input formats consistent
Most of all, we needed to sort out which ones are binary and which ones are text, and make sure they are treated accordingly and consistently so Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'apps/cms.c')
-rw-r--r--apps/cms.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/cms.c b/apps/cms.c
index e40686b5d4..599f21774e 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -690,16 +690,14 @@ int cms_main(int argc, char **argv)
flags &= ~CMS_DETACHED;
if (operation & SMIME_OP) {
- if (outformat == FORMAT_ASN1)
- outmode = "wb";
+ outmode = WB(outformat);
} else {
if (flags & CMS_BINARY)
outmode = "wb";
}
if (operation & SMIME_IP) {
- if (informat == FORMAT_ASN1)
- inmode = "rb";
+ inmode = RB(informat);
} else {
if (flags & CMS_BINARY)
inmode = "rb";