diff options
| author | NIIBE Yutaka <[email protected]> | 2014-03-04 02:54:59 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2014-03-11 07:03:01 +0000 |
| commit | ac5a1a3ccb7c3e6393bc83d73b545dec9b70e7d1 (patch) | |
| tree | 66bfee42a5e19cad0c50651844b9bf7670a54ec9 /agent/pkdecrypt.c | |
| parent | Backport useful code from fixes for bug 1447. (diff) | |
| download | gnupg-ac5a1a3ccb7c3e6393bc83d73b545dec9b70e7d1.tar.gz gnupg-ac5a1a3ccb7c3e6393bc83d73b545dec9b70e7d1.zip | |
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 <[email protected]>
Diffstat (limited to 'agent/pkdecrypt.c')
| -rw-r--r-- | agent/pkdecrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |