2003-09-28 13:41:58 +00:00
|
|
|
|
/* card-util.c - Utility functions for the OpenPGP card.
|
2005-01-20 17:21:40 +00:00
|
|
|
|
* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
|
2003-09-28 13:41:58 +00:00
|
|
|
|
*
|
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software
|
2005-05-31 08:39:18 +00:00
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
|
|
|
|
* USA.
|
2003-09-28 13:41:58 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
2003-10-02 10:20:12 +00:00
|
|
|
|
#if GNUPG_MAJOR_VERSION != 1
|
|
|
|
|
#include "gpg.h"
|
2005-03-21 15:24:48 +00:00
|
|
|
|
#endif /*GNUPG_MAJOR_VERSION != 1*/
|
2003-09-28 13:41:58 +00:00
|
|
|
|
#include "util.h"
|
|
|
|
|
#include "i18n.h"
|
|
|
|
|
#include "ttyio.h"
|
|
|
|
|
#include "status.h"
|
|
|
|
|
#include "options.h"
|
|
|
|
|
#include "main.h"
|
2004-09-11 15:42:19 +00:00
|
|
|
|
#include "keyserver-internal.h"
|
2003-10-02 10:20:12 +00:00
|
|
|
|
#if GNUPG_MAJOR_VERSION == 1
|
2005-03-20 03:59:07 +00:00
|
|
|
|
#ifdef HAVE_LIBREADLINE
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <readline/readline.h>
|
2005-03-21 15:24:48 +00:00
|
|
|
|
#endif /*HAVE_LIBREADLINE*/
|
2003-09-28 13:41:58 +00:00
|
|
|
|
#include "cardglue.h"
|
2005-03-21 15:24:48 +00:00
|
|
|
|
#else /*GNUPG_MAJOR_VERSION!=1*/
|
2003-10-02 10:20:12 +00:00
|
|
|
|
#include "call-agent.h"
|
2005-03-21 15:24:48 +00:00
|
|
|
|
#endif /*GNUPG_MAJOR_VERSION!=1*/
|
2003-09-28 13:41:58 +00:00
|
|
|
|
|
|
|
|
|
#define CONTROL_D ('D' - 'A' + 1)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Change the PIN of a an OpenPGP card. This is an interactive
|
|
|
|
|
function. */
|
|
|
|
|
void
|
2004-09-25 13:04:55 +00:00
|
|
|
|
change_pin (int chvno, int allow_admin)
|
2003-09-28 13:41:58 +00:00
|
|
|
|
{
|
|
|
|
|
struct agent_card_info_s info;
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
rc = agent_learn (&info);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error (_("OpenPGP card not available: %s\n"),
|
|
|
|
|
gpg_strerror (rc));
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
log_info (_("OpenPGP card no. %s detected\n"),
|
|
|
|
|
info.serialno? info.serialno : "[none]");
|
|
|
|
|
|
2005-05-03 22:27:07 +00:00
|
|
|
|
agent_clear_pin_cache (info.serialno);
|
|
|
|
|
|
2003-09-28 13:41:58 +00:00
|
|
|
|
agent_release_card_info (&info);
|
|
|
|
|
|
|
|
|
|
if (opt.batch)
|
|
|
|
|
{
|
2004-10-28 03:57:30 +00:00
|
|
|
|
log_error (_("can't do this in batch mode\n"));
|
2003-09-28 13:41:58 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2004-09-25 13:04:55 +00:00
|
|
|
|
if(!allow_admin)
|
2003-09-28 13:41:58 +00:00
|
|
|
|
{
|
2004-09-25 13:04:55 +00:00
|
|
|
|
rc = agent_scd_change_pin (1);
|
|
|
|
|
if (rc)
|
|
|
|
|
tty_printf ("Error changing the PIN: %s\n", gpg_strerror (rc));
|
|
|
|
|
else
|
2005-03-07 13:59:59 +00:00
|
|
|
|
{
|
|
|
|
|
write_status (STATUS_SC_OP_SUCCESS);
|
|
|
|
|
tty_printf ("PIN changed.\n");
|
|
|
|
|
}
|
2003-09-28 13:41:58 +00:00
|
|
|
|
}
|
2004-09-25 13:04:55 +00:00
|
|
|
|
else
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
char *answer;
|
|
|
|
|
|
|
|
|
|
tty_printf ("\n");
|
|
|
|
|
tty_printf ("1 - change PIN\n"
|
|
|
|
|
"2 - unblock PIN\n"
|
|
|
|
|
"3 - change Admin PIN\n"
|
|
|
|
|
"Q - quit\n");
|
|
|
|
|
tty_printf ("\n");
|
|
|
|
|
|
|
|
|
|
answer = cpr_get("cardutil.change_pin.menu",_("Your selection? "));
|
|
|
|
|
cpr_kill_prompt();
|
|
|
|
|
if (strlen (answer) != 1)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
rc = 0;
|
|
|
|
|
if (*answer == '1')
|
|
|
|
|
{
|
|
|
|
|
rc = agent_scd_change_pin (1);
|
|
|
|
|
if (rc)
|
|
|
|
|
tty_printf ("Error changing the PIN: %s\n", gpg_strerror (rc));
|
|
|
|
|
else
|
2005-03-07 13:59:59 +00:00
|
|
|
|
{
|
|
|
|
|
write_status (STATUS_SC_OP_SUCCESS);
|
|
|
|
|
tty_printf ("PIN changed.\n");
|
|
|
|
|
}
|
2004-09-25 13:04:55 +00:00
|
|
|
|
}
|
|
|
|
|
else if (*answer == '2')
|
|
|
|
|
{
|
|
|
|
|
rc = agent_scd_change_pin (101);
|
|
|
|
|
if (rc)
|
|
|
|
|
tty_printf ("Error unblocking the PIN: %s\n", gpg_strerror (rc));
|
|
|
|
|
else
|
2005-03-07 13:59:59 +00:00
|
|
|
|
{
|
|
|
|
|
write_status (STATUS_SC_OP_SUCCESS);
|
|
|
|
|
tty_printf ("PIN unblocked and new PIN set.\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-09-25 13:04:55 +00:00
|
|
|
|
else if (*answer == '3')
|
|
|
|
|
{
|
|
|
|
|
rc = agent_scd_change_pin (3);
|
|
|
|
|
if (rc)
|
|
|
|
|
tty_printf ("Error changing the PIN: %s\n", gpg_strerror (rc));
|
|
|
|
|
else
|
2005-03-07 13:59:59 +00:00
|
|
|
|
{
|
|
|
|
|
write_status (STATUS_SC_OP_SUCCESS);
|
|
|
|
|
tty_printf ("PIN changed.\n");
|
|
|
|
|
}
|
2004-09-25 13:04:55 +00:00
|
|
|
|
}
|
|
|
|
|
else if (*answer == 'q' || *answer == 'Q')
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-09-28 13:41:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
|
get_manufacturer (unsigned int no)
|
|
|
|
|
{
|
|
|
|
|
/* Note: Make sure that there is no colon or linefeed in the string. */
|
|
|
|
|
switch (no)
|
|
|
|
|
{
|
|
|
|
|
case 0:
|
|
|
|
|
case 0xffff: return "test card";
|
|
|
|
|
case 0x0001: return "PPC Card Systems";
|
|
|
|
|
default: return "unknown";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_sha1_fpr (FILE *fp, const unsigned char *fpr)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (fpr)
|
|
|
|
|
{
|
|
|
|
|
for (i=0; i < 20 ; i+=2, fpr += 2 )
|
|
|
|
|
{
|
|
|
|
|
if (i == 10 )
|
|
|
|
|
tty_fprintf (fp, " ");
|
|
|
|
|
tty_fprintf (fp, " %02X%02X", *fpr, fpr[1]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
tty_fprintf (fp, " [none]");
|
|
|
|
|
tty_fprintf (fp, "\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_sha1_fpr_colon (FILE *fp, const unsigned char *fpr)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (fpr)
|
|
|
|
|
{
|
|
|
|
|
for (i=0; i < 20 ; i++, fpr++)
|
|
|
|
|
fprintf (fp, "%02X", *fpr);
|
|
|
|
|
}
|
|
|
|
|
putc (':', fp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_name (FILE *fp, const char *text, const char *name)
|
|
|
|
|
{
|
2004-04-27 08:23:45 +00:00
|
|
|
|
tty_fprintf (fp, "%s", text);
|
2003-09-28 13:41:58 +00:00
|
|
|
|
|
|
|
|
|
/* FIXME: tty_printf_utf8_string2 eats everything after and
|
|
|
|
|
including an @ - e.g. when printing an url. */
|
|
|
|
|
if (name && *name)
|
|
|
|
|
{
|
|
|
|
|
if (fp)
|
|
|
|
|
print_utf8_string2 (fp, name, strlen (name), '\n');
|
|
|
|
|
else
|
2003-10-02 10:20:12 +00:00
|
|
|
|
tty_print_utf8_string2 (name, strlen (name), 0);
|
2003-09-28 13:41:58 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
tty_fprintf (fp, _("[not set]"));
|
|
|
|
|
tty_fprintf (fp, "\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_isoname (FILE *fp, const char *text, const char *tag, const char *name)
|
|
|
|
|
{
|
|
|
|
|
if (opt.with_colons)
|
|
|
|
|
fprintf (fp, "%s:", tag);
|
|
|
|
|
else
|
2004-04-27 08:23:45 +00:00
|
|
|
|
tty_fprintf (fp, "%s", text);
|
2003-09-28 13:41:58 +00:00
|
|
|
|
|
|
|
|
|
if (name && *name)
|
|
|
|
|
{
|
|
|
|
|
char *p, *given, *buf = xstrdup (name);
|
|
|
|
|
|
|
|
|
|
given = strstr (buf, "<<");
|
|
|
|
|
for (p=buf; *p; p++)
|
|
|
|
|
if (*p == '<')
|
|
|
|
|
*p = ' ';
|
|
|
|
|
if (given && given[2])
|
|
|
|
|
{
|
|
|
|
|
*given = 0;
|
|
|
|
|
given += 2;
|
|
|
|
|
if (opt.with_colons)
|
|
|
|
|
print_string (fp, given, strlen (given), ':');
|
|
|
|
|
else if (fp)
|
|
|
|
|
print_utf8_string2 (fp, given, strlen (given), '\n');
|
|
|
|
|
else
|
2003-10-02 10:20:12 +00:00
|
|
|
|
tty_print_utf8_string2 (given, strlen (given), 0);
|
2003-09-28 13:41:58 +00:00
|
|
|
|
|
|
|
|
|
if (opt.with_colons)
|
|
|
|
|
putc (':', fp);
|
|
|
|
|
else if (*buf)
|
|
|
|
|
tty_fprintf (fp, " ");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (opt.with_colons)
|
|
|
|
|
print_string (fp, buf, strlen (buf), ':');
|
|
|
|
|
else if (fp)
|
|
|
|
|
print_utf8_string2 (fp, buf, strlen (buf), '\n');
|
|
|
|
|
else
|
2003-10-02 10:20:12 +00:00
|
|
|
|
tty_print_utf8_string2 (buf, strlen (buf), 0);
|
2003-09-28 13:41:58 +00:00
|
|
|
|
xfree (buf);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (opt.with_colons)
|
|
|
|
|
putc (':', fp);
|
|
|
|
|
else
|
|
|
|
|
tty_fprintf (fp, _("[not set]"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (opt.with_colons)
|
|
|
|
|
fputs (":\n", fp);
|
|
|
|
|
else
|
|
|
|
|
tty_fprintf (fp, "\n");
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-08 15:21:20 +00:00
|
|
|
|
/* Return true if the SHA1 fingerprint FPR consists only of zeroes. */
|
|
|
|
|
static int
|
|
|
|
|
fpr_is_zero (const char *fpr)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i=0; i < 20 && !fpr[i]; i++)
|
|
|
|
|
;
|
|
|
|
|
return (i == 20);
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-28 13:41:58 +00:00
|
|
|
|
|
|
|
|
|
/* Print all available information about the current card. */
|
|
|
|
|
void
|
2003-10-21 18:22:21 +00:00
|
|
|
|
card_status (FILE *fp, char *serialno, size_t serialnobuflen)
|
2003-09-28 13:41:58 +00:00
|
|
|
|
{
|
|
|
|
|
struct agent_card_info_s info;
|
|
|
|
|
PKT_public_key *pk = xcalloc (1, sizeof *pk);
|
|
|
|
|
int rc;
|
|
|
|
|
unsigned int uval;
|
2005-01-20 17:21:40 +00:00
|
|
|
|
const unsigned char *thefpr;
|
2005-04-07 08:31:23 +00:00
|
|
|
|
int i;
|
2003-09-28 13:41:58 +00:00
|
|
|
|
|
2003-10-21 18:22:21 +00:00
|
|
|
|
if (serialno && serialnobuflen)
|
|
|
|
|
*serialno = 0;
|
|
|
|
|
|
2003-09-28 13:41:58 +00:00
|
|
|
|
rc = agent_learn (&info);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
if (opt.with_colons)
|
|
|
|
|
fputs ("AID:::\n", fp);
|
|
|
|
|
log_error (_("OpenPGP card not available: %s\n"),
|
|
|
|
|
gpg_strerror (rc));
|
|
|
|
|
xfree (pk);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (opt.with_colons)
|
|
|
|
|
fprintf (fp, "AID:%s:", info.serialno? info.serialno : "");
|
|
|
|
|
else
|
|
|
|
|
tty_fprintf (fp, "Application ID ...: %s\n",
|
|
|
|
|
info.serialno? info.serialno : "[none]");
|
|
|
|
|
if (!info.serialno || strncmp (info.serialno, "D27600012401", 12)
|
|
|
|
|
|| strlen (info.serialno) != 32 )
|
|
|
|
|
{
|
|
|
|
|
if (opt.with_colons)
|
|
|
|
|
fputs ("unknown:\n", fp);
|
|
|
|
|
log_info ("not an OpenPGP card\n");
|
|
|
|
|
agent_release_card_info (&info);
|
|
|
|
|
xfree (pk);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-21 18:22:21 +00:00
|
|
|
|
if (!serialno)
|
|
|
|
|
;
|
|
|
|
|
else if (strlen (serialno)+1 > serialnobuflen)
|
|
|
|
|
log_error ("serial number longer than expected\n");
|
|
|
|
|
else
|
|
|
|
|
strcpy (serialno, info.serialno);
|
|
|
|
|
|
2003-09-28 13:41:58 +00:00
|
|
|
|
if (opt.with_colons)
|
|
|
|
|
fputs ("openpgp-card:\n", fp);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (opt.with_colons)
|
|
|
|
|
{
|
|
|
|
|
fprintf (fp, "version:%.4s:\n", info.serialno+12);
|
|
|
|
|
uval = xtoi_2(info.serialno+16)*256 + xtoi_2 (info.serialno+18);
|
|
|
|
|
fprintf (fp, "vendor:%04x:%s:\n", uval, get_manufacturer (uval));
|
|
|
|
|
fprintf (fp, "serial:%.8s:\n", info.serialno+20);
|
|
|
|
|
|
|
|
|
|
print_isoname (fp, "Name of cardholder: ", "name", info.disp_name);
|
|
|
|
|
|
|
|
|
|
fputs ("lang:", fp);
|
|
|
|
|
if (info.disp_lang)
|
|
|
|
|
print_string (fp, info.disp_lang, strlen (info.disp_lang), ':');
|
|
|
|
|
fputs (":\n", fp);
|
|
|
|
|
|
|
|
|
|
fprintf (fp, "sex:%c:\n", (info.disp_sex == 1? 'm':
|
|
|
|
|
info.disp_sex == 2? 'f' : 'u'));
|
|
|
|
|
|
|
|
|
|
fputs ("url:", fp);
|
|
|
|
|
if (info.pubkey_url)
|
|
|
|
|
print_string (fp, info.pubkey_url, strlen (info.pubkey_url), ':');
|
|
|
|
|
fputs (":\n", fp);
|
|
|
|
|
|
|
|
|
|
fputs ("login:", fp);
|
|
|
|
|
if (info.login_data)
|
|
|
|
|
print_string (fp, info.login_data, strlen (info.login_data), ':');
|
|
|
|
|
fputs (":\n", fp);
|
|
|
|
|
|
|
|
|
|
fprintf (fp, "forcepin:%d:::\n", !info.chv1_cached);
|
|
|
|
|
fprintf (fp, "maxpinlen:%d:%d:%d:\n",
|
|
|
|
|
info.chvmaxlen[0], info.chvmaxlen[1], info.chvmaxlen[2]);
|
|
|
|
|
fprintf (fp, "pinretry:%d:%d:%d:\n",
|
|
|
|
|
info.chvretry[0], info.chvretry[1], info.chvretry[2]);
|
|
|
|
|
fprintf (fp, "sigcount:%lu:::\n", info.sig_counter);
|
|
|
|
|
|
2005-04-07 08:31:23 +00:00
|
|
|
|
for (i=0; i < 4; i++)
|
|
|
|
|
{
|
|
|
|
|
if (info.private_do[i])
|
|
|
|
|
{
|
|
|
|
|
fprintf (fp, "private_do:%d:", i+1);
|
|
|
|
|
print_string (fp, info.private_do[i],
|
|
|
|
|
strlen (info.private_do[i]), ':');
|
|
|
|
|
fputs (":\n", fp);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
* README: Doc --disable-card-support and --without-readline.
* configure.ac: Check for readline. Make enable-card-support the
default. New option --without-readline. Allow the use of either
the development or the stable libusb.
* cardglue.h: Add members for CA fingerprints.
* cardglue.c (agent_release_card_info): Invalid them.
(learn_status_cb): Store them.
* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
* card-util.c: Updated from current gnupg-1.9.
* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
of libusb.
(ccid_get_atr): Handle short messages.
* apdu.c (my_rapdu_get_status): Implemented.
* apdu.c: Include <signal.h>.
* apdu.c (reader_table_s): Add function pointers for the backends.
(apdu_close_reader, apdu_get_status, apdu_activate)
(send_apdu): Make use of them.
(new_reader_slot): Intialize them to NULL.
(dump_ccid_reader_status, ct_dump_reader_status): New.
(dump_pcsc_reader_status): New.
(open_ct_reader, open_pcsc_reader, open_ccid_reader)
(open_osc_reader, open_rapdu_reader): Intialize function pointers.
(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
(error_string): Removed. Replaced by apdu_strerror.
(get_ccid_error_string): Removed.
(ct_activate_card): Remove the unused loop.
(reset_ct_reader): Implemented.
(ct_send_apdu): Activate the card if not yet done.
(pcsc_send_apdu): Ditto.
* ccid-driver.h: Add error codes.
* ccid-driver.c: Implement more or less proper error codes all
over the place.
* apdu.c (apdu_send_direct): New.
(get_ccid_error_string): Add some error code mappings.
(send_apdu): Pass error codes along for drivers already supporting
them.
(host_sw_string): New.
(get_ccid_error_string): Use above.
(send_apdu_ccid): Reset the reader if it has not yet been done.
(open_ccid_reader): Don't care if the ATR can't be read.
(apdu_activate_card): New.
(apdu_strerror): New.
(dump_reader_status): Only enable it with opt.VERBOSE.
* iso7816.c (map_sw): Add mappings for the new error codes.
* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
in verbose mode.
* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
exponent.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
* card-util.c (change_login): Kludge to allow reading data from a
file.
(card_edit): Pass ARG_STRING to change_login.
(card_status): Print CA fingerprints.
(change_cafpr): New.
(card_edit): New command CAFPR.
* errors.h (G10ERR_NO_CARD, G10ERR_CANCELED): New error codes.
* errors.c (g10_errstr): New error codes G10ERR_NO_CARD,
G10ERR_CANCELED.
2004-09-09 18:18:36 +00:00
|
|
|
|
fputs ("cafpr:", fp);
|
|
|
|
|
print_sha1_fpr_colon (fp, info.cafpr1valid? info.cafpr1:NULL);
|
|
|
|
|
print_sha1_fpr_colon (fp, info.cafpr2valid? info.cafpr2:NULL);
|
|
|
|
|
print_sha1_fpr_colon (fp, info.cafpr3valid? info.cafpr3:NULL);
|
|
|
|
|
putc ('\n', fp);
|
2003-09-28 13:41:58 +00:00
|
|
|
|
fputs ("fpr:", fp);
|
|
|
|
|
print_sha1_fpr_colon (fp, info.fpr1valid? info.fpr1:NULL);
|
|
|
|
|
print_sha1_fpr_colon (fp, info.fpr2valid? info.fpr2:NULL);
|
|
|
|
|
print_sha1_fpr_colon (fp, info.fpr3valid? info.fpr3:NULL);
|
|
|
|
|
putc ('\n', fp);
|
2004-12-10 10:49:14 +00:00
|
|
|
|
fprintf (fp, "fprtime:%lu:%lu:%lu:\n",
|
|
|
|
|
(unsigned long)info.fpr1time, (unsigned long)info.fpr2time,
|
|
|
|
|
(unsigned long)info.fpr3time);
|
2003-09-28 13:41:58 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
tty_fprintf (fp, "Version ..........: %.1s%c.%.1s%c\n",
|
|
|
|
|
info.serialno[12] == '0'?"":info.serialno+12,
|
|
|
|
|
info.serialno[13],
|
|
|
|
|
info.serialno[14] == '0'?"":info.serialno+14,
|
|
|
|
|
info.serialno[15]);
|
|
|
|
|
tty_fprintf (fp, "Manufacturer .....: %s\n",
|
|
|
|
|
get_manufacturer (xtoi_2(info.serialno+16)*256
|
|
|
|
|
+ xtoi_2 (info.serialno+18)));
|
|
|
|
|
tty_fprintf (fp, "Serial number ....: %.8s\n", info.serialno+20);
|
|
|
|
|
|
|
|
|
|
print_isoname (fp, "Name of cardholder: ", "name", info.disp_name);
|
|
|
|
|
print_name (fp, "Language prefs ...: ", info.disp_lang);
|
|
|
|
|
tty_fprintf (fp, "Sex ..............: %s\n",
|
|
|
|
|
info.disp_sex == 1? _("male"):
|
|
|
|
|
info.disp_sex == 2? _("female") : _("unspecified"));
|
|
|
|
|
print_name (fp, "URL of public key : ", info.pubkey_url);
|
|
|
|
|
print_name (fp, "Login data .......: ", info.login_data);
|
2004-12-09 16:57:30 +00:00
|
|
|
|
if (info.private_do[0])
|
|
|
|
|
print_name (fp, "Private DO 1 .....: ", info.private_do[0]);
|
|
|
|
|
if (info.private_do[1])
|
|
|
|
|
print_name (fp, "Private DO 2 .....: ", info.private_do[1]);
|
|
|
|
|
if (info.private_do[2])
|
|
|
|
|
print_name (fp, "Private DO 3 .....: ", info.private_do[2]);
|
|
|
|
|
if (info.private_do[3])
|
|
|
|
|
print_name (fp, "Private DO 4 .....: ", info.private_do[3]);
|
* README: Doc --disable-card-support and --without-readline.
* configure.ac: Check for readline. Make enable-card-support the
default. New option --without-readline. Allow the use of either
the development or the stable libusb.
* cardglue.h: Add members for CA fingerprints.
* cardglue.c (agent_release_card_info): Invalid them.
(learn_status_cb): Store them.
* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
* card-util.c: Updated from current gnupg-1.9.
* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
of libusb.
(ccid_get_atr): Handle short messages.
* apdu.c (my_rapdu_get_status): Implemented.
* apdu.c: Include <signal.h>.
* apdu.c (reader_table_s): Add function pointers for the backends.
(apdu_close_reader, apdu_get_status, apdu_activate)
(send_apdu): Make use of them.
(new_reader_slot): Intialize them to NULL.
(dump_ccid_reader_status, ct_dump_reader_status): New.
(dump_pcsc_reader_status): New.
(open_ct_reader, open_pcsc_reader, open_ccid_reader)
(open_osc_reader, open_rapdu_reader): Intialize function pointers.
(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
(error_string): Removed. Replaced by apdu_strerror.
(get_ccid_error_string): Removed.
(ct_activate_card): Remove the unused loop.
(reset_ct_reader): Implemented.
(ct_send_apdu): Activate the card if not yet done.
(pcsc_send_apdu): Ditto.
* ccid-driver.h: Add error codes.
* ccid-driver.c: Implement more or less proper error codes all
over the place.
* apdu.c (apdu_send_direct): New.
(get_ccid_error_string): Add some error code mappings.
(send_apdu): Pass error codes along for drivers already supporting
them.
(host_sw_string): New.
(get_ccid_error_string): Use above.
(send_apdu_ccid): Reset the reader if it has not yet been done.
(open_ccid_reader): Don't care if the ATR can't be read.
(apdu_activate_card): New.
(apdu_strerror): New.
(dump_reader_status): Only enable it with opt.VERBOSE.
* iso7816.c (map_sw): Add mappings for the new error codes.
* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
in verbose mode.
* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
exponent.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
* card-util.c (change_login): Kludge to allow reading data from a
file.
(card_edit): Pass ARG_STRING to change_login.
(card_status): Print CA fingerprints.
(change_cafpr): New.
(card_edit): New command CAFPR.
* errors.h (G10ERR_NO_CARD, G10ERR_CANCELED): New error codes.
* errors.c (g10_errstr): New error codes G10ERR_NO_CARD,
G10ERR_CANCELED.
2004-09-09 18:18:36 +00:00
|
|
|
|
if (info.cafpr1valid)
|
|
|
|
|
{
|
|
|
|
|
tty_fprintf (fp, "CA fingerprint %d .:", 1);
|
|
|
|
|
print_sha1_fpr (fp, info.cafpr1);
|
|
|
|
|
}
|
|
|
|
|
if (info.cafpr2valid)
|
|
|
|
|
{
|
|
|
|
|
tty_fprintf (fp, "CA fingerprint %d .:", 2);
|
|
|
|
|
print_sha1_fpr (fp, info.cafpr2);
|
|
|
|
|
}
|
|
|
|
|
if (info.cafpr3valid)
|
|
|
|
|
{
|
|
|
|
|
tty_fprintf (fp, "CA fingerprint %d .:", 3);
|
|
|
|
|
print_sha1_fpr (fp, info.cafpr3);
|
|
|
|
|
}
|
2003-09-28 13:41:58 +00:00
|
|
|
|
tty_fprintf (fp, "Signature PIN ....: %s\n",
|
2003-10-02 10:20:12 +00:00
|
|
|
|
info.chv1_cached? _("not forced"): _("forced"));
|
2003-09-28 13:41:58 +00:00
|
|
|
|
tty_fprintf (fp, "Max. PIN lengths .: %d %d %d\n",
|
|
|
|
|
info.chvmaxlen[0], info.chvmaxlen[1], info.chvmaxlen[2]);
|
|
|
|
|
tty_fprintf (fp, "PIN retry counter : %d %d %d\n",
|
|
|
|
|
info.chvretry[0], info.chvretry[1], info.chvretry[2]);
|
|
|
|
|
tty_fprintf (fp, "Signature counter : %lu\n", info.sig_counter);
|
|
|
|
|
tty_fprintf (fp, "Signature key ....:");
|
|
|
|
|
print_sha1_fpr (fp, info.fpr1valid? info.fpr1:NULL);
|
2004-12-10 10:49:14 +00:00
|
|
|
|
if (info.fpr1valid && info.fpr1time)
|
|
|
|
|
tty_fprintf (fp, " created ....: %s\n",
|
2005-03-14 20:41:20 +00:00
|
|
|
|
isotimestamp (info.fpr1time));
|
2003-09-28 13:41:58 +00:00
|
|
|
|
tty_fprintf (fp, "Encryption key....:");
|
|
|
|
|
print_sha1_fpr (fp, info.fpr2valid? info.fpr2:NULL);
|
2004-12-10 10:49:14 +00:00
|
|
|
|
if (info.fpr2valid && info.fpr2time)
|
|
|
|
|
tty_fprintf (fp, " created ....: %s\n",
|
2005-03-14 20:41:20 +00:00
|
|
|
|
isotimestamp (info.fpr2time));
|
2003-09-28 13:41:58 +00:00
|
|
|
|
tty_fprintf (fp, "Authentication key:");
|
|
|
|
|
print_sha1_fpr (fp, info.fpr3valid? info.fpr3:NULL);
|
2004-12-10 10:49:14 +00:00
|
|
|
|
if (info.fpr3valid && info.fpr3time)
|
|
|
|
|
tty_fprintf (fp, " created ....: %s\n",
|
2005-03-14 20:41:20 +00:00
|
|
|
|
isotimestamp (info.fpr3time));
|
2003-10-02 10:20:12 +00:00
|
|
|
|
tty_fprintf (fp, "General key info..: ");
|
2005-01-20 17:21:40 +00:00
|
|
|
|
|
|
|
|
|
thefpr = (info.fpr1valid? info.fpr1 : info.fpr2valid? info.fpr2 :
|
|
|
|
|
info.fpr3valid? info.fpr3 : NULL);
|
|
|
|
|
if ( thefpr && !get_pubkey_byfprint (pk, thefpr, 20))
|
|
|
|
|
{
|
|
|
|
|
KBNODE keyblock = NULL;
|
|
|
|
|
|
|
|
|
|
print_pubkey_info (fp, pk);
|
|
|
|
|
|
|
|
|
|
if ( !get_seckeyblock_byfprint (&keyblock, thefpr, 20) )
|
|
|
|
|
print_card_key_info (fp, keyblock);
|
|
|
|
|
else if ( !get_keyblock_byfprint (&keyblock, thefpr, 20) )
|
|
|
|
|
{
|
|
|
|
|
release_kbnode (keyblock);
|
|
|
|
|
keyblock = NULL;
|
|
|
|
|
|
|
|
|
|
if (!auto_create_card_key_stub (info.serialno,
|
|
|
|
|
info.fpr1valid? info.fpr1:NULL,
|
|
|
|
|
info.fpr2valid? info.fpr2:NULL,
|
|
|
|
|
info.fpr3valid? info.fpr3:NULL))
|
|
|
|
|
{
|
|
|
|
|
if ( !get_seckeyblock_byfprint (&keyblock, thefpr, 20) )
|
|
|
|
|
print_card_key_info (fp, keyblock);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
release_kbnode (keyblock);
|
|
|
|
|
}
|
2003-10-02 10:20:12 +00:00
|
|
|
|
else
|
|
|
|
|
tty_fprintf (fp, "[none]\n");
|
2003-09-28 13:41:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free_public_key (pk);
|
|
|
|
|
agent_release_card_info (&info);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
get_one_name (const char *prompt1, const char *prompt2)
|
|
|
|
|
{
|
|
|
|
|
char *name;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
name = cpr_get (prompt1, prompt2);
|
|
|
|
|
if (!name)
|
|
|
|
|
return NULL;
|
|
|
|
|
trim_spaces (name);
|
|
|
|
|
cpr_kill_prompt ();
|
|
|
|
|
for (i=0; name[i] && name[i] >= ' ' && name[i] <= 126; i++)
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
/* The name must be in Latin-1 and not UTF-8 - lacking the code
|
|
|
|
|
to ensure this we restrict it to ASCII. */
|
|
|
|
|
if (name[i])
|
|
|
|
|
tty_printf (_("Error: Only plain ASCII is currently allowed.\n"));
|
|
|
|
|
else if (strchr (name, '<'))
|
|
|
|
|
tty_printf (_("Error: The \"<\" character may not be used.\n"));
|
|
|
|
|
else if (strstr (name, " "))
|
|
|
|
|
tty_printf (_("Error: Double spaces are not allowed.\n"));
|
|
|
|
|
else
|
|
|
|
|
return name;
|
|
|
|
|
xfree (name);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
change_name (void)
|
|
|
|
|
{
|
|
|
|
|
char *surname = NULL, *givenname = NULL;
|
|
|
|
|
char *isoname, *p;
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
surname = get_one_name ("keygen.smartcard.surname",
|
|
|
|
|
_("Cardholder's surname: "));
|
|
|
|
|
givenname = get_one_name ("keygen.smartcard.givenname",
|
|
|
|
|
_("Cardholder's given name: "));
|
|
|
|
|
if (!surname || !givenname || (!*surname && !*givenname))
|
|
|
|
|
{
|
|
|
|
|
xfree (surname);
|
|
|
|
|
xfree (givenname);
|
|
|
|
|
return -1; /*canceled*/
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
isoname = xmalloc ( strlen (surname) + 2 + strlen (givenname) + 1);
|
|
|
|
|
strcpy (stpcpy (stpcpy (isoname, surname), "<<"), givenname);
|
|
|
|
|
xfree (surname);
|
|
|
|
|
xfree (givenname);
|
|
|
|
|
for (p=isoname; *p; p++)
|
|
|
|
|
if (*p == ' ')
|
|
|
|
|
*p = '<';
|
|
|
|
|
|
2004-04-27 08:23:45 +00:00
|
|
|
|
if (strlen (isoname) > 39 )
|
|
|
|
|
{
|
|
|
|
|
tty_printf (_("Error: Combined name too long "
|
|
|
|
|
"(limit is %d characters).\n"), 39);
|
|
|
|
|
xfree (isoname);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-28 13:41:58 +00:00
|
|
|
|
rc = agent_scd_setattr ("DISP-NAME", isoname, strlen (isoname) );
|
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("error setting Name: %s\n", gpg_strerror (rc));
|
|
|
|
|
|
|
|
|
|
xfree (isoname);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
change_url (void)
|
|
|
|
|
{
|
|
|
|
|
char *url;
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
url = cpr_get ("cardedit.change_url", _("URL to retrieve public key: "));
|
|
|
|
|
if (!url)
|
|
|
|
|
return -1;
|
|
|
|
|
trim_spaces (url);
|
|
|
|
|
cpr_kill_prompt ();
|
|
|
|
|
|
2004-04-27 08:23:45 +00:00
|
|
|
|
if (strlen (url) > 254 )
|
|
|
|
|
{
|
|
|
|
|
tty_printf (_("Error: URL too long "
|
|
|
|
|
"(limit is %d characters).\n"), 254);
|
|
|
|
|
xfree (url);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-28 13:41:58 +00:00
|
|
|
|
rc = agent_scd_setattr ("PUBKEY-URL", url, strlen (url) );
|
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("error setting URL: %s\n", gpg_strerror (rc));
|
|
|
|
|
xfree (url);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-16 20:08:14 +00:00
|
|
|
|
|
2005-03-14 19:19:21 +00:00
|
|
|
|
/* Fetch the key from the URL given on the card or try to get it from
|
2005-02-16 20:08:14 +00:00
|
|
|
|
the default keyserver. */
|
2004-09-11 15:42:19 +00:00
|
|
|
|
static int
|
|
|
|
|
fetch_url(void)
|
|
|
|
|
{
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#if GNUPG_MAJOR_VERSION == 1
|
2004-09-11 15:42:19 +00:00
|
|
|
|
int rc;
|
|
|
|
|
struct agent_card_info_s info;
|
|
|
|
|
|
|
|
|
|
memset(&info,0,sizeof(info));
|
|
|
|
|
|
|
|
|
|
rc=agent_scd_getattr("PUBKEY-URL",&info);
|
|
|
|
|
if(rc)
|
|
|
|
|
log_error("error retrieving URL from card: %s\n",gpg_strerror(rc));
|
2005-02-16 20:08:14 +00:00
|
|
|
|
else
|
2004-09-11 15:42:19 +00:00
|
|
|
|
{
|
|
|
|
|
struct keyserver_spec *spec=NULL;
|
|
|
|
|
|
|
|
|
|
rc=agent_scd_getattr("KEY-FPR",&info);
|
|
|
|
|
if(rc)
|
|
|
|
|
log_error("error retrieving key fingerprint from card: %s\n",
|
|
|
|
|
gpg_strerror(rc));
|
2005-02-16 20:08:14 +00:00
|
|
|
|
else if (info.pubkey_url && *info.pubkey_url)
|
2004-09-11 15:42:19 +00:00
|
|
|
|
{
|
|
|
|
|
spec=parse_keyserver_uri(info.pubkey_url,0,NULL,0);
|
|
|
|
|
if(spec && info.fpr1valid)
|
|
|
|
|
{
|
|
|
|
|
/* This is not perfectly right. Currently, all card
|
|
|
|
|
fingerprints are 20 digits, but what about
|
|
|
|
|
fingerprints for a future v5 key? We should get the
|
|
|
|
|
length from somewhere lower in the code. In any
|
|
|
|
|
event, the fpr/keyid is not meaningful for straight
|
|
|
|
|
HTTP fetches, but using it allows the card to point
|
|
|
|
|
to HKP and LDAP servers as well. */
|
|
|
|
|
rc=keyserver_import_fprint(info.fpr1,20,spec);
|
|
|
|
|
free_keyserver_spec(spec);
|
|
|
|
|
}
|
|
|
|
|
}
|
2005-02-16 20:08:14 +00:00
|
|
|
|
else if (info.fpr1valid)
|
|
|
|
|
{
|
|
|
|
|
rc = keyserver_import_fprint (info.fpr1, 20, opt.keyserver);
|
|
|
|
|
}
|
2004-09-11 15:42:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return rc;
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#else
|
|
|
|
|
return 0;
|
|
|
|
|
#endif
|
2004-09-11 15:42:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-09-28 13:41:58 +00:00
|
|
|
|
static int
|
* README: Doc --disable-card-support and --without-readline.
* configure.ac: Check for readline. Make enable-card-support the
default. New option --without-readline. Allow the use of either
the development or the stable libusb.
* cardglue.h: Add members for CA fingerprints.
* cardglue.c (agent_release_card_info): Invalid them.
(learn_status_cb): Store them.
* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
* card-util.c: Updated from current gnupg-1.9.
* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
of libusb.
(ccid_get_atr): Handle short messages.
* apdu.c (my_rapdu_get_status): Implemented.
* apdu.c: Include <signal.h>.
* apdu.c (reader_table_s): Add function pointers for the backends.
(apdu_close_reader, apdu_get_status, apdu_activate)
(send_apdu): Make use of them.
(new_reader_slot): Intialize them to NULL.
(dump_ccid_reader_status, ct_dump_reader_status): New.
(dump_pcsc_reader_status): New.
(open_ct_reader, open_pcsc_reader, open_ccid_reader)
(open_osc_reader, open_rapdu_reader): Intialize function pointers.
(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
(error_string): Removed. Replaced by apdu_strerror.
(get_ccid_error_string): Removed.
(ct_activate_card): Remove the unused loop.
(reset_ct_reader): Implemented.
(ct_send_apdu): Activate the card if not yet done.
(pcsc_send_apdu): Ditto.
* ccid-driver.h: Add error codes.
* ccid-driver.c: Implement more or less proper error codes all
over the place.
* apdu.c (apdu_send_direct): New.
(get_ccid_error_string): Add some error code mappings.
(send_apdu): Pass error codes along for drivers already supporting
them.
(host_sw_string): New.
(get_ccid_error_string): Use above.
(send_apdu_ccid): Reset the reader if it has not yet been done.
(open_ccid_reader): Don't care if the ATR can't be read.
(apdu_activate_card): New.
(apdu_strerror): New.
(dump_reader_status): Only enable it with opt.VERBOSE.
* iso7816.c (map_sw): Add mappings for the new error codes.
* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
in verbose mode.
* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
exponent.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
* card-util.c (change_login): Kludge to allow reading data from a
file.
(card_edit): Pass ARG_STRING to change_login.
(card_status): Print CA fingerprints.
(change_cafpr): New.
(card_edit): New command CAFPR.
* errors.h (G10ERR_NO_CARD, G10ERR_CANCELED): New error codes.
* errors.c (g10_errstr): New error codes G10ERR_NO_CARD,
G10ERR_CANCELED.
2004-09-09 18:18:36 +00:00
|
|
|
|
change_login (const char *args)
|
2003-09-28 13:41:58 +00:00
|
|
|
|
{
|
|
|
|
|
char *data;
|
* README: Doc --disable-card-support and --without-readline.
* configure.ac: Check for readline. Make enable-card-support the
default. New option --without-readline. Allow the use of either
the development or the stable libusb.
* cardglue.h: Add members for CA fingerprints.
* cardglue.c (agent_release_card_info): Invalid them.
(learn_status_cb): Store them.
* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
* card-util.c: Updated from current gnupg-1.9.
* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
of libusb.
(ccid_get_atr): Handle short messages.
* apdu.c (my_rapdu_get_status): Implemented.
* apdu.c: Include <signal.h>.
* apdu.c (reader_table_s): Add function pointers for the backends.
(apdu_close_reader, apdu_get_status, apdu_activate)
(send_apdu): Make use of them.
(new_reader_slot): Intialize them to NULL.
(dump_ccid_reader_status, ct_dump_reader_status): New.
(dump_pcsc_reader_status): New.
(open_ct_reader, open_pcsc_reader, open_ccid_reader)
(open_osc_reader, open_rapdu_reader): Intialize function pointers.
(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
(error_string): Removed. Replaced by apdu_strerror.
(get_ccid_error_string): Removed.
(ct_activate_card): Remove the unused loop.
(reset_ct_reader): Implemented.
(ct_send_apdu): Activate the card if not yet done.
(pcsc_send_apdu): Ditto.
* ccid-driver.h: Add error codes.
* ccid-driver.c: Implement more or less proper error codes all
over the place.
* apdu.c (apdu_send_direct): New.
(get_ccid_error_string): Add some error code mappings.
(send_apdu): Pass error codes along for drivers already supporting
them.
(host_sw_string): New.
(get_ccid_error_string): Use above.
(send_apdu_ccid): Reset the reader if it has not yet been done.
(open_ccid_reader): Don't care if the ATR can't be read.
(apdu_activate_card): New.
(apdu_strerror): New.
(dump_reader_status): Only enable it with opt.VERBOSE.
* iso7816.c (map_sw): Add mappings for the new error codes.
* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
in verbose mode.
* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
exponent.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
* card-util.c (change_login): Kludge to allow reading data from a
file.
(card_edit): Pass ARG_STRING to change_login.
(card_status): Print CA fingerprints.
(change_cafpr): New.
(card_edit): New command CAFPR.
* errors.h (G10ERR_NO_CARD, G10ERR_CANCELED): New error codes.
* errors.c (g10_errstr): New error codes G10ERR_NO_CARD,
G10ERR_CANCELED.
2004-09-09 18:18:36 +00:00
|
|
|
|
int n;
|
2003-09-28 13:41:58 +00:00
|
|
|
|
int rc;
|
|
|
|
|
|
* README: Doc --disable-card-support and --without-readline.
* configure.ac: Check for readline. Make enable-card-support the
default. New option --without-readline. Allow the use of either
the development or the stable libusb.
* cardglue.h: Add members for CA fingerprints.
* cardglue.c (agent_release_card_info): Invalid them.
(learn_status_cb): Store them.
* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
* card-util.c: Updated from current gnupg-1.9.
* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
of libusb.
(ccid_get_atr): Handle short messages.
* apdu.c (my_rapdu_get_status): Implemented.
* apdu.c: Include <signal.h>.
* apdu.c (reader_table_s): Add function pointers for the backends.
(apdu_close_reader, apdu_get_status, apdu_activate)
(send_apdu): Make use of them.
(new_reader_slot): Intialize them to NULL.
(dump_ccid_reader_status, ct_dump_reader_status): New.
(dump_pcsc_reader_status): New.
(open_ct_reader, open_pcsc_reader, open_ccid_reader)
(open_osc_reader, open_rapdu_reader): Intialize function pointers.
(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
(error_string): Removed. Replaced by apdu_strerror.
(get_ccid_error_string): Removed.
(ct_activate_card): Remove the unused loop.
(reset_ct_reader): Implemented.
(ct_send_apdu): Activate the card if not yet done.
(pcsc_send_apdu): Ditto.
* ccid-driver.h: Add error codes.
* ccid-driver.c: Implement more or less proper error codes all
over the place.
* apdu.c (apdu_send_direct): New.
(get_ccid_error_string): Add some error code mappings.
(send_apdu): Pass error codes along for drivers already supporting
them.
(host_sw_string): New.
(get_ccid_error_string): Use above.
(send_apdu_ccid): Reset the reader if it has not yet been done.
(open_ccid_reader): Don't care if the ATR can't be read.
(apdu_activate_card): New.
(apdu_strerror): New.
(dump_reader_status): Only enable it with opt.VERBOSE.
* iso7816.c (map_sw): Add mappings for the new error codes.
* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
in verbose mode.
* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
exponent.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
* card-util.c (change_login): Kludge to allow reading data from a
file.
(card_edit): Pass ARG_STRING to change_login.
(card_status): Print CA fingerprints.
(change_cafpr): New.
(card_edit): New command CAFPR.
* errors.h (G10ERR_NO_CARD, G10ERR_CANCELED): New error codes.
* errors.c (g10_errstr): New error codes G10ERR_NO_CARD,
G10ERR_CANCELED.
2004-09-09 18:18:36 +00:00
|
|
|
|
if (args && *args == '<') /* Read it from a file */
|
|
|
|
|
{
|
|
|
|
|
FILE *fp;
|
2003-09-28 13:41:58 +00:00
|
|
|
|
|
* README: Doc --disable-card-support and --without-readline.
* configure.ac: Check for readline. Make enable-card-support the
default. New option --without-readline. Allow the use of either
the development or the stable libusb.
* cardglue.h: Add members for CA fingerprints.
* cardglue.c (agent_release_card_info): Invalid them.
(learn_status_cb): Store them.
* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
* card-util.c: Updated from current gnupg-1.9.
* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
of libusb.
(ccid_get_atr): Handle short messages.
* apdu.c (my_rapdu_get_status): Implemented.
* apdu.c: Include <signal.h>.
* apdu.c (reader_table_s): Add function pointers for the backends.
(apdu_close_reader, apdu_get_status, apdu_activate)
(send_apdu): Make use of them.
(new_reader_slot): Intialize them to NULL.
(dump_ccid_reader_status, ct_dump_reader_status): New.
(dump_pcsc_reader_status): New.
(open_ct_reader, open_pcsc_reader, open_ccid_reader)
(open_osc_reader, open_rapdu_reader): Intialize function pointers.
(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
(error_string): Removed. Replaced by apdu_strerror.
(get_ccid_error_string): Removed.
(ct_activate_card): Remove the unused loop.
(reset_ct_reader): Implemented.
(ct_send_apdu): Activate the card if not yet done.
(pcsc_send_apdu): Ditto.
* ccid-driver.h: Add error codes.
* ccid-driver.c: Implement more or less proper error codes all
over the place.
* apdu.c (apdu_send_direct): New.
(get_ccid_error_string): Add some error code mappings.
(send_apdu): Pass error codes along for drivers already supporting
them.
(host_sw_string): New.
(get_ccid_error_string): Use above.
(send_apdu_ccid): Reset the reader if it has not yet been done.
(open_ccid_reader): Don't care if the ATR can't be read.
(apdu_activate_card): New.
(apdu_strerror): New.
(dump_reader_status): Only enable it with opt.VERBOSE.
* iso7816.c (map_sw): Add mappings for the new error codes.
* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
in verbose mode.
* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
exponent.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
* card-util.c (change_login): Kludge to allow reading data from a
file.
(card_edit): Pass ARG_STRING to change_login.
(card_status): Print CA fingerprints.
(change_cafpr): New.
(card_edit): New command CAFPR.
* errors.h (G10ERR_NO_CARD, G10ERR_CANCELED): New error codes.
* errors.c (g10_errstr): New error codes G10ERR_NO_CARD,
G10ERR_CANCELED.
2004-09-09 18:18:36 +00:00
|
|
|
|
for (args++; spacep (args); args++)
|
|
|
|
|
;
|
|
|
|
|
fp = fopen (args, "rb");
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#if GNUPG_MAJOR_VERSION == 1
|
2004-10-13 18:10:06 +00:00
|
|
|
|
if (fp && is_secured_file (fileno (fp)))
|
|
|
|
|
{
|
|
|
|
|
fclose (fp);
|
|
|
|
|
fp = NULL;
|
|
|
|
|
errno = EPERM;
|
|
|
|
|
}
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#endif
|
* README: Doc --disable-card-support and --without-readline.
* configure.ac: Check for readline. Make enable-card-support the
default. New option --without-readline. Allow the use of either
the development or the stable libusb.
* cardglue.h: Add members for CA fingerprints.
* cardglue.c (agent_release_card_info): Invalid them.
(learn_status_cb): Store them.
* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
* card-util.c: Updated from current gnupg-1.9.
* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
of libusb.
(ccid_get_atr): Handle short messages.
* apdu.c (my_rapdu_get_status): Implemented.
* apdu.c: Include <signal.h>.
* apdu.c (reader_table_s): Add function pointers for the backends.
(apdu_close_reader, apdu_get_status, apdu_activate)
(send_apdu): Make use of them.
(new_reader_slot): Intialize them to NULL.
(dump_ccid_reader_status, ct_dump_reader_status): New.
(dump_pcsc_reader_status): New.
(open_ct_reader, open_pcsc_reader, open_ccid_reader)
(open_osc_reader, open_rapdu_reader): Intialize function pointers.
(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
(error_string): Removed. Replaced by apdu_strerror.
(get_ccid_error_string): Removed.
(ct_activate_card): Remove the unused loop.
(reset_ct_reader): Implemented.
(ct_send_apdu): Activate the card if not yet done.
(pcsc_send_apdu): Ditto.
* ccid-driver.h: Add error codes.
* ccid-driver.c: Implement more or less proper error codes all
over the place.
* apdu.c (apdu_send_direct): New.
(get_ccid_error_string): Add some error code mappings.
(send_apdu): Pass error codes along for drivers already supporting
them.
(host_sw_string): New.
(get_ccid_error_string): Use above.
(send_apdu_ccid): Reset the reader if it has not yet been done.
(open_ccid_reader): Don't care if the ATR can't be read.
(apdu_activate_card): New.
(apdu_strerror): New.
(dump_reader_status): Only enable it with opt.VERBOSE.
* iso7816.c (map_sw): Add mappings for the new error codes.
* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
in verbose mode.
* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
exponent.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
* card-util.c (change_login): Kludge to allow reading data from a
file.
(card_edit): Pass ARG_STRING to change_login.
(card_status): Print CA fingerprints.
(change_cafpr): New.
(card_edit): New command CAFPR.
* errors.h (G10ERR_NO_CARD, G10ERR_CANCELED): New error codes.
* errors.c (g10_errstr): New error codes G10ERR_NO_CARD,
G10ERR_CANCELED.
2004-09-09 18:18:36 +00:00
|
|
|
|
if (!fp)
|
|
|
|
|
{
|
2004-10-13 18:10:06 +00:00
|
|
|
|
tty_printf (_("can't open `%s': %s\n"), args, strerror (errno));
|
* README: Doc --disable-card-support and --without-readline.
* configure.ac: Check for readline. Make enable-card-support the
default. New option --without-readline. Allow the use of either
the development or the stable libusb.
* cardglue.h: Add members for CA fingerprints.
* cardglue.c (agent_release_card_info): Invalid them.
(learn_status_cb): Store them.
* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
* card-util.c: Updated from current gnupg-1.9.
* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
of libusb.
(ccid_get_atr): Handle short messages.
* apdu.c (my_rapdu_get_status): Implemented.
* apdu.c: Include <signal.h>.
* apdu.c (reader_table_s): Add function pointers for the backends.
(apdu_close_reader, apdu_get_status, apdu_activate)
(send_apdu): Make use of them.
(new_reader_slot): Intialize them to NULL.
(dump_ccid_reader_status, ct_dump_reader_status): New.
(dump_pcsc_reader_status): New.
(open_ct_reader, open_pcsc_reader, open_ccid_reader)
(open_osc_reader, open_rapdu_reader): Intialize function pointers.
(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
(error_string): Removed. Replaced by apdu_strerror.
(get_ccid_error_string): Removed.
(ct_activate_card): Remove the unused loop.
(reset_ct_reader): Implemented.
(ct_send_apdu): Activate the card if not yet done.
(pcsc_send_apdu): Ditto.
* ccid-driver.h: Add error codes.
* ccid-driver.c: Implement more or less proper error codes all
over the place.
* apdu.c (apdu_send_direct): New.
(get_ccid_error_string): Add some error code mappings.
(send_apdu): Pass error codes along for drivers already supporting
them.
(host_sw_string): New.
(get_ccid_error_string): Use above.
(send_apdu_ccid): Reset the reader if it has not yet been done.
(open_ccid_reader): Don't care if the ATR can't be read.
(apdu_activate_card): New.
(apdu_strerror): New.
(dump_reader_status): Only enable it with opt.VERBOSE.
* iso7816.c (map_sw): Add mappings for the new error codes.
* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
in verbose mode.
* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
exponent.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
* card-util.c (change_login): Kludge to allow reading data from a
file.
(card_edit): Pass ARG_STRING to change_login.
(card_status): Print CA fingerprints.
(change_cafpr): New.
(card_edit): New command CAFPR.
* errors.h (G10ERR_NO_CARD, G10ERR_CANCELED): New error codes.
* errors.c (g10_errstr): New error codes G10ERR_NO_CARD,
G10ERR_CANCELED.
2004-09-09 18:18:36 +00:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
2004-10-13 18:10:06 +00:00
|
|
|
|
|
* README: Doc --disable-card-support and --without-readline.
* configure.ac: Check for readline. Make enable-card-support the
default. New option --without-readline. Allow the use of either
the development or the stable libusb.
* cardglue.h: Add members for CA fingerprints.
* cardglue.c (agent_release_card_info): Invalid them.
(learn_status_cb): Store them.
* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
* card-util.c: Updated from current gnupg-1.9.
* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
of libusb.
(ccid_get_atr): Handle short messages.
* apdu.c (my_rapdu_get_status): Implemented.
* apdu.c: Include <signal.h>.
* apdu.c (reader_table_s): Add function pointers for the backends.
(apdu_close_reader, apdu_get_status, apdu_activate)
(send_apdu): Make use of them.
(new_reader_slot): Intialize them to NULL.
(dump_ccid_reader_status, ct_dump_reader_status): New.
(dump_pcsc_reader_status): New.
(open_ct_reader, open_pcsc_reader, open_ccid_reader)
(open_osc_reader, open_rapdu_reader): Intialize function pointers.
(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
(error_string): Removed. Replaced by apdu_strerror.
(get_ccid_error_string): Removed.
(ct_activate_card): Remove the unused loop.
(reset_ct_reader): Implemented.
(ct_send_apdu): Activate the card if not yet done.
(pcsc_send_apdu): Ditto.
* ccid-driver.h: Add error codes.
* ccid-driver.c: Implement more or less proper error codes all
over the place.
* apdu.c (apdu_send_direct): New.
(get_ccid_error_string): Add some error code mappings.
(send_apdu): Pass error codes along for drivers already supporting
them.
(host_sw_string): New.
(get_ccid_error_string): Use above.
(send_apdu_ccid): Reset the reader if it has not yet been done.
(open_ccid_reader): Don't care if the ATR can't be read.
(apdu_activate_card): New.
(apdu_strerror): New.
(dump_reader_status): Only enable it with opt.VERBOSE.
* iso7816.c (map_sw): Add mappings for the new error codes.
* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
in verbose mode.
* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
exponent.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
* card-util.c (change_login): Kludge to allow reading data from a
file.
(card_edit): Pass ARG_STRING to change_login.
(card_status): Print CA fingerprints.
(change_cafpr): New.
(card_edit): New command CAFPR.
* errors.h (G10ERR_NO_CARD, G10ERR_CANCELED): New error codes.
* errors.c (g10_errstr): New error codes G10ERR_NO_CARD,
G10ERR_CANCELED.
2004-09-09 18:18:36 +00:00
|
|
|
|
data = xmalloc (254);
|
|
|
|
|
n = fread (data, 1, 254, fp);
|
|
|
|
|
fclose (fp);
|
|
|
|
|
if (n < 0)
|
|
|
|
|
{
|
2004-10-13 18:10:06 +00:00
|
|
|
|
tty_printf (_("error reading `%s': %s\n"), args, strerror (errno));
|
* README: Doc --disable-card-support and --without-readline.
* configure.ac: Check for readline. Make enable-card-support the
default. New option --without-readline. Allow the use of either
the development or the stable libusb.
* cardglue.h: Add members for CA fingerprints.
* cardglue.c (agent_release_card_info): Invalid them.
(learn_status_cb): Store them.
* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
* card-util.c: Updated from current gnupg-1.9.
* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
of libusb.
(ccid_get_atr): Handle short messages.
* apdu.c (my_rapdu_get_status): Implemented.
* apdu.c: Include <signal.h>.
* apdu.c (reader_table_s): Add function pointers for the backends.
(apdu_close_reader, apdu_get_status, apdu_activate)
(send_apdu): Make use of them.
(new_reader_slot): Intialize them to NULL.
(dump_ccid_reader_status, ct_dump_reader_status): New.
(dump_pcsc_reader_status): New.
(open_ct_reader, open_pcsc_reader, open_ccid_reader)
(open_osc_reader, open_rapdu_reader): Intialize function pointers.
(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
(error_string): Removed. Replaced by apdu_strerror.
(get_ccid_error_string): Removed.
(ct_activate_card): Remove the unused loop.
(reset_ct_reader): Implemented.
(ct_send_apdu): Activate the card if not yet done.
(pcsc_send_apdu): Ditto.
* ccid-driver.h: Add error codes.
* ccid-driver.c: Implement more or less proper error codes all
over the place.
* apdu.c (apdu_send_direct): New.
(get_ccid_error_string): Add some error code mappings.
(send_apdu): Pass error codes along for drivers already supporting
them.
(host_sw_string): New.
(get_ccid_error_string): Use above.
(send_apdu_ccid): Reset the reader if it has not yet been done.
(open_ccid_reader): Don't care if the ATR can't be read.
(apdu_activate_card): New.
(apdu_strerror): New.
(dump_reader_status): Only enable it with opt.VERBOSE.
* iso7816.c (map_sw): Add mappings for the new error codes.
* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
in verbose mode.
* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
exponent.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
* card-util.c (change_login): Kludge to allow reading data from a
file.
(card_edit): Pass ARG_STRING to change_login.
(card_status): Print CA fingerprints.
(change_cafpr): New.
(card_edit): New command CAFPR.
* errors.h (G10ERR_NO_CARD, G10ERR_CANCELED): New error codes.
* errors.c (g10_errstr): New error codes G10ERR_NO_CARD,
G10ERR_CANCELED.
2004-09-09 18:18:36 +00:00
|
|
|
|
xfree (data);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
data = cpr_get ("cardedit.change_login",
|
|
|
|
|
_("Login data (account name): "));
|
|
|
|
|
if (!data)
|
|
|
|
|
return -1;
|
|
|
|
|
trim_spaces (data);
|
|
|
|
|
cpr_kill_prompt ();
|
|
|
|
|
n = strlen (data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (n > 254 )
|
2004-04-27 08:23:45 +00:00
|
|
|
|
{
|
|
|
|
|
tty_printf (_("Error: Login data too long "
|
|
|
|
|
"(limit is %d characters).\n"), 254);
|
|
|
|
|
xfree (data);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
* README: Doc --disable-card-support and --without-readline.
* configure.ac: Check for readline. Make enable-card-support the
default. New option --without-readline. Allow the use of either
the development or the stable libusb.
* cardglue.h: Add members for CA fingerprints.
* cardglue.c (agent_release_card_info): Invalid them.
(learn_status_cb): Store them.
* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
* card-util.c: Updated from current gnupg-1.9.
* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
of libusb.
(ccid_get_atr): Handle short messages.
* apdu.c (my_rapdu_get_status): Implemented.
* apdu.c: Include <signal.h>.
* apdu.c (reader_table_s): Add function pointers for the backends.
(apdu_close_reader, apdu_get_status, apdu_activate)
(send_apdu): Make use of them.
(new_reader_slot): Intialize them to NULL.
(dump_ccid_reader_status, ct_dump_reader_status): New.
(dump_pcsc_reader_status): New.
(open_ct_reader, open_pcsc_reader, open_ccid_reader)
(open_osc_reader, open_rapdu_reader): Intialize function pointers.
(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
(error_string): Removed. Replaced by apdu_strerror.
(get_ccid_error_string): Removed.
(ct_activate_card): Remove the unused loop.
(reset_ct_reader): Implemented.
(ct_send_apdu): Activate the card if not yet done.
(pcsc_send_apdu): Ditto.
* ccid-driver.h: Add error codes.
* ccid-driver.c: Implement more or less proper error codes all
over the place.
* apdu.c (apdu_send_direct): New.
(get_ccid_error_string): Add some error code mappings.
(send_apdu): Pass error codes along for drivers already supporting
them.
(host_sw_string): New.
(get_ccid_error_string): Use above.
(send_apdu_ccid): Reset the reader if it has not yet been done.
(open_ccid_reader): Don't care if the ATR can't be read.
(apdu_activate_card): New.
(apdu_strerror): New.
(dump_reader_status): Only enable it with opt.VERBOSE.
* iso7816.c (map_sw): Add mappings for the new error codes.
* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
in verbose mode.
* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
exponent.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
* card-util.c (change_login): Kludge to allow reading data from a
file.
(card_edit): Pass ARG_STRING to change_login.
(card_status): Print CA fingerprints.
(change_cafpr): New.
(card_edit): New command CAFPR.
* errors.h (G10ERR_NO_CARD, G10ERR_CANCELED): New error codes.
* errors.c (g10_errstr): New error codes G10ERR_NO_CARD,
G10ERR_CANCELED.
2004-09-09 18:18:36 +00:00
|
|
|
|
rc = agent_scd_setattr ("LOGIN-DATA", data, n );
|
2003-09-28 13:41:58 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("error setting login data: %s\n", gpg_strerror (rc));
|
|
|
|
|
xfree (data);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2004-12-09 16:57:30 +00:00
|
|
|
|
static int
|
|
|
|
|
change_private_do (const char *args, int nr)
|
|
|
|
|
{
|
|
|
|
|
char do_name[] = "PRIVATE-DO-X";
|
|
|
|
|
char *data;
|
|
|
|
|
int n;
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
assert (nr >= 1 && nr <= 4);
|
|
|
|
|
do_name[11] = '0' + nr;
|
|
|
|
|
|
|
|
|
|
if (args && (args = strchr (args, '<'))) /* Read it from a file */
|
|
|
|
|
{
|
|
|
|
|
FILE *fp;
|
|
|
|
|
|
|
|
|
|
/* Fixme: Factor this duplicated code out. */
|
|
|
|
|
for (args++; spacep (args); args++)
|
|
|
|
|
;
|
|
|
|
|
fp = fopen (args, "rb");
|
|
|
|
|
#if GNUPG_MAJOR_VERSION == 1
|
|
|
|
|
if (fp && is_secured_file (fileno (fp)))
|
|
|
|
|
{
|
|
|
|
|
fclose (fp);
|
|
|
|
|
fp = NULL;
|
|
|
|
|
errno = EPERM;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
if (!fp)
|
|
|
|
|
{
|
|
|
|
|
tty_printf (_("can't open `%s': %s\n"), args, strerror (errno));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data = xmalloc (254);
|
|
|
|
|
n = fread (data, 1, 254, fp);
|
|
|
|
|
fclose (fp);
|
|
|
|
|
if (n < 0)
|
|
|
|
|
{
|
|
|
|
|
tty_printf (_("error reading `%s': %s\n"), args, strerror (errno));
|
|
|
|
|
xfree (data);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
data = cpr_get ("cardedit.change_private_do",
|
|
|
|
|
_("Private DO data: "));
|
|
|
|
|
if (!data)
|
|
|
|
|
return -1;
|
|
|
|
|
trim_spaces (data);
|
|
|
|
|
cpr_kill_prompt ();
|
|
|
|
|
n = strlen (data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (n > 254 )
|
|
|
|
|
{
|
|
|
|
|
tty_printf (_("Error: Private DO too long "
|
|
|
|
|
"(limit is %d characters).\n"), 254);
|
|
|
|
|
xfree (data);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rc = agent_scd_setattr (do_name, data, n );
|
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("error setting private DO: %s\n", gpg_strerror (rc));
|
|
|
|
|
xfree (data);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-28 13:41:58 +00:00
|
|
|
|
static int
|
|
|
|
|
change_lang (void)
|
|
|
|
|
{
|
|
|
|
|
char *data, *p;
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
data = cpr_get ("cardedit.change_lang",
|
|
|
|
|
_("Language preferences: "));
|
|
|
|
|
if (!data)
|
|
|
|
|
return -1;
|
|
|
|
|
trim_spaces (data);
|
|
|
|
|
cpr_kill_prompt ();
|
|
|
|
|
|
|
|
|
|
if (strlen (data) > 8 || (strlen (data) & 1))
|
|
|
|
|
{
|
|
|
|
|
tty_printf (_("Error: invalid length of preference string.\n"));
|
|
|
|
|
xfree (data);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (p=data; *p && *p >= 'a' && *p <= 'z'; p++)
|
|
|
|
|
;
|
|
|
|
|
if (*p)
|
|
|
|
|
{
|
|
|
|
|
tty_printf (_("Error: invalid characters in preference string.\n"));
|
|
|
|
|
xfree (data);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rc = agent_scd_setattr ("DISP-LANG", data, strlen (data) );
|
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("error setting lang: %s\n", gpg_strerror (rc));
|
|
|
|
|
xfree (data);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
change_sex (void)
|
|
|
|
|
{
|
|
|
|
|
char *data;
|
|
|
|
|
const char *str;
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
data = cpr_get ("cardedit.change_sex",
|
|
|
|
|
_("Sex ((M)ale, (F)emale or space): "));
|
|
|
|
|
if (!data)
|
|
|
|
|
return -1;
|
|
|
|
|
trim_spaces (data);
|
|
|
|
|
cpr_kill_prompt ();
|
|
|
|
|
|
|
|
|
|
if (!*data)
|
|
|
|
|
str = "9";
|
|
|
|
|
else if ((*data == 'M' || *data == 'm') && !data[1])
|
|
|
|
|
str = "1";
|
|
|
|
|
else if ((*data == 'F' || *data == 'f') && !data[1])
|
|
|
|
|
str = "2";
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
tty_printf (_("Error: invalid response.\n"));
|
|
|
|
|
xfree (data);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rc = agent_scd_setattr ("DISP-SEX", str, 1 );
|
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("error setting sex: %s\n", gpg_strerror (rc));
|
|
|
|
|
xfree (data);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
* README: Doc --disable-card-support and --without-readline.
* configure.ac: Check for readline. Make enable-card-support the
default. New option --without-readline. Allow the use of either
the development or the stable libusb.
* cardglue.h: Add members for CA fingerprints.
* cardglue.c (agent_release_card_info): Invalid them.
(learn_status_cb): Store them.
* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
* card-util.c: Updated from current gnupg-1.9.
* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
of libusb.
(ccid_get_atr): Handle short messages.
* apdu.c (my_rapdu_get_status): Implemented.
* apdu.c: Include <signal.h>.
* apdu.c (reader_table_s): Add function pointers for the backends.
(apdu_close_reader, apdu_get_status, apdu_activate)
(send_apdu): Make use of them.
(new_reader_slot): Intialize them to NULL.
(dump_ccid_reader_status, ct_dump_reader_status): New.
(dump_pcsc_reader_status): New.
(open_ct_reader, open_pcsc_reader, open_ccid_reader)
(open_osc_reader, open_rapdu_reader): Intialize function pointers.
(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
(error_string): Removed. Replaced by apdu_strerror.
(get_ccid_error_string): Removed.
(ct_activate_card): Remove the unused loop.
(reset_ct_reader): Implemented.
(ct_send_apdu): Activate the card if not yet done.
(pcsc_send_apdu): Ditto.
* ccid-driver.h: Add error codes.
* ccid-driver.c: Implement more or less proper error codes all
over the place.
* apdu.c (apdu_send_direct): New.
(get_ccid_error_string): Add some error code mappings.
(send_apdu): Pass error codes along for drivers already supporting
them.
(host_sw_string): New.
(get_ccid_error_string): Use above.
(send_apdu_ccid): Reset the reader if it has not yet been done.
(open_ccid_reader): Don't care if the ATR can't be read.
(apdu_activate_card): New.
(apdu_strerror): New.
(dump_reader_status): Only enable it with opt.VERBOSE.
* iso7816.c (map_sw): Add mappings for the new error codes.
* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
in verbose mode.
* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
exponent.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
* card-util.c (change_login): Kludge to allow reading data from a
file.
(card_edit): Pass ARG_STRING to change_login.
(card_status): Print CA fingerprints.
(change_cafpr): New.
(card_edit): New command CAFPR.
* errors.h (G10ERR_NO_CARD, G10ERR_CANCELED): New error codes.
* errors.c (g10_errstr): New error codes G10ERR_NO_CARD,
G10ERR_CANCELED.
2004-09-09 18:18:36 +00:00
|
|
|
|
static int
|
|
|
|
|
change_cafpr (int fprno)
|
|
|
|
|
{
|
|
|
|
|
char *data;
|
|
|
|
|
const char *s;
|
|
|
|
|
int i, c, rc;
|
|
|
|
|
unsigned char fpr[20];
|
|
|
|
|
|
|
|
|
|
data = cpr_get ("cardedit.change_cafpr", _("CA fingerprint: "));
|
|
|
|
|
if (!data)
|
|
|
|
|
return -1;
|
|
|
|
|
trim_spaces (data);
|
|
|
|
|
cpr_kill_prompt ();
|
|
|
|
|
|
|
|
|
|
for (i=0, s=data; i < 20 && *s; )
|
|
|
|
|
{
|
|
|
|
|
while (spacep(s))
|
|
|
|
|
s++;
|
|
|
|
|
if (*s == ':')
|
|
|
|
|
s++;
|
|
|
|
|
while (spacep(s))
|
|
|
|
|
s++;
|
|
|
|
|
c = hextobyte (s);
|
|
|
|
|
if (c == -1)
|
|
|
|
|
break;
|
|
|
|
|
fpr[i++] = c;
|
|
|
|
|
s += 2;
|
|
|
|
|
}
|
|
|
|
|
xfree (data);
|
|
|
|
|
if (i != 20 || *s)
|
|
|
|
|
{
|
|
|
|
|
tty_printf (_("Error: invalid formatted fingerprint.\n"));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rc = agent_scd_setattr (fprno==1?"CA-FPR-1":
|
|
|
|
|
fprno==2?"CA-FPR-2":
|
|
|
|
|
fprno==3?"CA-FPR-3":"x", fpr, 20 );
|
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("error setting cafpr: %s\n", gpg_strerror (rc));
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-10-02 10:20:12 +00:00
|
|
|
|
static void
|
|
|
|
|
toggle_forcesig (void)
|
|
|
|
|
{
|
|
|
|
|
struct agent_card_info_s info;
|
|
|
|
|
int rc;
|
|
|
|
|
int newstate;
|
|
|
|
|
|
|
|
|
|
memset (&info, 0, sizeof info);
|
|
|
|
|
rc = agent_scd_getattr ("CHV-STATUS", &info);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error getting current status: %s\n", gpg_strerror (rc));
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
newstate = !info.chv1_cached;
|
|
|
|
|
agent_release_card_info (&info);
|
|
|
|
|
|
|
|
|
|
rc = agent_scd_setattr ("CHV-STATUS-1", newstate? "\x01":"", 1);
|
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("error toggling signature PIN flag: %s\n", gpg_strerror (rc));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-09-23 13:32:31 +00:00
|
|
|
|
/* Helper for the key generation/edit functions. */
|
|
|
|
|
static int
|
|
|
|
|
get_info_for_key_operation (struct agent_card_info_s *info)
|
2003-10-08 15:21:20 +00:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
|
2004-09-23 13:32:31 +00:00
|
|
|
|
memset (info, 0, sizeof *info);
|
|
|
|
|
rc = agent_scd_getattr ("SERIALNO", info);
|
|
|
|
|
if (rc || !info->serialno || strncmp (info->serialno, "D27600012401", 12)
|
|
|
|
|
|| strlen (info->serialno) != 32 )
|
|
|
|
|
{
|
|
|
|
|
log_error (_("key operation not possible: %s\n"),
|
|
|
|
|
rc ? gpg_strerror (rc) : _("not an OpenPGP card"));
|
|
|
|
|
return rc? rc: -1;
|
|
|
|
|
}
|
|
|
|
|
rc = agent_scd_getattr ("KEY-FPR", info);
|
2003-10-08 15:21:20 +00:00
|
|
|
|
if (!rc)
|
2004-09-23 13:32:31 +00:00
|
|
|
|
rc = agent_scd_getattr ("CHV-STATUS", info);
|
2003-10-08 15:21:20 +00:00
|
|
|
|
if (!rc)
|
2004-09-23 13:32:31 +00:00
|
|
|
|
rc = agent_scd_getattr ("DISP-NAME", info);
|
2003-10-08 15:21:20 +00:00
|
|
|
|
if (rc)
|
2004-09-23 13:32:31 +00:00
|
|
|
|
log_error (_("error getting current key info: %s\n"), gpg_strerror (rc));
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Helper for the key generation/edit functions. */
|
|
|
|
|
static int
|
|
|
|
|
check_pin_for_key_operation (struct agent_card_info_s *info, int *forced_chv1)
|
|
|
|
|
{
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
2005-05-03 22:27:07 +00:00
|
|
|
|
agent_clear_pin_cache (info->serialno);
|
|
|
|
|
|
2004-09-23 13:32:31 +00:00
|
|
|
|
*forced_chv1 = !info->chv1_cached;
|
|
|
|
|
if (*forced_chv1)
|
|
|
|
|
{ /* Switch of the forced mode so that during key generation we
|
|
|
|
|
don't get bothered with PIN queries for each
|
|
|
|
|
self-signature. */
|
|
|
|
|
rc = agent_scd_setattr ("CHV-STATUS-1", "\x01", 1);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error clearing forced signature PIN flag: %s\n",
|
|
|
|
|
gpg_strerror (rc));
|
|
|
|
|
*forced_chv1 = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!rc)
|
2003-10-08 15:21:20 +00:00
|
|
|
|
{
|
2004-09-23 13:32:31 +00:00
|
|
|
|
/* Check the PIN now, so that we won't get asked later for each
|
|
|
|
|
binding signature. */
|
|
|
|
|
rc = agent_scd_checkpin (info->serialno);
|
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("error checking the PIN: %s\n", gpg_strerror (rc));
|
2003-10-08 15:21:20 +00:00
|
|
|
|
}
|
2004-09-23 13:32:31 +00:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Helper for the key generation/edit functions. */
|
|
|
|
|
static void
|
|
|
|
|
restore_forced_chv1 (int *forced_chv1)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
if (*forced_chv1)
|
|
|
|
|
{ /* Switch back to forced state. */
|
|
|
|
|
rc = agent_scd_setattr ("CHV-STATUS-1", "", 1);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error setting forced signature PIN flag: %s\n",
|
|
|
|
|
gpg_strerror (rc));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#if GNUPG_MAJOR_VERSION == 1
|
2004-09-23 13:32:31 +00:00
|
|
|
|
/* Helper for the key generation/edit functions. */
|
|
|
|
|
static void
|
|
|
|
|
show_card_key_info (struct agent_card_info_s *info)
|
|
|
|
|
{
|
|
|
|
|
tty_fprintf (NULL, "Signature key ....:");
|
|
|
|
|
print_sha1_fpr (NULL, info->fpr1valid? info->fpr1:NULL);
|
|
|
|
|
tty_fprintf (NULL, "Encryption key....:");
|
|
|
|
|
print_sha1_fpr (NULL, info->fpr2valid? info->fpr2:NULL);
|
|
|
|
|
tty_fprintf (NULL, "Authentication key:");
|
|
|
|
|
print_sha1_fpr (NULL, info->fpr3valid? info->fpr3:NULL);
|
|
|
|
|
tty_printf ("\n");
|
|
|
|
|
}
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#endif
|
2004-09-23 13:32:31 +00:00
|
|
|
|
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#if GNUPG_MAJOR_VERSION == 1
|
2004-09-23 13:32:31 +00:00
|
|
|
|
/* Helper for the key generation/edit functions. */
|
|
|
|
|
static int
|
|
|
|
|
replace_existing_key_p (struct agent_card_info_s *info, int keyno)
|
|
|
|
|
{
|
|
|
|
|
assert (keyno >= 0 && keyno <= 3);
|
|
|
|
|
|
|
|
|
|
if ((keyno == 1 && info->fpr1valid)
|
|
|
|
|
|| (keyno == 2 && info->fpr2valid)
|
|
|
|
|
|| (keyno == 3 && info->fpr3valid))
|
|
|
|
|
{
|
|
|
|
|
tty_printf ("\n");
|
|
|
|
|
log_info ("WARNING: such a key has already been stored on the card!\n");
|
|
|
|
|
tty_printf ("\n");
|
|
|
|
|
if ( !cpr_get_answer_is_yes( "cardedit.genkeys.replace_key",
|
2004-10-10 15:27:14 +00:00
|
|
|
|
_("Replace existing key? (y/N) ")))
|
2004-09-23 13:32:31 +00:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#endif
|
2004-09-23 13:32:31 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
generate_card_keys (const char *serialno)
|
|
|
|
|
{
|
|
|
|
|
struct agent_card_info_s info;
|
|
|
|
|
int forced_chv1;
|
2004-09-23 19:34:45 +00:00
|
|
|
|
int want_backup;
|
2004-09-23 13:32:31 +00:00
|
|
|
|
|
|
|
|
|
if (get_info_for_key_operation (&info))
|
|
|
|
|
return;
|
|
|
|
|
|
2004-10-10 15:27:14 +00:00
|
|
|
|
#if GNUPG_MAJOR_VERSION == 1
|
|
|
|
|
{
|
|
|
|
|
char *answer=cpr_get("cardedit.genkeys.backup_enc",
|
|
|
|
|
_("Make off-card backup of encryption key? (Y/n) "));
|
|
|
|
|
|
|
|
|
|
want_backup=answer_is_yes_no_default(answer,1);
|
|
|
|
|
cpr_kill_prompt();
|
2005-07-27 18:10:56 +00:00
|
|
|
|
xfree(answer);
|
2004-10-10 15:27:14 +00:00
|
|
|
|
}
|
|
|
|
|
#else
|
2004-10-21 16:56:22 +00:00
|
|
|
|
want_backup = cpr_get_answer_is_yes
|
2004-09-23 19:34:45 +00:00
|
|
|
|
( "cardedit.genkeys.backup_enc",
|
2004-10-21 16:56:22 +00:00
|
|
|
|
_("Make off-card backup of encryption key? (Y/n) "));
|
2004-10-26 07:50:47 +00:00
|
|
|
|
/*FIXME: we need answer_is_yes_no_default()*/
|
2004-10-10 15:27:14 +00:00
|
|
|
|
#endif
|
2004-09-23 19:34:45 +00:00
|
|
|
|
|
2003-10-08 15:21:20 +00:00
|
|
|
|
if ( (info.fpr1valid && !fpr_is_zero (info.fpr1))
|
|
|
|
|
|| (info.fpr2valid && !fpr_is_zero (info.fpr2))
|
|
|
|
|
|| (info.fpr3valid && !fpr_is_zero (info.fpr3)))
|
|
|
|
|
{
|
|
|
|
|
tty_printf ("\n");
|
|
|
|
|
log_info ("NOTE: keys are already stored on the card!\n");
|
|
|
|
|
tty_printf ("\n");
|
|
|
|
|
if ( !cpr_get_answer_is_yes( "cardedit.genkeys.replace_keys",
|
2004-10-10 15:27:14 +00:00
|
|
|
|
_("Replace existing keys? (y/N) ")))
|
2003-10-08 15:21:20 +00:00
|
|
|
|
{
|
|
|
|
|
agent_release_card_info (&info);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (!info.disp_name || !*info.disp_name)
|
|
|
|
|
{
|
|
|
|
|
tty_printf ("\n");
|
|
|
|
|
tty_printf (_("Please note that the factory settings of the PINs are\n"
|
2004-10-11 21:08:37 +00:00
|
|
|
|
" PIN = `%s' Admin PIN = `%s'\n"
|
2003-10-08 15:21:20 +00:00
|
|
|
|
"You should change them using the command --change-pin\n"),
|
|
|
|
|
"123456", "12345678");
|
|
|
|
|
tty_printf ("\n");
|
|
|
|
|
}
|
|
|
|
|
|
2004-09-23 13:32:31 +00:00
|
|
|
|
if (check_pin_for_key_operation (&info, &forced_chv1))
|
|
|
|
|
goto leave;
|
|
|
|
|
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#if GNUPG_MAJOR_VERSION == 1
|
2004-09-23 19:34:45 +00:00
|
|
|
|
generate_keypair (NULL, info.serialno,
|
|
|
|
|
want_backup? opt.homedir:NULL);
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#else
|
|
|
|
|
generate_keypair (NULL, info.serialno);
|
|
|
|
|
#endif
|
2004-04-28 11:55:46 +00:00
|
|
|
|
|
2004-09-23 13:32:31 +00:00
|
|
|
|
leave:
|
2003-10-08 15:21:20 +00:00
|
|
|
|
agent_release_card_info (&info);
|
2004-09-23 13:32:31 +00:00
|
|
|
|
restore_forced_chv1 (&forced_chv1);
|
2003-10-08 15:21:20 +00:00
|
|
|
|
}
|
2003-10-02 10:20:12 +00:00
|
|
|
|
|
2004-09-20 18:38:39 +00:00
|
|
|
|
|
2005-01-20 17:21:40 +00:00
|
|
|
|
/* This function is used by the key edit menu to generate an arbitrary
|
2004-09-20 18:38:39 +00:00
|
|
|
|
subkey. */
|
|
|
|
|
int
|
|
|
|
|
card_generate_subkey (KBNODE pub_keyblock, KBNODE sec_keyblock)
|
|
|
|
|
{
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#if GNUPG_MAJOR_VERSION == 1
|
2004-09-20 18:38:39 +00:00
|
|
|
|
struct agent_card_info_s info;
|
|
|
|
|
int okay = 0;
|
|
|
|
|
int forced_chv1 = 0;
|
|
|
|
|
int keyno;
|
|
|
|
|
|
2004-09-23 13:32:31 +00:00
|
|
|
|
if (get_info_for_key_operation (&info))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
show_card_key_info (&info);
|
2004-09-20 18:38:39 +00:00
|
|
|
|
|
|
|
|
|
tty_printf (_("Please select the type of key to generate:\n"));
|
|
|
|
|
|
|
|
|
|
tty_printf (_(" (1) Signature key\n"));
|
|
|
|
|
tty_printf (_(" (2) Encryption key\n"));
|
|
|
|
|
tty_printf (_(" (3) Authentication key\n"));
|
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
char *answer = cpr_get ("cardedit.genkeys.subkeytype",
|
|
|
|
|
_("Your selection? "));
|
|
|
|
|
cpr_kill_prompt();
|
|
|
|
|
if (*answer == CONTROL_D)
|
|
|
|
|
{
|
|
|
|
|
xfree (answer);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
keyno = *answer? atoi(answer): 0;
|
|
|
|
|
xfree(answer);
|
|
|
|
|
if (keyno >= 1 && keyno <= 3)
|
|
|
|
|
break; /* Okay. */
|
|
|
|
|
tty_printf(_("Invalid selection.\n"));
|
|
|
|
|
}
|
|
|
|
|
|
2004-09-23 13:32:31 +00:00
|
|
|
|
if (replace_existing_key_p (&info, keyno))
|
|
|
|
|
goto leave;
|
|
|
|
|
|
|
|
|
|
if (check_pin_for_key_operation (&info, &forced_chv1))
|
|
|
|
|
goto leave;
|
|
|
|
|
|
|
|
|
|
okay = generate_card_subkeypair (pub_keyblock, sec_keyblock,
|
|
|
|
|
keyno, info.serialno);
|
|
|
|
|
|
|
|
|
|
leave:
|
|
|
|
|
agent_release_card_info (&info);
|
|
|
|
|
restore_forced_chv1 (&forced_chv1);
|
|
|
|
|
return okay;
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#else
|
|
|
|
|
return 0;
|
|
|
|
|
#endif
|
2004-09-23 13:32:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-02-15 11:02:32 +00:00
|
|
|
|
/* Store the key at NODE into the smartcard and modify NODE to
|
|
|
|
|
carry the serialno stuff instead of the actual secret key
|
|
|
|
|
parameters. USE is the usage for that key; 0 means any
|
|
|
|
|
usage. */
|
2004-09-23 13:32:31 +00:00
|
|
|
|
int
|
|
|
|
|
card_store_subkey (KBNODE node, int use)
|
|
|
|
|
{
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#if GNUPG_MAJOR_VERSION == 1
|
2004-09-23 13:32:31 +00:00
|
|
|
|
struct agent_card_info_s info;
|
|
|
|
|
int okay = 0;
|
|
|
|
|
int rc;
|
|
|
|
|
int keyno, i;
|
|
|
|
|
PKT_secret_key *copied_sk = NULL;
|
|
|
|
|
PKT_secret_key *sk;
|
|
|
|
|
size_t n;
|
|
|
|
|
const char *s;
|
|
|
|
|
int allow_keyno[3];
|
|
|
|
|
|
|
|
|
|
assert (node->pkt->pkttype == PKT_SECRET_KEY
|
|
|
|
|
|| node->pkt->pkttype == PKT_SECRET_SUBKEY);
|
|
|
|
|
sk = node->pkt->pkt.secret_key;
|
|
|
|
|
|
|
|
|
|
if (get_info_for_key_operation (&info))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
show_card_key_info (&info);
|
|
|
|
|
|
|
|
|
|
if (!is_RSA (sk->pubkey_algo) || nbits_from_sk (sk) != 1024 )
|
2004-09-20 18:38:39 +00:00
|
|
|
|
{
|
2004-09-23 13:32:31 +00:00
|
|
|
|
tty_printf ("You may only store a 1024 bit RSA key on the card\n");
|
2004-09-20 18:38:39 +00:00
|
|
|
|
tty_printf ("\n");
|
2004-09-23 13:32:31 +00:00
|
|
|
|
goto leave;
|
2004-09-20 18:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-09-23 13:32:31 +00:00
|
|
|
|
allow_keyno[0] = (!use || (use & (PUBKEY_USAGE_SIG)));
|
|
|
|
|
allow_keyno[1] = (!use || (use & (PUBKEY_USAGE_ENC)));
|
|
|
|
|
allow_keyno[2] = (!use || (use & (PUBKEY_USAGE_SIG|PUBKEY_USAGE_AUTH)));
|
|
|
|
|
|
|
|
|
|
tty_printf (_("Please select where to store the key:\n"));
|
|
|
|
|
|
|
|
|
|
if (allow_keyno[0])
|
|
|
|
|
tty_printf (_(" (1) Signature key\n"));
|
|
|
|
|
if (allow_keyno[1])
|
|
|
|
|
tty_printf (_(" (2) Encryption key\n"));
|
|
|
|
|
if (allow_keyno[2])
|
|
|
|
|
tty_printf (_(" (3) Authentication key\n"));
|
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
char *answer = cpr_get ("cardedit.genkeys.storekeytype",
|
|
|
|
|
_("Your selection? "));
|
|
|
|
|
cpr_kill_prompt();
|
|
|
|
|
if (*answer == CONTROL_D || !*answer)
|
2004-09-20 18:38:39 +00:00
|
|
|
|
{
|
2004-09-23 13:32:31 +00:00
|
|
|
|
xfree (answer);
|
2004-09-20 18:38:39 +00:00
|
|
|
|
goto leave;
|
|
|
|
|
}
|
2004-09-23 13:32:31 +00:00
|
|
|
|
keyno = *answer? atoi(answer): 0;
|
|
|
|
|
xfree(answer);
|
|
|
|
|
if (keyno >= 1 && keyno <= 3 && allow_keyno[keyno-1])
|
|
|
|
|
break; /* Okay. */
|
|
|
|
|
tty_printf(_("Invalid selection.\n"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (replace_existing_key_p (&info, keyno))
|
|
|
|
|
goto leave;
|
|
|
|
|
|
|
|
|
|
/* Unprotect key. */
|
|
|
|
|
switch (is_secret_key_protected (sk) )
|
|
|
|
|
{
|
|
|
|
|
case 0: /* Not protected. */
|
|
|
|
|
break;
|
|
|
|
|
case -1:
|
|
|
|
|
log_error (_("unknown key protection algorithm\n"));
|
|
|
|
|
goto leave;
|
|
|
|
|
default:
|
|
|
|
|
if (sk->protect.s2k.mode == 1001)
|
|
|
|
|
{
|
|
|
|
|
log_error (_("secret parts of key are not available\n"));
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
if (sk->protect.s2k.mode == 1002)
|
|
|
|
|
{
|
|
|
|
|
log_error (_("secret key already stored on a card\n"));
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
/* We better copy the key before we unprotect it. */
|
|
|
|
|
copied_sk = sk = copy_secret_key (NULL, sk);
|
|
|
|
|
rc = check_secret_key (sk, 0);
|
|
|
|
|
if (rc)
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
2004-09-23 19:34:45 +00:00
|
|
|
|
rc = save_unprotected_key_to_card (sk, keyno);
|
2004-09-23 13:32:31 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
goto leave;
|
|
|
|
|
|
|
|
|
|
/* Get back to the maybe protected original secret key. */
|
|
|
|
|
if (copied_sk)
|
|
|
|
|
{
|
|
|
|
|
free_secret_key (copied_sk);
|
|
|
|
|
copied_sk = NULL;
|
|
|
|
|
}
|
|
|
|
|
sk = node->pkt->pkt.secret_key;
|
|
|
|
|
|
|
|
|
|
/* Get rid of the secret key parameters and store the serial numer. */
|
|
|
|
|
n = pubkey_get_nskey (sk->pubkey_algo);
|
|
|
|
|
for (i=pubkey_get_npkey (sk->pubkey_algo); i < n; i++)
|
|
|
|
|
{
|
|
|
|
|
mpi_free (sk->skey[i]);
|
|
|
|
|
sk->skey[i] = NULL;
|
|
|
|
|
}
|
|
|
|
|
i = pubkey_get_npkey (sk->pubkey_algo);
|
|
|
|
|
sk->skey[i] = mpi_set_opaque (NULL, xstrdup ("dummydata"), 10);
|
|
|
|
|
sk->is_protected = 1;
|
|
|
|
|
sk->protect.s2k.mode = 1002;
|
|
|
|
|
s = info.serialno;
|
|
|
|
|
for (sk->protect.ivlen=0; sk->protect.ivlen < 16 && *s && s[1];
|
|
|
|
|
sk->protect.ivlen++, s += 2)
|
|
|
|
|
sk->protect.iv[sk->protect.ivlen] = xtoi_2 (s);
|
|
|
|
|
|
|
|
|
|
okay = 1;
|
2004-09-20 18:38:39 +00:00
|
|
|
|
|
|
|
|
|
leave:
|
2004-09-23 13:32:31 +00:00
|
|
|
|
if (copied_sk)
|
|
|
|
|
free_secret_key (copied_sk);
|
2004-09-20 18:38:39 +00:00
|
|
|
|
agent_release_card_info (&info);
|
|
|
|
|
return okay;
|
2004-10-26 07:50:47 +00:00
|
|
|
|
#else
|
|
|
|
|
return 0;
|
|
|
|
|
#endif
|
2004-09-20 18:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-03-21 15:24:48 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Data used by the command parser. This needs to be outside of the
|
|
|
|
|
function scope to allow readline based command completion. */
|
2005-03-20 03:59:07 +00:00
|
|
|
|
enum cmdids
|
|
|
|
|
{
|
2003-09-28 13:41:58 +00:00
|
|
|
|
cmdNOP = 0,
|
2005-04-07 08:31:23 +00:00
|
|
|
|
cmdQUIT, cmdADMIN, cmdHELP, cmdLIST, cmdDEBUG, cmdVERIFY,
|
2004-09-11 15:42:19 +00:00
|
|
|
|
cmdNAME, cmdURL, cmdFETCH, cmdLOGIN, cmdLANG, cmdSEX, cmdCAFPR,
|
2004-12-09 16:57:30 +00:00
|
|
|
|
cmdFORCESIG, cmdGENERATE, cmdPASSWD, cmdPRIVATEDO,
|
2003-09-28 13:41:58 +00:00
|
|
|
|
cmdINVCMD
|
|
|
|
|
};
|
|
|
|
|
|
2005-03-20 03:59:07 +00:00
|
|
|
|
static struct
|
|
|
|
|
{
|
|
|
|
|
const char *name;
|
|
|
|
|
enum cmdids id;
|
|
|
|
|
int admin_only;
|
|
|
|
|
const char *desc;
|
|
|
|
|
} cmds[] =
|
|
|
|
|
{
|
2004-12-14 07:49:27 +00:00
|
|
|
|
{ "quit" , cmdQUIT , 0, N_("quit this menu")},
|
|
|
|
|
{ "q" , cmdQUIT , 0, NULL },
|
|
|
|
|
{ "admin" , cmdADMIN , 0, N_("show admin commands")},
|
|
|
|
|
{ "help" , cmdHELP , 0, N_("show this help")},
|
|
|
|
|
{ "?" , cmdHELP , 0, NULL },
|
|
|
|
|
{ "list" , cmdLIST , 0, N_("list all available data")},
|
|
|
|
|
{ "l" , cmdLIST , 0, NULL },
|
|
|
|
|
{ "debug" , cmdDEBUG , 0, NULL },
|
|
|
|
|
{ "name" , cmdNAME , 1, N_("change card holder's name")},
|
|
|
|
|
{ "url" , cmdURL , 1, N_("change URL to retrieve key")},
|
|
|
|
|
{ "fetch" , cmdFETCH , 0, N_("fetch the key specified in the card URL")},
|
|
|
|
|
{ "login" , cmdLOGIN , 1, N_("change the login name")},
|
|
|
|
|
{ "lang" , cmdLANG , 1, N_("change the language preferences")},
|
|
|
|
|
{ "sex" , cmdSEX , 1, N_("change card holder's sex")},
|
|
|
|
|
{ "cafpr" , cmdCAFPR , 1, N_("change a CA fingerprint")},
|
|
|
|
|
{ "forcesig", cmdFORCESIG, 1, N_("toggle the signature force PIN flag")},
|
|
|
|
|
{ "generate", cmdGENERATE, 1, N_("generate new keys")},
|
|
|
|
|
{ "passwd" , cmdPASSWD, 0, N_("menu to change or unblock the PIN")},
|
2005-04-07 08:31:23 +00:00
|
|
|
|
{ "verify" , cmdVERIFY, 0, N_("verify the PIN and list all data")},
|
2004-12-09 16:57:30 +00:00
|
|
|
|
/* Note, that we do not announce this command yet. */
|
2004-12-14 07:49:27 +00:00
|
|
|
|
{ "privatedo", cmdPRIVATEDO, 0, NULL },
|
2004-09-25 13:04:55 +00:00
|
|
|
|
{ NULL, cmdINVCMD, 0, NULL }
|
2003-09-28 13:41:58 +00:00
|
|
|
|
};
|
2005-03-20 03:59:07 +00:00
|
|
|
|
|
2005-03-21 15:24:48 +00:00
|
|
|
|
|
2005-03-20 03:59:07 +00:00
|
|
|
|
#if GNUPG_MAJOR_VERSION == 1 && defined (HAVE_LIBREADLINE)
|
|
|
|
|
|
|
|
|
|
/* These two functions are used by readline for command completion. */
|
|
|
|
|
|
2005-03-21 15:24:48 +00:00
|
|
|
|
static char *
|
|
|
|
|
command_generator(const char *text,int state)
|
2005-03-20 03:59:07 +00:00
|
|
|
|
{
|
|
|
|
|
static int list_index,len;
|
|
|
|
|
const char *name;
|
|
|
|
|
|
|
|
|
|
/* If this is a new word to complete, initialize now. This includes
|
|
|
|
|
saving the length of TEXT for efficiency, and initializing the
|
|
|
|
|
index variable to 0. */
|
|
|
|
|
if(!state)
|
|
|
|
|
{
|
|
|
|
|
list_index=0;
|
|
|
|
|
len=strlen(text);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the next partial match */
|
|
|
|
|
while((name=cmds[list_index].name))
|
|
|
|
|
{
|
|
|
|
|
/* Only complete commands that have help text */
|
|
|
|
|
if(cmds[list_index++].desc && strncmp(name,text,len)==0)
|
|
|
|
|
return strdup(name);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2005-03-21 15:24:48 +00:00
|
|
|
|
static char **
|
|
|
|
|
card_edit_completion(const char *text, int start, int end)
|
2005-03-20 03:59:07 +00:00
|
|
|
|
{
|
|
|
|
|
/* If we are at the start of a line, we try and command-complete.
|
|
|
|
|
If not, just do nothing for now. */
|
|
|
|
|
|
|
|
|
|
if(start==0)
|
|
|
|
|
return rl_completion_matches(text,command_generator);
|
|
|
|
|
|
|
|
|
|
rl_attempted_completion_over=1;
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2005-03-21 15:24:48 +00:00
|
|
|
|
#endif /* GNUPG_MAJOR_VERSION == 1 && HAVE_LIBREADLINE */
|
2005-03-20 03:59:07 +00:00
|
|
|
|
|
|
|
|
|
/* Menu to edit all user changeable values on an OpenPGP card. Only
|
|
|
|
|
Key creation is not handled here. */
|
|
|
|
|
void
|
|
|
|
|
card_edit (STRLIST commands)
|
|
|
|
|
{
|
2003-09-28 13:41:58 +00:00
|
|
|
|
enum cmdids cmd = cmdNOP;
|
|
|
|
|
int have_commands = !!commands;
|
|
|
|
|
int redisplay = 1;
|
|
|
|
|
char *answer = NULL;
|
2004-09-25 13:04:55 +00:00
|
|
|
|
int did_checkpin = 0, allow_admin=0;
|
2003-10-21 18:22:21 +00:00
|
|
|
|
char serialnobuf[50];
|
|
|
|
|
|
2003-09-28 13:41:58 +00:00
|
|
|
|
|
|
|
|
|
if (opt.command_fd != -1)
|
|
|
|
|
;
|
|
|
|
|
else if (opt.batch && !have_commands)
|
|
|
|
|
{
|
2004-10-28 03:57:30 +00:00
|
|
|
|
log_error(_("can't do this in batch mode\n"));
|
2003-09-28 13:41:58 +00:00
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
int arg_number;
|
|
|
|
|
const char *arg_string = "";
|
|
|
|
|
char *p;
|
|
|
|
|
int i;
|
2004-09-27 12:56:05 +00:00
|
|
|
|
int cmd_admin_only;
|
2003-10-21 18:22:21 +00:00
|
|
|
|
|
2003-09-28 13:41:58 +00:00
|
|
|
|
tty_printf("\n");
|
|
|
|
|
if (redisplay )
|
|
|
|
|
{
|
|
|
|
|
if (opt.with_colons)
|
|
|
|
|
{
|
2003-10-21 18:22:21 +00:00
|
|
|
|
card_status (stdout, serialnobuf, DIM (serialnobuf));
|
2003-09-28 13:41:58 +00:00
|
|
|
|
fflush (stdout);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-10-21 18:22:21 +00:00
|
|
|
|
card_status (NULL, serialnobuf, DIM (serialnobuf));
|
2003-09-28 13:41:58 +00:00
|
|
|
|
tty_printf("\n");
|
|
|
|
|
}
|
|
|
|
|
redisplay = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
xfree (answer);
|
|
|
|
|
if (have_commands)
|
|
|
|
|
{
|
|
|
|
|
if (commands)
|
|
|
|
|
{
|
|
|
|
|
answer = xstrdup (commands->d);
|
|
|
|
|
commands = commands->next;
|
|
|
|
|
}
|
|
|
|
|
else if (opt.batch)
|
|
|
|
|
{
|
|
|
|
|
answer = xstrdup ("quit");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
have_commands = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!have_commands)
|
|
|
|
|
{
|
2005-03-20 03:59:07 +00:00
|
|
|
|
#if GNUPG_MAJOR_VERSION == 1
|
2005-03-21 15:24:48 +00:00
|
|
|
|
tty_enable_completion (card_edit_completion);
|
2005-03-20 03:59:07 +00:00
|
|
|
|
#endif
|
2003-09-28 13:41:58 +00:00
|
|
|
|
answer = cpr_get_no_help("cardedit.prompt", _("Command> "));
|
|
|
|
|
cpr_kill_prompt();
|
2005-03-20 03:59:07 +00:00
|
|
|
|
#if GNUPG_MAJOR_VERSION == 1
|
2005-03-21 15:24:48 +00:00
|
|
|
|
tty_disable_completion ();
|
2005-03-20 03:59:07 +00:00
|
|
|
|
#endif
|
2003-09-28 13:41:58 +00:00
|
|
|
|
}
|
|
|
|
|
trim_spaces(answer);
|
|
|
|
|
}
|
2004-09-27 12:56:05 +00:00
|
|
|
|
while ( *answer == '#' );
|
2003-09-28 13:41:58 +00:00
|
|
|
|
|
|
|
|
|
arg_number = 0; /* Yes, here is the init which egcc complains about */
|
2004-09-27 12:56:05 +00:00
|
|
|
|
cmd_admin_only = 0;
|
2003-09-28 13:41:58 +00:00
|
|
|
|
if (!*answer)
|
|
|
|
|
cmd = cmdLIST; /* Default to the list command */
|
|
|
|
|
else if (*answer == CONTROL_D)
|
|
|
|
|
cmd = cmdQUIT;
|
2004-09-27 12:56:05 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if ((p=strchr (answer,' ')))
|
|
|
|
|
{
|
|
|
|
|
*p++ = 0;
|
|
|
|
|
trim_spaces (answer);
|
|
|
|
|
trim_spaces (p);
|
|
|
|
|
arg_number = atoi(p);
|
|
|
|
|
arg_string = p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i=0; cmds[i].name; i++ )
|
|
|
|
|
if (!ascii_strcasecmp (answer, cmds[i].name ))
|
|
|
|
|
break;
|
2004-09-25 13:04:55 +00:00
|
|
|
|
|
2004-09-27 12:56:05 +00:00
|
|
|
|
cmd = cmds[i].id;
|
|
|
|
|
cmd_admin_only = cmds[i].admin_only;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!allow_admin && cmd_admin_only)
|
|
|
|
|
{
|
|
|
|
|
tty_printf ("\n");
|
|
|
|
|
tty_printf (_("Admin-only command\n"));
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2003-09-28 13:41:58 +00:00
|
|
|
|
|
|
|
|
|
switch (cmd)
|
|
|
|
|
{
|
|
|
|
|
case cmdHELP:
|
|
|
|
|
for (i=0; cmds[i].name; i++ )
|
2004-09-25 13:04:55 +00:00
|
|
|
|
if(cmds[i].desc
|
|
|
|
|
&& (!cmds[i].admin_only || (cmds[i].admin_only && allow_admin)))
|
2003-09-28 13:41:58 +00:00
|
|
|
|
tty_printf("%-10s %s\n", cmds[i].name, _(cmds[i].desc) );
|
|
|
|
|
break;
|
|
|
|
|
|
2004-09-25 13:04:55 +00:00
|
|
|
|
case cmdADMIN:
|
2005-04-07 08:31:23 +00:00
|
|
|
|
if ( !strcmp (arg_string, "on") )
|
|
|
|
|
allow_admin = 1;
|
|
|
|
|
else if ( !strcmp (arg_string, "off") )
|
|
|
|
|
allow_admin = 0;
|
|
|
|
|
else if ( !strcmp (arg_string, "verify") )
|
|
|
|
|
{
|
|
|
|
|
/* Force verification of the Admin Command. However,
|
|
|
|
|
this is only done if the retry counter is at initial
|
|
|
|
|
state. */
|
|
|
|
|
char *tmp = xmalloc (strlen (serialnobuf) + 6 + 1);
|
|
|
|
|
strcpy (stpcpy (tmp, serialnobuf), "[CHV3]");
|
|
|
|
|
allow_admin = !agent_scd_checkpin (tmp);
|
|
|
|
|
xfree (tmp);
|
|
|
|
|
}
|
|
|
|
|
else /* Toggle. */
|
|
|
|
|
allow_admin=!allow_admin;
|
2004-10-28 03:14:55 +00:00
|
|
|
|
if(allow_admin)
|
|
|
|
|
tty_printf(_("Admin commands are allowed\n"));
|
|
|
|
|
else
|
|
|
|
|
tty_printf(_("Admin commands are not allowed\n"));
|
2004-09-25 13:04:55 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2005-04-07 08:31:23 +00:00
|
|
|
|
case cmdVERIFY:
|
|
|
|
|
agent_scd_checkpin (serialnobuf);
|
|
|
|
|
redisplay = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
2003-09-28 13:41:58 +00:00
|
|
|
|
case cmdLIST:
|
|
|
|
|
redisplay = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case cmdNAME:
|
2004-09-25 13:04:55 +00:00
|
|
|
|
change_name ();
|
2003-09-28 13:41:58 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case cmdURL:
|
2004-09-25 13:04:55 +00:00
|
|
|
|
change_url ();
|
2003-09-28 13:41:58 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2004-09-11 15:42:19 +00:00
|
|
|
|
case cmdFETCH:
|
|
|
|
|
fetch_url();
|
|
|
|
|
break;
|
|
|
|
|
|
2003-09-28 13:41:58 +00:00
|
|
|
|
case cmdLOGIN:
|
2004-09-25 13:04:55 +00:00
|
|
|
|
change_login (arg_string);
|
2003-09-28 13:41:58 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case cmdLANG:
|
2004-09-25 13:04:55 +00:00
|
|
|
|
change_lang ();
|
2003-09-28 13:41:58 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case cmdSEX:
|
2004-09-25 13:04:55 +00:00
|
|
|
|
change_sex ();
|
2003-09-28 13:41:58 +00:00
|
|
|
|
break;
|
|
|
|
|
|
* README: Doc --disable-card-support and --without-readline.
* configure.ac: Check for readline. Make enable-card-support the
default. New option --without-readline. Allow the use of either
the development or the stable libusb.
* cardglue.h: Add members for CA fingerprints.
* cardglue.c (agent_release_card_info): Invalid them.
(learn_status_cb): Store them.
* app-common.h, app-openpgp.c, iso7816.c, iso7816.h
* apdu.c, apdu.h, ccid-driver.c, ccid-driver.h
* card-util.c: Updated from current gnupg-1.9.
* ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New.
* ccid-driver.c (ccid_open_reader): Support the stable 0.1 version
of libusb.
(ccid_get_atr): Handle short messages.
* apdu.c (my_rapdu_get_status): Implemented.
* apdu.c: Include <signal.h>.
* apdu.c (reader_table_s): Add function pointers for the backends.
(apdu_close_reader, apdu_get_status, apdu_activate)
(send_apdu): Make use of them.
(new_reader_slot): Intialize them to NULL.
(dump_ccid_reader_status, ct_dump_reader_status): New.
(dump_pcsc_reader_status): New.
(open_ct_reader, open_pcsc_reader, open_ccid_reader)
(open_osc_reader, open_rapdu_reader): Intialize function pointers.
(ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu)
(error_string): Removed. Replaced by apdu_strerror.
(get_ccid_error_string): Removed.
(ct_activate_card): Remove the unused loop.
(reset_ct_reader): Implemented.
(ct_send_apdu): Activate the card if not yet done.
(pcsc_send_apdu): Ditto.
* ccid-driver.h: Add error codes.
* ccid-driver.c: Implement more or less proper error codes all
over the place.
* apdu.c (apdu_send_direct): New.
(get_ccid_error_string): Add some error code mappings.
(send_apdu): Pass error codes along for drivers already supporting
them.
(host_sw_string): New.
(get_ccid_error_string): Use above.
(send_apdu_ccid): Reset the reader if it has not yet been done.
(open_ccid_reader): Don't care if the ATR can't be read.
(apdu_activate_card): New.
(apdu_strerror): New.
(dump_reader_status): Only enable it with opt.VERBOSE.
* iso7816.c (map_sw): Add mappings for the new error codes.
* apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader)
(reset_ccid_reader, open_osc_reader): Call dump_reader_status only
in verbose mode.
* app-openpgp.c (do_getattr): Fix for sending CA-FPR.
* app-openpgp.c (app_openpgp_readkey): Fixed check for valid
exponent.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
* card-util.c (change_login): Kludge to allow reading data from a
file.
(card_edit): Pass ARG_STRING to change_login.
(card_status): Print CA fingerprints.
(change_cafpr): New.
(card_edit): New command CAFPR.
* errors.h (G10ERR_NO_CARD, G10ERR_CANCELED): New error codes.
* errors.c (g10_errstr): New error codes G10ERR_NO_CARD,
G10ERR_CANCELED.
2004-09-09 18:18:36 +00:00
|
|
|
|
case cmdCAFPR:
|
|
|
|
|
if ( arg_number < 1 || arg_number > 3 )
|
|
|
|
|
tty_printf ("usage: cafpr N\n"
|
|
|
|
|
" 1 <= N <= 3\n");
|
|
|
|
|
else
|
|
|
|
|
change_cafpr (arg_number);
|
|
|
|
|
break;
|
|
|
|
|
|
2004-12-09 16:57:30 +00:00
|
|
|
|
case cmdPRIVATEDO:
|
|
|
|
|
if ( arg_number < 1 || arg_number > 4 )
|
|
|
|
|
tty_printf ("usage: privatedo N\n"
|
|
|
|
|
" 1 <= N <= 4\n");
|
|
|
|
|
else
|
|
|
|
|
change_private_do (arg_string, arg_number);
|
|
|
|
|
break;
|
|
|
|
|
|
2003-10-02 10:20:12 +00:00
|
|
|
|
case cmdFORCESIG:
|
|
|
|
|
toggle_forcesig ();
|
|
|
|
|
break;
|
|
|
|
|
|
2003-10-08 15:21:20 +00:00
|
|
|
|
case cmdGENERATE:
|
2004-04-28 11:55:46 +00:00
|
|
|
|
generate_card_keys (serialnobuf);
|
2003-10-08 15:21:20 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2003-10-21 18:22:21 +00:00
|
|
|
|
case cmdPASSWD:
|
2004-09-25 13:04:55 +00:00
|
|
|
|
change_pin (0, allow_admin);
|
2003-10-21 18:22:21 +00:00
|
|
|
|
did_checkpin = 0; /* Need to reset it of course. */
|
|
|
|
|
break;
|
|
|
|
|
|
2003-09-28 13:41:58 +00:00
|
|
|
|
case cmdQUIT:
|
|
|
|
|
goto leave;
|
|
|
|
|
|
|
|
|
|
case cmdNOP:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case cmdINVCMD:
|
|
|
|
|
default:
|
|
|
|
|
tty_printf ("\n");
|
|
|
|
|
tty_printf (_("Invalid command (try \"help\")\n"));
|
|
|
|
|
break;
|
|
|
|
|
} /* End command switch. */
|
|
|
|
|
} /* End of main menu loop. */
|
|
|
|
|
|
|
|
|
|
leave:
|
|
|
|
|
xfree (answer);
|
|
|
|
|
}
|
|
|
|
|
|