diff options
| author | Werner Koch <[email protected]> | 2023-05-26 09:59:46 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2023-05-26 12:27:16 +0000 |
| commit | 1d23dc9389a12600a1002600f97dcff659cede44 (patch) | |
| tree | ead5c3fb857b6bd3b588118a3739f15861ede180 /agent/cvt-openpgp.c | |
| parent | common: New function nve_set (diff) | |
| download | gnupg-1d23dc9389a12600a1002600f97dcff659cede44.tar.gz gnupg-1d23dc9389a12600a1002600f97dcff659cede44.zip | |
agent: Create and use Token entries to track the display s/n.
* agent/findkey.c (agent_write_private_key): Add arg dispserialno and
update the token.
(agent_write_shadow_key): Add arg dispserialno and adjust all callers.
--
GnuPG-bug-id: 6135
Note that this has been forward ported from 2.2
Diffstat (limited to 'agent/cvt-openpgp.c')
| -rw-r--r-- | agent/cvt-openpgp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c index 9bb815ff8..6aad35bff 100644 --- a/agent/cvt-openpgp.c +++ b/agent/cvt-openpgp.c @@ -1148,7 +1148,7 @@ convert_from_openpgp_native (ctrl_t ctrl, &protectedkey, &protectedkeylen, ctrl->s2k_count)) agent_write_private_key (grip, protectedkey, protectedkeylen, 1, - NULL, NULL, 0); + NULL, NULL, NULL, 0); xfree (protectedkey); } else @@ -1157,7 +1157,7 @@ convert_from_openpgp_native (ctrl_t ctrl, agent_write_private_key (grip, *r_key, gcry_sexp_canon_len (*r_key, 0, NULL,NULL), - 1, NULL, NULL, 0); + 1, NULL, NULL, NULL, 0); } } |