aboutsummaryrefslogtreecommitdiffstats
path: root/g10/export.c
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <[email protected]>2016-06-10 20:15:33 +0000
committerWerner Koch <[email protected]>2016-06-11 09:09:09 +0000
commit00f30cc01c79bbdff5cdc3be795f009f15d3845e (patch)
tree501c18c6aaa3ce352b42736d2bf92da7f8c6d5ef /g10/export.c
parentspeedo,w32: Distribute gpg-preset-passphrase. (diff)
downloadgnupg-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 'g10/export.c')
-rw-r--r--g10/export.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/export.c b/g10/export.c
index aae8d421f..d47c27d23 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -1228,7 +1228,7 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret,
serialno = NULL;
}
else
- err = agent_get_keyinfo (ctrl, hexgrip, &serialno);
+ err = agent_get_keyinfo (ctrl, hexgrip, &serialno, NULL);
if ((!err && serialno)
&& secret == 2 && node->pkt->pkttype == PKT_PUBLIC_KEY)