summaryrefslogtreecommitdiffstats
path: root/scd/app-openpgp.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2005-05-21 20:49:00 +0200
committerWerner Koch <wk@gnupg.org>2005-05-21 20:49:00 +0200
commit05e1dc22f0feef8d5af7c8bbb0c0a5129f2c0b05 (patch)
treea893c537329394cab1c954b2606e6d94d1846fe9 /scd/app-openpgp.c
parent* protect-tool.c: New option --canonical. (diff)
downloadgnupg2-05e1dc22f0feef8d5af7c8bbb0c0a5129f2c0b05.tar.xz
gnupg2-05e1dc22f0feef8d5af7c8bbb0c0a5129f2c0b05.zip
* call-scd.c (start_scd): Don't test for an alive scdaemon here.
(agent_scd_check_aliveness): New. * gpg-agent.c (handle_tick): Test for an alive scdaemon. (handle_signal): Print thread info on SIGUSR1. * scdaemon.c (handle_signal): Print thread info on SIGUSR1.
Diffstat (limited to 'scd/app-openpgp.c')
-rw-r--r--scd/app-openpgp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 16ebd34c8..1165ec683 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -1634,7 +1634,7 @@ do_writekey (app_t app, ctrl_t ctrl,
log_info ("protected-private-key passed to writekey\n");
else if (toklen == 20 && !memcmp ("shadowed-private-key", tok, toklen))
log_info ("shadowed-private-key passed to writekey\n");
- err = gpg_error (GPG_ERR_BAD_KEY);
+ err = gpg_error (GPG_ERR_BAD_SECKEY);
goto leave;
}
if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))