From cbb0e069f55bc45037bbd69d54ce23dae2af2ac6 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 8 Dec 2020 13:20:29 +0900 Subject: [PATCH] agent: Allow pksign operation with card but no file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * agent/pksign.c (agent_pksign_do): Add support with no file. -- GnuPG-bug-id: 5166 Signed-off-by: Ingo Klöcker --- agent/pksign.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/agent/pksign.c b/agent/pksign.c index c94c1a197..d9ffe6019 100644 --- a/agent/pksign.c +++ b/agent/pksign.c @@ -324,8 +324,8 @@ agent_pksign_do (ctrl_t ctrl, const char *cache_nonce, log_error ("failed to read the secret key\n"); goto leave; } - - algo = get_pk_algo_from_key (s_skey); + else + algo = get_pk_algo_from_key (s_skey); if (shadow_info || no_shadow_info) { @@ -374,6 +374,8 @@ agent_pksign_do (ctrl_t ctrl, const char *cache_nonce, if (keyref) agent_write_shadow_key (ctrl->keygrip, serialno, keyref, pkbuf, 0); + algo = get_pk_algo_from_key (s_pkey); + xfree (serialno); xfree (pkbuf); xfree (keyref);