diff options
| author | Werner Koch <[email protected]> | 2003-09-23 17:48:33 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-09-23 17:48:33 +0000 |
| commit | 4c66e94ff91d680eaf1d9c48a62d66d1951f90ef (patch) | |
| tree | 66ede04edbfe1c45eece46e852093282832f8312 /g10/encode.c | |
| parent | 2003-09-22 Timo Schulz <[email protected]> (diff) | |
| download | gnupg-4c66e94ff91d680eaf1d9c48a62d66d1951f90ef.tar.gz gnupg-4c66e94ff91d680eaf1d9c48a62d66d1951f90ef.zip | |
Merged most of David Shaw's changes in 1.3 since 2003-06-03.
Diffstat (limited to 'g10/encode.c')
| -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 9fc00183f..7794bdb7c 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -122,6 +122,10 @@ use_mdc (PK_LIST pk_list,int algo) CIPHER_ALGO_TWOFISH }; int i; + + /* RFC-1991 and 2440 don't have MDC */ + if(RFC1991 || RFC2440) + return 0; /* --force-mdc overrides --disable-mdc */ if (opt.force_mdc) |