[svn] GnuPG - r5090 - trunk/g10
svn author wk
cvs at cvs.gnupg.org
Wed Jul 22 18:08:59 CEST 2009
Author: wk
Date: 2009-07-22 18:08:58 +0200 (Wed, 22 Jul 2009)
New Revision: 5090
Modified:
trunk/g10/ChangeLog
trunk/g10/call-agent.c
Log:
Emit CARDCTRL status lines.
Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog 2009-07-22 13:33:46 UTC (rev 5089)
+++ trunk/g10/ChangeLog 2009-07-22 16:08:58 UTC (rev 5090)
@@ -1,5 +1,13 @@
2009-07-22 Werner Koch <wk at g10code.com>
+ * call-agent.c (agent_learn): Use a direct SCD command.
+ (did_early_card_test): New.
+ (start_agent): Perform an early test for the card. Add arg FOR_CARD.
+ (status_sc_op_failure): New.
+ (agent_scd_setattr, agent_scd_writekey, agent_scd_genkey)
+ (agent_scd_pksign, agent_scd_pkdecrypt, agent_scd_change_pin)
+ (agent_scd_checkpin): Call new function.
+
* gpg.c (main) <aFixTrustDB>: Show commands to run.
* trustdb.c (how_to_fix_the_trustdb): New.
* tdbio.c (tdbio_invalid): Show commands to re-create the trustdb.
Modified: trunk/g10/call-agent.c
===================================================================
--- trunk/g10/call-agent.c 2009-07-22 13:33:46 UTC (rev 5089)
+++ trunk/g10/call-agent.c 2009-07-22 16:08:58 UTC (rev 5090)
@@ -39,12 +39,14 @@
#include "asshelp.h"
#include "sysutils.h"
#include "call-agent.h"
+#include "status.h"
#ifndef DBG_ASSUAN
# define DBG_ASSUAN 1
#endif
static assuan_context_t agent_ctx = NULL;
+static int did_early_card_test;
struct cipher_parm_s
{
@@ -75,35 +77,104 @@
};
+static int learn_status_cb (void *opaque, const char *line);
+
+
+/* If RC is not 0, write an appropriate status message. */
+static void
+status_sc_op_failure (int rc)
+{
+ switch (gpg_err_code (rc))
+ {
+ case 0:
+ break;
+ case GPG_ERR_CANCELED:
+ write_status_text (STATUS_SC_OP_FAILURE, "1");
+ break;
+ case GPG_ERR_BAD_PIN:
+ write_status_text (STATUS_SC_OP_FAILURE, "2");
+ break;
+ default:
+ write_status (STATUS_SC_OP_FAILURE);
+ break;
+ }
+}
+
+
+
+
/* Try to connect to the agent via socket or fork it off and work by
pipes. Handle the server's initial greeting */
static int
-start_agent (void)
+start_agent (int for_card)
{
int rc;
+ /* Fixme: We need a context for each thread or serialize the access
+ to the agent. */
if (agent_ctx)
- return 0; /* Fixme: We need a context for each thread or serialize
- the access to the agent. */
+ rc = 0;
+ else
+ {
+ rc = start_new_gpg_agent (&agent_ctx,
+ GPG_ERR_SOURCE_DEFAULT,
+ opt.homedir,
+ opt.agent_program,
+ opt.lc_ctype, opt.lc_messages,
+ opt.session_env,
+ opt.verbose, DBG_ASSUAN,
+ NULL, NULL);
+ if (!rc)
+ {
+ /* Tell the agent that we support Pinentry notifications.
+ No error checking so that it will work also with older
+ agents. */
+ assuan_transact (agent_ctx, "OPTION allow-pinentry-notify",
+ NULL, NULL, NULL, NULL, NULL, NULL);
+ }
+ }
- rc = start_new_gpg_agent (&agent_ctx,
- GPG_ERR_SOURCE_DEFAULT,
- opt.homedir,
- opt.agent_program,
- opt.lc_ctype, opt.lc_messages,
- opt.session_env,
- opt.verbose, DBG_ASSUAN,
- NULL, NULL);
- if (!rc)
+ if (!rc && for_card && !did_early_card_test)
{
- /* Tell the agent that we support Pinentry notifications. No
- error checking so that it will work also with older
- agents. */
- assuan_transact (agent_ctx, "OPTION allow-pinentry-notify",
- NULL, NULL, NULL, NULL, NULL, NULL);
+ /* Request the serial number of the card for an early test. */
+ struct agent_card_info_s info;
+
+ memset (&info, 0, sizeof info);
+ rc = assuan_transact (agent_ctx, "SCD SERIALNO openpgp",
+ NULL, NULL, NULL, NULL,
+ learn_status_cb, &info);
+ if (rc)
+ {
+ switch (gpg_err_code (rc))
+ {
+ case GPG_ERR_NOT_SUPPORTED:
+ case GPG_ERR_NO_SCDAEMON:
+ write_status_text (STATUS_CARDCTRL, "6");
+ break;
+ default:
+ write_status_text (STATUS_CARDCTRL, "4");
+ log_info ("selecting openpgp failed: %s\n", gpg_strerror (rc));
+ break;
+ }
+ }
+
+ if (!rc && is_status_enabled () && info.serialno)
+ {
+ char *buf;
+
+ buf = xasprintf ("3 %s", info.serialno);
+ write_status_text (STATUS_CARDCTRL, buf);
+ xfree (buf);
+ }
+
+ agent_release_card_info (&info);
+
+ if (!rc)
+ did_early_card_test = 1;
}
+
return rc;
}
@@ -345,12 +416,12 @@
{
int rc;
- rc = start_agent ();
+ rc = start_agent (1);
if (rc)
return rc;
memset (info, 0, sizeof *info);
- rc = assuan_transact (agent_ctx, "LEARN --send",
+ rc = assuan_transact (agent_ctx, "SCD LEARN --force",
dummy_data_cb, NULL, default_inq_cb, NULL,
learn_status_cb, info);
/* Also try to get the key attributes. */
@@ -377,7 +448,7 @@
return gpg_error (GPG_ERR_TOO_LARGE);
stpcpy (stpcpy (line, "SCD GETATTR "), name);
- rc = start_agent ();
+ rc = start_agent (1);
if (rc)
return rc;
@@ -427,12 +498,14 @@
}
*p = 0;
- rc = start_agent ();
- if (rc)
- return rc;
+ rc = start_agent (1);
+ if (!rc)
+ {
+ rc = assuan_transact (agent_ctx, line, NULL, NULL,
+ default_inq_cb, NULL, NULL, NULL);
+ }
- rc = assuan_transact (agent_ctx, line, NULL, NULL,
- default_inq_cb, NULL, NULL, NULL);
+ status_sc_op_failure (rc);
return rc;
}
@@ -467,7 +540,7 @@
char line[ASSUAN_LINELENGTH];
struct writecert_parm_s parms;
- rc = start_agent ();
+ rc = start_agent (1);
if (rc)
return rc;
@@ -517,7 +590,7 @@
(void)serialno;
- rc = start_agent ();
+ rc = start_agent (1);
if (rc)
return rc;
@@ -532,6 +605,7 @@
rc = assuan_transact (agent_ctx, line, NULL, NULL,
inq_writekey_parms, &parms, NULL, NULL);
+ status_sc_op_failure (rc);
return rc;
}
@@ -601,7 +675,7 @@
(void)serialno;
- rc = start_agent ();
+ rc = start_agent (1);
if (rc)
return rc;
@@ -622,6 +696,7 @@
NULL, NULL, default_inq_cb, NULL,
scd_genkey_cb, info);
+ status_sc_op_failure (rc);
return rc;
}
@@ -653,7 +728,7 @@
*r_buf = NULL;
*r_buflen = 0;
- rc = start_agent ();
+ rc = start_agent (1);
if (rc)
return rc;
@@ -692,11 +767,12 @@
if (rc)
{
xfree (get_membuf (&data, &len));
- return rc;
}
- *r_buf = get_membuf (&data, r_buflen);
+ else
+ *r_buf = get_membuf (&data, r_buflen);
- return 0;
+ status_sc_op_failure (rc);
+ return rc;
}
@@ -717,7 +793,7 @@
size_t len;
*r_buf = NULL;
- rc = start_agent ();
+ rc = start_agent (1);
if (rc)
return rc;
@@ -751,13 +827,16 @@
if (rc)
{
xfree (get_membuf (&data, &len));
- return rc;
}
- *r_buf = get_membuf (&data, r_buflen);
- if (!*r_buf)
- return gpg_error (GPG_ERR_ENOMEM);
+ else
+ {
+ *r_buf = get_membuf (&data, r_buflen);
+ if (!*r_buf)
+ rc = gpg_error (GPG_ERR_ENOMEM);
+ }
- return 0;
+ status_sc_op_failure (rc);
+ return rc;
}
@@ -773,7 +852,7 @@
size_t len;
*r_buf = NULL;
- rc = start_agent ();
+ rc = start_agent (1);
if (rc)
return rc;
@@ -821,7 +900,7 @@
reset = "--reset";
chvno %= 100;
- rc = start_agent ();
+ rc = start_agent (1);
if (rc)
return rc;
@@ -829,6 +908,7 @@
line[DIM(line)-1] = 0;
rc = assuan_transact (agent_ctx, line, NULL, NULL,
default_inq_cb, NULL, NULL, NULL);
+ status_sc_op_failure (rc);
return rc;
}
@@ -842,15 +922,17 @@
int rc;
char line[ASSUAN_LINELENGTH];
- rc = start_agent ();
+ rc = start_agent (1);
if (rc)
return rc;
snprintf (line, DIM(line)-1, "SCD CHECKPIN %s", serialno);
line[DIM(line)-1] = 0;
- return assuan_transact (agent_ctx, line,
- NULL, NULL,
- default_inq_cb, NULL, NULL, NULL);
+ rc = assuan_transact (agent_ctx, line,
+ NULL, NULL,
+ default_inq_cb, NULL, NULL, NULL);
+ status_sc_op_failure (rc);
+ return rc;
}
@@ -887,7 +969,7 @@
*r_passphrase = NULL;
- rc = start_agent ();
+ rc = start_agent (0);
if (rc)
return rc;
@@ -958,7 +1040,7 @@
if (!cache_id || !*cache_id)
return 0;
- rc = start_agent ();
+ rc = start_agent (0);
if (rc)
return rc;
More information about the Gnupg-commits
mailing list