diff options
| author | Werner Koch <wk@gnupg.org> | 2010-10-26 11:10:29 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2010-10-26 11:10:29 +0200 |
| commit | 02e4c3cb7efacee1b6f716e5b9e923e7e2ded2bf (patch) | |
| tree | 7b6fa659e8f77cb41b2c8ce3cf31634376c276e2 /g10/passphrase.c | |
| parent | Remove cruft. (diff) | |
| download | gnupg2-02e4c3cb7efacee1b6f716e5b9e923e7e2ded2bf.tar.xz gnupg2-02e4c3cb7efacee1b6f716e5b9e923e7e2ded2bf.zip | |
Re-implemented GPG's --passwd command and improved it.
Diffstat (limited to 'g10/passphrase.c')
| -rw-r--r-- | g10/passphrase.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index b28477fd5..9f1218b6b 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -675,7 +675,7 @@ passphrase_to_dek (u32 *keyid, int pubkey_algo, } -/* Return an allocated utf-8 string describing the key PK. IF ESCAPED +/* Return an allocated utf-8 string describing the key PK. If ESCAPED is true spaces and control characters are percent or plus escaped. MODE 0 is for the common prompt, MODE 1 for the import prompt. */ char * @@ -696,9 +696,9 @@ gpg_format_keydesc (PKT_public_key *pk, int mode, int escaped) orig_codeset = i18n_switchto_utf8 (); - if (pk->main_keyid[2] && pk->main_keyid[3] - && pk->keyid[0] != pk->main_keyid[2] - && pk->keyid[1] != pk->main_keyid[3]) + if (pk->main_keyid[0] && pk->main_keyid[1] + && pk->keyid[0] != pk->main_keyid[0] + && pk->keyid[1] != pk->main_keyid[1]) maink = xtryasprintf (_(" (main key ID %s)"), keystr (pk->main_keyid)); else maink = NULL; |