diff options
| author | David Shaw <[email protected]> | 2003-11-27 14:47:00 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-11-27 14:47:00 +0000 |
| commit | 5473ac9deb3a51b35d52e2dbdc53e4569e93f2c3 (patch) | |
| tree | fe1931a1fead9ac42568175173830f27bc32b669 /g10/getkey.c | |
| parent | Solved cvs conflict (diff) | |
| download | gnupg-5473ac9deb3a51b35d52e2dbdc53e4569e93f2c3.tar.gz gnupg-5473ac9deb3a51b35d52e2dbdc53e4569e93f2c3.zip | |
* pkclist.c (build_pk_list): Do not allow an empty PK list in interactive
mode.
* getkey.c (get_seckey_byname2): Disallow use of sign+encrypt Elgamal
keys.
Diffstat (limited to 'g10/getkey.c')
| -rw-r--r-- | g10/getkey.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index d1be8e51e..477ba9e34 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -1055,7 +1055,11 @@ get_seckey_byname2( GETKEY_CTX *retctx, ctx.items[0].mode = KEYDB_SEARCH_MODE_FIRST; rc = lookup( &ctx, &kb, 1 ); if (!rc && sk ) - sk_from_block ( &ctx, sk, kb ); + { + sk_from_block ( &ctx, sk, kb ); + if(sk->pubkey_algo==PUBKEY_ALGO_ELGAMAL) + rc=G10ERR_UNU_SECKEY; + } release_kbnode ( kb ); get_seckey_end( &ctx ); } |