diff options
| author | Werner Koch <[email protected]> | 2016-07-13 13:11:46 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-07-13 13:11:46 +0000 |
| commit | 4ef62278e3c9406360dc50288f422291497e218f (patch) | |
| tree | fff3a49be5c2659ab87195e5b0a4f88e51a49205 /g10/encrypt.c | |
| parent | Merge branch 'master' into STABLE-BRANCH-2-2 (diff) | |
| parent | gpg: New option --mimemode. (diff) | |
| download | gnupg-4ef62278e3c9406360dc50288f422291497e218f.tar.gz gnupg-4ef62278e3c9406360dc50288f422291497e218f.zip | |
Merge branch 'master' into STABLE-BRANCH-2-2
--
Diffstat (limited to '')
| -rw-r--r-- | g10/encrypt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c index 57d24bef1..54a17c31e 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -335,7 +335,7 @@ encrypt_simple (const char *filename, int mode, int use_seskey) { /* Note that PT has been initialized above in !no_literal mode. */ pt->timestamp = make_timestamp(); - pt->mode = opt.textmode? 't' : 'b'; + pt->mode = opt.mimemode? 'm' : opt.textmode? 't' : 'b'; pt->len = filesize; pt->new_ctb = !pt->len; pt->buf = inp; @@ -674,7 +674,7 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename, if (!opt.no_literal) { pt->timestamp = make_timestamp(); - pt->mode = opt.textmode ? 't' : 'b'; + pt->mode = opt.mimemode? 'm' : opt.textmode ? 't' : 'b'; pt->len = filesize; pt->new_ctb = !pt->len; pt->buf = inp; |