diff options
| author | David Shaw <[email protected]> | 2004-03-05 13:34:56 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-03-05 13:34:56 +0000 |
| commit | ea73c94bc683027f7bbc0807b98695f42f7690a0 (patch) | |
| tree | b430557d1d6b6bd970de05d51ab649eda9360d97 /g10/passphrase.c | |
| parent | * revoke.c (export_minimal_pk), export.c (do_export_stream), passphrase.c (diff) | |
| download | gnupg-ea73c94bc683027f7bbc0807b98695f42f7690a0.tar.gz gnupg-ea73c94bc683027f7bbc0807b98695f42f7690a0.zip | |
* getkey.c (merge_selfsigs_subkey): Do not mark subkeys valid if we do not
support their pk algorithm. This allows for early (during get_*)
rejection of a subkey, and selection of another.
* passphrase.c (passphrase_to_dek): Give a little more information when we
have room to do so.
Diffstat (limited to 'g10/passphrase.c')
| -rw-r--r-- | g10/passphrase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index 870ad9770..1274afce9 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -1134,7 +1134,7 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo, if(keystrlen()>10) { tty_printf("\n"); - tty_printf(_(" (main key ID %s)"), + tty_printf(_(" (subkey on main key ID %s)"), keystr(&keyid[2]) ); } else |