From ac5a1a3ccb7c3e6393bc83d73b545dec9b70e7d1 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 4 Mar 2014 11:54:59 +0900 Subject: agent: API change of agent_key_from_file. * agent/findkey.c (agent_key_from_file): Always return S-expression. * agent/command.c (cmd_passwd): Distinguish by SHADOW_INFO. (cmd_export_key): Likewise. Free SHADOW_INFO. (cmd_keytocard): Likewise. Release S_SKEY. * agent/pkdecrypt.c (agent_pkdecrypt): Likewise. * agent/pksign.c (agent_pksign_do): Likewise. Use the S-expression to know the key type. Signed-off-by: NIIBE Yutaka --- agent/pkdecrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'agent/pkdecrypt.c') diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c index 9924d6dff..14aa78f75 100644 --- a/agent/pkdecrypt.c +++ b/agent/pkdecrypt.c @@ -79,7 +79,7 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text, goto leave; } - if (!s_skey) + if (shadow_info) { /* divert operation to the smartcard */ if (!gcry_sexp_canon_len (ciphertext, ciphertextlen, NULL, NULL)) -- cgit v1.2.3