summaryrefslogtreecommitdiffstats
path: root/scd
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2002-04-25 10:31:48 +0200
committerWerner Koch <wk@gnupg.org>2002-04-25 10:31:48 +0200
commita2176634aebf6e0ced4d26dd5be3bc93931a4fcb (patch)
treecd0080bd207d3f0427c9979a828d1a538fa69c94 /scd
parent2002-04-25 Marcus Brinkmann <marcus@g10code.de> (diff)
downloadgnupg2-a2176634aebf6e0ced4d26dd5be3bc93931a4fcb.tar.xz
gnupg2-a2176634aebf6e0ced4d26dd5be3bc93931a4fcb.zip
* call-agent.c (start_agent): Make copies of old locales and check
for setlocale. * configure.ac: Check for setlocale.
Diffstat (limited to 'scd')
-rw-r--r--scd/command.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/scd/command.c b/scd/command.c
index f62baae98..9e0ddc502 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -438,7 +438,7 @@ cmd_pksign (ASSUAN_CONTEXT ctx, char *line)
/* We have to use a copy of the key ID because the function may use
the pin_cb which in turn uses the assuan line buffer and thus
overwriting the original line with the keyid */
- keyidstr = xtrystrdup (line);
+ keyidstr = strdup (line);
if (!keyidstr)
return ASSUAN_Out_Of_Core;
rc = card_sign (ctrl->card_ctx,
@@ -446,7 +446,7 @@ cmd_pksign (ASSUAN_CONTEXT ctx, char *line)
pin_cb, ctx,
ctrl->in_data.value, ctrl->in_data.valuelen,
&outdata, &outdatalen);
- xfree (keyidstr);
+ free (keyidstr);
if (rc)
{
log_error ("card_sign failed: %s\n", gnupg_strerror (rc));
@@ -477,7 +477,7 @@ cmd_pkdecrypt (ASSUAN_CONTEXT ctx, char *line)
if ((rc = open_card (ctrl)))
return rc;
- keyidstr = xtrystrdup (line);
+ keyidstr = strdup (line);
if (!keyidstr)
return ASSUAN_Out_Of_Core;
rc = card_decipher (ctrl->card_ctx,
@@ -485,7 +485,7 @@ cmd_pkdecrypt (ASSUAN_CONTEXT ctx, char *line)
pin_cb, ctx,
ctrl->in_data.value, ctrl->in_data.valuelen,
&outdata, &outdatalen);
- xfree (keyidstr);
+ free (keyidstr);
if (rc)
{
log_error ("card_create_signature failed: %s\n", gnupg_strerror (rc));