diff options
| author | Werner Koch <[email protected]> | 2016-07-13 11:31:12 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-07-13 11:31:12 +0000 |
| commit | e148c3caa90fbadba32bdbfea9513392e3aea598 (patch) | |
| tree | fff3a49be5c2659ab87195e5b0a4f88e51a49205 /g10/build-packet.c | |
| parent | wks: Use correct key for the confirmation (diff) | |
| download | gnupg-e148c3caa90fbadba32bdbfea9513392e3aea598.tar.gz gnupg-e148c3caa90fbadba32bdbfea9513392e3aea598.zip | |
gpg: New option --mimemode.
* g10/gpg.c (oMimemode): New.
(opts): Add --mimemode.
(main): Use --mimemode only in rfc4880bis compliance mode.
* g10/options.h (struct opt): Add field "mimemode".
* g10/build-packet.c (do_plaintext): Allow for mode 'm'.
* g10/encrypt.c (encrypt_simple, encrypt_crypt): Use 'm' if requested.
* g10/plaintext.c (handle_plaintext): Handle 'm' mode.
* g10/sign.c (write_plaintext_packet): Handle 'm' mode.
(sign_file, sign_symencrypt_file): Use 'm' if requested.
--
Thsi patch prepares for a proposed change in RFC4880bis to support a
MIME flag. A literal data packet with the mime flag set is handled
like a 't' or 'u' but CR are not removed. The PLAINTEXT status line
will also indicate a MIME content.
If --mimemode is used without --rfc4880bis 't' will be used.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/build-packet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/build-packet.c b/g10/build-packet.c index 21cd004a8..86d42efe1 100644 --- a/g10/build-packet.c +++ b/g10/build-packet.c @@ -635,6 +635,7 @@ do_plaintext( IOBUF out, int ctb, PKT_plaintext *pt ) write_header(out, ctb, calc_plaintext( pt ) ); log_assert (pt->mode == 'b' || pt->mode == 't' || pt->mode == 'u' + || pt->mode == 'm' || pt->mode == 'l' || pt->mode == '1'); iobuf_put(out, pt->mode ); iobuf_put(out, pt->namelen ); |