summaryrefslogtreecommitdiffstats
path: root/g10/seckey-cert.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2012-05-08 18:18:32 +0200
committerWerner Koch <wk@gnupg.org>2012-05-08 18:18:32 +0200
commitb4d9f8dbc8e074cd91bbd3e2e54e2b77c9268d1a (patch)
tree88a29c3dbc93aafd718e7ab392ce901cf35829f8 /g10/seckey-cert.c
parentAlways require libksba. (diff)
downloadgnupg2-b4d9f8dbc8e074cd91bbd3e2e54e2b77c9268d1a.tar.xz
gnupg2-b4d9f8dbc8e074cd91bbd3e2e54e2b77c9268d1a.zip
Add tweaks for the not anymore patented IDEA algorithm.
* g10/keygen.c (keygen_set_std_prefs): Include IDEA only in PGP2 compatibility mode. * g10/misc.c (idea_cipher_warn): Remove. Also remove all callers. * common/status.h (STATUS_RSA_OR_IDEA): Remove. Do not emit this status anymore. -- To keep the number of actually used algorithms low, we want to support IDEA only in a basically read-only way (unless --pgp2 is used during key generation). It does not make sense to suggest the use of this old 64 bit blocksize algorithm. However, there is old data available where it might be helpful to have IDEA available.
Diffstat (limited to 'g10/seckey-cert.c')
-rw-r--r--g10/seckey-cert.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index ec866b309..1dde6f91c 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -62,11 +62,6 @@ xxxx_do_check( PKT_secret_key *sk, const char *tryagain_text, int mode,
if( openpgp_cipher_test_algo( sk->protect.algo ) ) {
log_info(_("protection algorithm %d%s is not supported\n"),
sk->protect.algo,sk->protect.algo==1?" (IDEA)":"" );
- if (sk->protect.algo==CIPHER_ALGO_IDEA)
- {
- write_status (STATUS_RSA_OR_IDEA);
- idea_cipher_warn (0);
- }
return G10ERR_CIPHER_ALGO;
}
if(gcry_md_test_algo (sk->protect.s2k.hash_algo))