* command.c (cmd_setkeydesc): New.

(register_commands): Add command SETKEYDESC.
(cmd_pksign, cmd_pkdecrypt): Use the key description.
(reset_notify): Reset the description.
* findkey.c (unprotect): Add arg DESC_TEXT.
(agent_key_from_file): Ditto.
* pksign.c (agent_pksign): Ditto.
* pkdecrypt.c (agent_pkdecrypt): Ditto. Made CIPHERTEXT an
unsigned char*.

1 files changed, 4 insertions, 2 deletions

diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c
index 72f81778e..eaa2b2254 100644
--- a/agent/pkdecrypt.c
+++ b/agent/pkdecrypt.c
@@ -35,7 +35,8 @@
    Try to get the key from CTRL and write the decoded stuff back to
    OUTFP. */
 int
-agent_pkdecrypt (CTRL ctrl, const char *ciphertext, size_t ciphertextlen,
+agent_pkdecrypt (CTRL ctrl, const char *desc_text,
+                 const unsigned char *ciphertext, size_t ciphertextlen,
                  FILE *outfp) 
 {
   gcry_sexp_t s_skey = NULL, s_cipher = NULL, s_plain = NULL;
@@ -64,7 +65,8 @@ agent_pkdecrypt (CTRL ctrl, const char *ciphertext, size_t ciphertextlen,
       log_printhex ("keygrip:", ctrl->keygrip, 20);
       log_printhex ("cipher: ", ciphertext, ciphertextlen);
     }
-  rc = agent_key_from_file (ctrl, ctrl->keygrip, &shadow_info, 0, &s_skey);
+  rc = agent_key_from_file (ctrl, desc_text,
+                            ctrl->keygrip, &shadow_info, 0, &s_skey);
   if (rc)
     {
       log_error ("failed to read the secret key\n");