mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01: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.
110 lines
4.1 KiB
C
110 lines
4.1 KiB
C
/* apdu.h - ISO 7816 APDU functions and low level I/O
|
|
* Copyright (C) 2003 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
|
|
*/
|
|
|
|
#ifndef APDU_H
|
|
#define APDU_H
|
|
|
|
/* ISO 7816 values for the statusword are defined here because they
|
|
should not be visible to the users of the actual ISO command
|
|
API. */
|
|
enum {
|
|
SW_MORE_DATA = 0x6100, /* Note: that the low byte must be
|
|
masked of.*/
|
|
SW_EOF_REACHED = 0x6282,
|
|
SW_EEPROM_FAILURE = 0x6581,
|
|
SW_WRONG_LENGTH = 0x6700,
|
|
SW_CHV_WRONG = 0x6982,
|
|
SW_CHV_BLOCKED = 0x6983,
|
|
SW_USE_CONDITIONS = 0x6985,
|
|
SW_BAD_PARAMETER = 0x6a80, /* (in the data field) */
|
|
SW_NOT_SUPPORTED = 0x6a81,
|
|
SW_FILE_NOT_FOUND = 0x6a82,
|
|
SW_RECORD_NOT_FOUND = 0x6a83,
|
|
SW_REF_NOT_FOUND = 0x6a88,
|
|
SW_BAD_P0_P1 = 0x6b00,
|
|
SW_INS_NOT_SUP = 0x6d00,
|
|
SW_CLA_NOT_SUP = 0x6e00,
|
|
SW_SUCCESS = 0x9000,
|
|
|
|
/* The follwoing statuswords are no real ones but used to map host
|
|
OS errors into status words. A status word is 16 bit so that
|
|
those values can't be issued by a card. */
|
|
SW_HOST_OUT_OF_CORE = 0x10001, /* No way yet to differentiate
|
|
between errnos on a failed malloc. */
|
|
SW_HOST_INV_VALUE = 0x10002,
|
|
SW_HOST_INCOMPLETE_CARD_RESPONSE = 0x10003,
|
|
SW_HOST_NO_DRIVER = 0x10004,
|
|
SW_HOST_NOT_SUPPORTED = 0x10005,
|
|
SW_HOST_LOCKING_FAILED= 0x10006,
|
|
SW_HOST_BUSY = 0x10007,
|
|
SW_HOST_NO_CARD = 0x10008,
|
|
SW_HOST_CARD_INACTIVE = 0x10009,
|
|
SW_HOST_CARD_IO_ERROR = 0x1000a,
|
|
SW_HOST_GENERAL_ERROR = 0x1000b,
|
|
SW_HOST_NO_READER = 0x1000c,
|
|
SW_HOST_ABORTED = 0x1000d
|
|
};
|
|
|
|
|
|
|
|
/* Note , that apdu_open_reader returns no status word but -1 on error. */
|
|
int apdu_open_reader (const char *portstr);
|
|
int apdu_open_remote_reader (const char *portstr,
|
|
const unsigned char *cookie, size_t length,
|
|
int (*readfnc) (void *opaque,
|
|
void *buffer, size_t size),
|
|
void *readfnc_value,
|
|
int (*writefnc) (void *opaque,
|
|
const void *buffer, size_t size),
|
|
void *writefnc_value,
|
|
void (*closefnc) (void *opaque),
|
|
void *closefnc_value);
|
|
int apdu_close_reader (int slot);
|
|
int apdu_enum_reader (int slot, int *used);
|
|
unsigned char *apdu_get_atr (int slot, size_t *atrlen);
|
|
|
|
const char *apdu_strerror (int rc);
|
|
|
|
|
|
/* These apdu functions do return status words. */
|
|
|
|
int apdu_activate (int slot);
|
|
int apdu_reset (int slot);
|
|
int apdu_get_status (int slot, int hang,
|
|
unsigned int *status, unsigned int *changed);
|
|
int apdu_send_simple (int slot, int class, int ins, int p0, int p1,
|
|
int lc, const char *data);
|
|
int apdu_send (int slot, int class, int ins, int p0, int p1,
|
|
int lc, const char *data,
|
|
unsigned char **retbuf, size_t *retbuflen);
|
|
int apdu_send_le (int slot, int class, int ins, int p0, int p1,
|
|
int lc, const char *data, int le,
|
|
unsigned char **retbuf, size_t *retbuflen);
|
|
int apdu_send_direct (int slot,
|
|
const unsigned char *apdudata, size_t apdudatalen,
|
|
int handle_more,
|
|
unsigned char **retbuf, size_t *retbuflen);
|
|
|
|
|
|
#endif /*APDU_H*/
|
|
|
|
|
|
|