aboutsummaryrefslogtreecommitdiffstats
path: root/g10/cipher.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-08-12 08:36:30 +0000
committerWerner Koch <[email protected]>2014-08-14 09:03:55 +0000
commit2b8d8369d59249b89526c18c5ac276e6445dc35e (patch)
treecee8f7b5adb668e0893ab13812c571db329b119b /g10/cipher.c
parentbuild: Fix autogen.sh base version hack. (diff)
downloadgnupg-2b8d8369d59249b89526c18c5ac276e6445dc35e.tar.gz
gnupg-2b8d8369d59249b89526c18c5ac276e6445dc35e.zip
gpg: Remove options --pgp2 and --rfc1991.
* g10/gpg.c (oRFC1991, oPGP2): Remove (opts): Remove --pgp2 and --rfc1991. * g10/options.h (CO_PGP2, CO_RFC1991): Remove. Remove all users. (RFC2440, PGP2): Remove. Remove all code only enabled by these conditions. * tests/openpgp/clearsig.test: Remove --rfc1991 test. -- The use of PGP 2.c is considered insecure for quite some time now (e.g. due to the use of MD5). Thus we remove all support for _creating_ PGP 2 compatible messages.
Diffstat (limited to 'g10/cipher.c')
-rw-r--r--g10/cipher.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/cipher.c b/g10/cipher.c
index 10f0ebb96..b72b144bb 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -56,7 +56,7 @@ write_header( cipher_filter_context_t *cfx, IOBUF a )
memset( &ed, 0, sizeof ed );
ed.len = cfx->datalen;
ed.extralen = blocksize+2;
- ed.new_ctb = !ed.len && !RFC1991;
+ ed.new_ctb = !ed.len;
if( cfx->dek->use_mdc ) {
ed.mdc_method = DIGEST_ALGO_SHA1;
gcry_md_open (&cfx->mdc_hash, DIGEST_ALGO_SHA1, 0);