mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-27 02:02:45 +02:00
06853bbc4d
* 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.
115 lines
4.1 KiB
C
115 lines
4.1 KiB
C
/* errors.c - error strings
|
|
* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
|
|
*
|
|
* 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
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
|
|
#include "errors.h"
|
|
#include "i18n.h"
|
|
|
|
#ifndef HAVE_STRERROR
|
|
char *
|
|
strerror( int n )
|
|
{
|
|
extern char *sys_errlist[];
|
|
extern int sys_nerr;
|
|
static char buf[15];
|
|
|
|
if( n >= 0 && n < sys_nerr )
|
|
return sys_errlist[n];
|
|
strcpy( buf, "Unknown error" );
|
|
return buf;
|
|
}
|
|
#endif /* !HAVE_STRERROR */
|
|
|
|
const char *
|
|
g10_errstr( int err )
|
|
{
|
|
static char buf[50];
|
|
const char *p;
|
|
|
|
#define X(n,s) case G10ERR_##n : p = s; break;
|
|
switch( err ) {
|
|
case -1: p = "eof"; break;
|
|
case 0: p = "okay"; break;
|
|
X(GENERAL, N_("general error"))
|
|
X(UNKNOWN_PACKET, N_("unknown packet type"))
|
|
X(UNKNOWN_VERSION,N_("unknown version"))
|
|
X(PUBKEY_ALGO ,N_("unknown pubkey algorithm"))
|
|
X(DIGEST_ALGO ,N_("unknown digest algorithm"))
|
|
X(BAD_PUBKEY ,N_("bad public key"))
|
|
X(BAD_SECKEY ,N_("bad secret key"))
|
|
X(BAD_SIGN ,N_("bad signature"))
|
|
X(CHECKSUM , N_("checksum error"))
|
|
X(BAD_PASS , N_("bad passphrase"))
|
|
X(NO_PUBKEY ,N_("public key not found"))
|
|
X(CIPHER_ALGO ,N_("unknown cipher algorithm"))
|
|
X(KEYRING_OPEN ,N_("can't open the keyring"))
|
|
X(INVALID_PACKET ,N_("invalid packet"))
|
|
X(INVALID_ARMOR ,N_("invalid armor"))
|
|
X(NO_USER_ID ,N_("no such user id"))
|
|
X(NO_SECKEY ,N_("secret key not available"))
|
|
X(WRONG_SECKEY ,N_("wrong secret key used"))
|
|
X(UNSUPPORTED ,N_("not supported"))
|
|
X(BAD_KEY ,N_("bad key"))
|
|
X(READ_FILE ,N_("file read error"))
|
|
X(WRITE_FILE ,N_("file write error"))
|
|
X(COMPR_ALGO ,N_("unknown compress algorithm"))
|
|
X(OPEN_FILE ,N_("file open error"))
|
|
X(CREATE_FILE ,N_("file create error"))
|
|
X(PASSPHRASE ,N_("invalid passphrase"))
|
|
X(NI_PUBKEY ,N_("unimplemented pubkey algorithm"))
|
|
X(NI_CIPHER ,N_("unimplemented cipher algorithm"))
|
|
X(SIG_CLASS ,N_("unknown signature class"))
|
|
X(TRUSTDB ,N_("trust database error"))
|
|
X(BAD_MPI ,N_("bad MPI"))
|
|
X(RESOURCE_LIMIT ,N_("resource limit"))
|
|
X(INV_KEYRING ,N_("invalid keyring"))
|
|
X(BAD_CERT ,N_("bad certificate"))
|
|
X(INV_USER_ID ,N_("malformed user id"))
|
|
X(CLOSE_FILE ,N_("file close error"))
|
|
X(RENAME_FILE ,N_("file rename error"))
|
|
X(DELETE_FILE ,N_("file delete error"))
|
|
X(UNEXPECTED ,N_("unexpected data"))
|
|
X(TIME_CONFLICT ,N_("timestamp conflict"))
|
|
X(WR_PUBKEY_ALGO ,N_("unusable pubkey algorithm"))
|
|
X(FILE_EXISTS ,N_("file exists"))
|
|
X(WEAK_KEY ,N_("weak key"))
|
|
X(INV_ARG ,N_("invalid argument"))
|
|
X(BAD_URI ,N_("bad URI"))
|
|
X(INVALID_URI ,N_("unsupported URI"))
|
|
X(NETWORK ,N_("network error"))
|
|
X(SELFTEST_FAILED,"selftest failed")
|
|
X(NOT_ENCRYPTED ,N_("not encrypted"))
|
|
X(NOT_PROCESSED ,N_("not processed"))
|
|
/* the key cannot be used for a specific usage */
|
|
X(UNU_PUBKEY ,N_("unusable public key"))
|
|
X(UNU_SECKEY ,N_("unusable secret key"))
|
|
X(KEYSERVER ,N_("keyserver error"))
|
|
X(CANCELED ,N_("canceled"))
|
|
X(NO_CARD ,N_("no card"))
|
|
default: p = buf; sprintf(buf, "g10err=%d", err); break;
|
|
}
|
|
#undef X
|
|
return _(p);
|
|
}
|