* pkclist.c (algo_available): Automatically enable DSA2 mode when handling

a key that clearly isn't DSA1 (i.e. q!=160).
This commit is contained in:
David Shaw 2006-06-28 15:26:05 +00:00
parent 23380119ee
commit 7c457fac67
2 changed files with 10 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2006-06-28 David Shaw <dshaw@jabberwocky.com>
* pkclist.c (algo_available): Automatically enable DSA2 mode when
handling a key that clearly isn't DSA1 (i.e. q!=160).
2006-06-28 Werner Koch <wk@g10code.com>
* app-openpgp.c (do_writekey): Fixed computation of memmove

View File

@ -1212,12 +1212,12 @@ algo_available( preftype_t preftype, int algo, void *hint )
{
if(hint)
{
if(opt.flags.dsa2)
if((*(int *)hint)!=20 || opt.flags.dsa2)
{
/* If --enable-dsa2 is set, then we'll accept a hash
that is larger than we need. If --enable-dsa2 is not
set, then we won't accept any hash that isn't exactly
the right size. */
/* If --enable-dsa2 is set or the hash isn't 160 bits
(which implies DSA2), then we'll accept a hash that
is larger than we need. Otherwise we won't accept
any hash that isn't exactly the right size. */
if((*(int *)hint) > md_digest_length(algo))
return 0;
}