diff options
| author | Werner Koch <[email protected]> | 2014-11-13 11:01:42 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-11-13 11:01:42 +0000 |
| commit | e30cb8f61792e3808f7c8f343fc8545e6c81fe74 (patch) | |
| tree | 5d9b73db973dbb96556f11881646c3176b7cc6b1 /g10/gpgv.c | |
| parent | gpg: Improve perceived speed of secret key listings. (diff) | |
| download | gnupg-e30cb8f61792e3808f7c8f343fc8545e6c81fe74.tar.gz gnupg-e30cb8f61792e3808f7c8f343fc8545e6c81fe74.zip | |
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 <[email protected]>
Diffstat (limited to 'g10/gpgv.c')
| -rw-r--r-- | g10/gpgv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c index d79b8994f..7bba53501 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -161,7 +161,6 @@ main( int argc, char **argv ) gnupg_init_signals (0, NULL); opt.command_fd = -1; /* no command fd */ - opt.pgp2_workarounds = 1; opt.keyserver_options.options |= KEYSERVER_AUTO_KEY_RETRIEVE; opt.trust_model = TM_ALWAYS; opt.batch = 1; |