diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-09-04 02:46:47 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-09-06 01:29:36 +0200 |
| commit | d303b9d85e1888494785f87ebd9bd233e63564a9 (patch) | |
| tree | efb8e31a76f8c4541d79246b10a4fb70f79347c7 /apps/smime.c | |
| parent | Make the verify_extra test location agnostic (diff) | |
| download | openssl-d303b9d85e1888494785f87ebd9bd233e63564a9.tar.xz openssl-d303b9d85e1888494785f87ebd9bd233e63564a9.zip | |
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/smime.c')
| -rw-r--r-- | apps/smime.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/smime.c b/apps/smime.c index 45898de4c1..d597ebf534 100644 --- a/apps/smime.c +++ b/apps/smime.c @@ -427,16 +427,14 @@ int smime_main(int argc, char **argv) flags &= ~PKCS7_DETACHED; if (operation & SMIME_OP) { - if (outformat == FORMAT_ASN1) - outmode = "wb"; + outmode = WB(outformat); } else { if (flags & PKCS7_BINARY) outmode = "wb"; } if (operation & SMIME_IP) { - if (informat == FORMAT_ASN1) - inmode = "rb"; + inmode = RB(informat); } else { if (flags & PKCS7_BINARY) inmode = "rb"; |