diff options
| author | Daniel Kahn Gillmor <[email protected]> | 2016-06-10 20:15:33 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-06-11 09:09:09 +0000 |
| commit | 00f30cc01c79bbdff5cdc3be795f009f15d3845e (patch) | |
| tree | 501c18c6aaa3ce352b42736d2bf92da7f8c6d5ef /g10/keyedit.c | |
| parent | speedo,w32: Distribute gpg-preset-passphrase. (diff) | |
| download | gnupg-00f30cc01c79bbdff5cdc3be795f009f15d3845e.tar.gz gnupg-00f30cc01c79bbdff5cdc3be795f009f15d3845e.zip | |
g10: report whether key in agent is passphrase-protected or not
* g10/call-agent.c, g10/call-agent.h (agent_get_keyinfo): add
r_cleartext parameter to report whether a key is stored without
passphrase protection.
* g10/gpgv.c, g10/test-stubs.c: augment dummy agent_get_keyinfo to
match new API.
* g10/export.c, g10/keyedit.c, g10/keygen.c, g10/keylist.c,
g10/sign.c: pass NULL to agent_get_keyinfo since we do not yet
need to know whether agent is passphrase-protected.
--
Signed-off-by: Daniel Kahn Gillmor <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/keyedit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index aa62cc145..d05ea5d01 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1692,7 +1692,7 @@ change_passphrase (ctrl_t ctrl, kbnode_t keyblock) err = hexkeygrip_from_pk (pk, &hexgrip); if (err) goto leave; - err = agent_get_keyinfo (ctrl, hexgrip, &serialno); + err = agent_get_keyinfo (ctrl, hexgrip, &serialno, NULL); if (!err && serialno) ; /* Key on card. */ else if (gpg_err_code (err) == GPG_ERR_NOT_FOUND) @@ -3766,7 +3766,7 @@ show_key_with_all_names (ctrl_t ctrl, estream_t fp, have_seckey = 0; } else - have_seckey = !agent_get_keyinfo (ctrl, hexgrip, &serialno); + have_seckey = !agent_get_keyinfo (ctrl, hexgrip, &serialno, NULL); xfree (hexgrip); } |