From bdf252e76ada0056bec2ee7940255f32552328c5 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 3 May 2019 15:54:54 +0200 Subject: agent: Put Token lines into the key files. * agent/findkey.c (write_extended_private_key): Add args serialno and keyref. Write a Token line if that does not yet exist. (agent_write_private_key): Add args serialno and keyref and change all callers. (agent_write_shadow_key): Skip leading spaces. * agent/keyformat.txt: Improve extended key format docs. -- Noet that the extended key forma is the defaqult in 2.3. This patch is a first step to better handle tokens which carray the same key. Signed-off-by: Werner Koch --- agent/command.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'agent/command.c') diff --git a/agent/command.c b/agent/command.c index 082ed4144..9bb6fa306 100644 --- a/agent/command.c +++ b/agent/command.c @@ -2255,10 +2255,11 @@ cmd_import_key (assuan_context_t ctx, char *line) err = agent_protect (key, passphrase, &finalkey, &finalkeylen, ctrl->s2k_count, -1); if (!err) - err = agent_write_private_key (grip, finalkey, finalkeylen, force); + err = agent_write_private_key (grip, finalkey, finalkeylen, force, + NULL, NULL); } else - err = agent_write_private_key (grip, key, realkeylen, force); + err = agent_write_private_key (grip, key, realkeylen, force, NULL, NULL); leave: gcry_sexp_release (openpgp_sexp); -- cgit