diff options
| author | David Shaw <[email protected]> | 2003-09-09 00:25:53 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-09-09 00:25:53 +0000 |
| commit | 405d9dfc59a44b84f22d4d4740e0a91b8729370b (patch) | |
| tree | 86aab71cce8a8178ab7dae82df07a5a8350a5bad /g10/encode.c | |
| parent | Missed one. (diff) | |
| download | gnupg-405d9dfc59a44b84f22d4d4740e0a91b8729370b.tar.gz gnupg-405d9dfc59a44b84f22d4d4740e0a91b8729370b.zip | |
* g10.c (main): Error out if --multifile is used with the commands that
don't support it yet (--sign, --clearsign, --detach-sign, --symmetric, and
--store).
* g10.c (main): Add --multifile as an alias to turn --encrypt into
--encrypt-files (plus --verify-files, --decrypt-files).
* encode.c (use_mdc), g10.c (main): Use RFC1991 and RFC2440 directly to
check for MDC usability. Do not set the force_mdc or disable_mdc flags
since there is no point any longer.
Diffstat (limited to '')
| -rw-r--r-- | g10/encode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/g10/encode.c b/g10/encode.c index 66ce57c35..8a64c7633 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -107,6 +107,10 @@ encode_sesskey( DEK *dek, DEK **ret_dek, byte *enckey ) static int use_mdc(PK_LIST pk_list,int algo) { + /* RFC-1991 and 2440 don't have MDC */ + if(RFC1991 || RFC2440) + return 0; + /* --force-mdc overrides --disable-mdc */ if(opt.force_mdc) return 1; |