diff options
Diffstat (limited to 'g10/pkclist.c')
| -rw-r--r-- | g10/pkclist.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/g10/pkclist.c b/g10/pkclist.c index 4c1ac50a2..9847e0f8f 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -967,11 +967,14 @@ select_algo_from_prefs( PK_LIST pk_list, int preftype ) memset( mask, 0, 8 * sizeof *mask ); if( preftype == PREFTYPE_SYM ) { - if( pkr->pk->version < 4 && pkr->pk->selfsigversion < 4 ) + if( pkr->pk->version < 4 && + pkr->pk->selfsigversion < 4 && + opt.pgp2 ) mask[0] |= (1<<1); /* IDEA is implicitly there for v3 keys - with v3 selfsigs (rfc2440:12.1). - This doesn't mean it's actually - available, of course. */ + with v3 selfsigs (rfc2440:12.1) if + --pgp2 mode is on. This doesn't + mean it's actually available, of + course. */ else mask[0] |= (1<<2); /* 3DES is implicitly there for everyone else */ } |