From e30cb8f61792e3808f7c8f343fc8545e6c81fe74 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 13 Nov 2014 12:01:42 +0100 Subject: gpg: Remove PGP-2 related cruft. * g10/armor.c (parse_hash_header,carmor_filter): Ignore MD5 in hash header. (fake_packet): Remove pgp-2 workaround for white space stripping. * g10/filter.h (armor_filter_context_t): Remove field pgp2mode. * g10/options.h (opt): Remove field pgp2_workarounds. * g10/gpg.c (main): Do not set this field. * g10/gpgv.c (main): Ditto. * g10/mainproc.c (proc_encrypted): Use SHA-1 as fallback s2k hash algo. Using MD5 here is useless. (proc_plaintext): Remove PGP-2 related woraround (proc_tree): Remove another workaround but keep the one for PGP-5. -- The removed code was either not anymore used or its use would have caused an error message later anyway. Signed-off-by: Werner Koch --- g10/options.h | 1 - 1 file changed, 1 deletion(-) (limited to 'g10/options.h') diff --git a/g10/options.h b/g10/options.h index 95d165157..6a94ff43a 100644 --- a/g10/options.h +++ b/g10/options.h @@ -126,7 +126,6 @@ struct { KF_SHORT, KF_LONG, KF_0xSHORT, KF_0xLONG } keyid_format; - int pgp2_workarounds; int shm_coprocess; const char *set_filename; strlist_t comments; -- cgit v1.2.3