From 00f30cc01c79bbdff5cdc3be795f009f15d3845e Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 10 Jun 2016 16:15:33 -0400 Subject: 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 --- g10/export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/export.c') 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) -- cgit v1.2.3