mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +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.
190 lines
6.5 KiB
C
190 lines
6.5 KiB
C
/* cardglue.h - Divert operations to the agent
|
|
* Copyright (C) 2003, 2004 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 GNUPG_G10_CARDGLUE_H
|
|
#define GNUPG_G10_CARDGLUE_H
|
|
|
|
#ifdef ENABLE_CARD_SUPPORT
|
|
/*
|
|
Note, that most card related code has been taken from 1.9.x branch
|
|
and is maintained over there if at all possible. Thus, if you make
|
|
changes here, please check that a similar change has been commited
|
|
to the 1.9.x branch.
|
|
*/
|
|
|
|
|
|
struct agent_card_info_s {
|
|
int error; /* private. */
|
|
char *serialno; /* malloced hex string. */
|
|
char *disp_name; /* malloced. */
|
|
char *disp_lang; /* malloced. */
|
|
int disp_sex; /* 0 = unspecified, 1 = male, 2 = female */
|
|
char *pubkey_url; /* malloced. */
|
|
char *login_data; /* malloced. */
|
|
char cafpr1valid;
|
|
char cafpr2valid;
|
|
char cafpr3valid;
|
|
char cafpr1[20];
|
|
char cafpr2[20];
|
|
char cafpr3[20];
|
|
char fpr1valid;
|
|
char fpr2valid;
|
|
char fpr3valid;
|
|
char fpr1[20];
|
|
char fpr2[20];
|
|
char fpr3[20];
|
|
unsigned long sig_counter;
|
|
int chv1_cached; /* True if a PIN is not required for each
|
|
signing. Note that the gpg-agent might cache
|
|
it anyway. */
|
|
int chvmaxlen[3]; /* Maximum allowed length of a CHV. */
|
|
int chvretry[3]; /* Allowed retries for the CHV; 0 = blocked. */
|
|
};
|
|
|
|
struct agent_card_genkey_s {
|
|
char fprvalid;
|
|
char fpr[20];
|
|
u32 created_at;
|
|
MPI n;
|
|
MPI e;
|
|
};
|
|
|
|
|
|
struct app_ctx_s;
|
|
struct ctrl_ctx_s;
|
|
|
|
typedef struct app_ctx_s *APP; /* deprecated. */
|
|
typedef struct app_ctx_s *app_t;
|
|
typedef struct ctrl_ctx_s *CTRL; /* deprecated. */
|
|
typedef struct ctrl_ctx_s *ctrl_t;
|
|
|
|
|
|
#define GPG_ERR_GENERAL G10ERR_GENERAL
|
|
#define GPG_ERR_BAD_PIN G10ERR_BAD_PASS
|
|
#define GPG_ERR_CARD G10ERR_GENERAL
|
|
#define GPG_ERR_EEXIST G10ERR_FILE_EXISTS
|
|
#define GPG_ERR_ENOMEM G10ERR_RESOURCE_LIMIT
|
|
#define GPG_ERR_GENERAL G10ERR_GENERAL
|
|
#define GPG_ERR_HARDWARE G10ERR_GENERAL
|
|
#define GPG_ERR_INV_CARD G10ERR_GENERAL
|
|
#define GPG_ERR_INV_ID G10ERR_GENERAL
|
|
#define GPG_ERR_INV_NAME G10ERR_GENERAL
|
|
#define GPG_ERR_INV_VALUE G10ERR_INV_ARG
|
|
#define GPG_ERR_NOT_SUPPORTED G10ERR_UNSUPPORTED
|
|
#define GPG_ERR_NO_OBJ G10ERR_GENERAL
|
|
#define GPG_ERR_PIN_BLOCKED G10ERR_PASSPHRASE
|
|
#define GPG_ERR_UNSUPPORTED_ALGORITHM G10ERR_PUBKEY_ALGO
|
|
#define GPG_ERR_USE_CONDITIONS G10ERR_GENERAL
|
|
#define GPG_ERR_WRONG_CARD G10ERR_GENERAL
|
|
#define GPG_ERR_WRONG_SECKEY G10ERR_WRONG_SECKEY
|
|
#define GPG_ERR_PIN_NOT_SYNCED G10ERR_GENERAL
|
|
#define GPG_ERR_NOT_FOUND G10ERR_GENERAL
|
|
#define GPG_ERR_BUG G10ERR_GENERAL
|
|
#define GPG_ERR_NOT_IMPLEMENTED G10ERR_GENERAL
|
|
#define GPG_ERR_BAD_BER G10ERR_GENERAL
|
|
#define GPG_ERR_EOF (-1)
|
|
#define GPG_ERR_CARD_NOT_PRESENT G10ERR_NO_CARD
|
|
#define GPG_ERR_CARD_RESET G10ERR_GENERAL
|
|
|
|
#define GPG_ERR_EBUSY G10ERR_GENERAL
|
|
#define GPG_ERR_ENOENT G10ERR_OPEN_FILE
|
|
#define GPG_ERR_EACCES G10ERR_UNSUPPORTED
|
|
#define GPG_ERR_EIO G10ERR_GENERAL
|
|
#define GPG_ERR_ENODEV G10ERR_GENERAL
|
|
#define GPG_ERR_CANCELED G10ERR_CANCELED
|
|
|
|
typedef int gpg_error_t;
|
|
typedef int gpg_err_code_t;
|
|
|
|
#define gpg_error(n) (n)
|
|
#define gpg_err_code(n) (n)
|
|
#define gpg_strerror(n) g10_errstr ((n))
|
|
#define gpg_error_from_errno(n) (G10ERR_GENERAL) /*FIXME*/
|
|
#define gpg_err_code_from_errno(n) (G10ERR_GENERAL)
|
|
|
|
/* We are not using it in a library, so we even let xtrymalloc
|
|
abort. Because we won't never return from these malloc functions,
|
|
we also don't need the out_of_core function, we simply define it to
|
|
return -1 */
|
|
#define xtrymalloc(n) xmalloc((n))
|
|
#define xtrycalloc(n,m) xcalloc((n),(m))
|
|
#define xtryrealloc(n,m) xrealloc((n),(m))
|
|
#define out_of_core() (-1)
|
|
|
|
#define gnupg_get_time() make_timestamp ()
|
|
|
|
|
|
void card_set_reader_port (const char *portstr);
|
|
|
|
char *serialno_and_fpr_from_sk (const unsigned char *sn, size_t snlen,
|
|
PKT_secret_key *sk);
|
|
void send_status_info (ctrl_t ctrl, const char *keyword, ...);
|
|
void gcry_md_hash_buffer (int algo, void *digest,
|
|
const void *buffer, size_t length);
|
|
void log_printf (const char *fmt, ...);
|
|
void log_printhex (const char *text, const void *buffer, size_t length);
|
|
|
|
|
|
#define GCRY_MD_SHA1 DIGEST_ALGO_SHA1
|
|
#define GCRY_MD_RMD160 DIGEST_ALGO_RMD160
|
|
|
|
void card_close (void);
|
|
|
|
|
|
/* Release the card info structure. */
|
|
void agent_release_card_info (struct agent_card_info_s *info);
|
|
|
|
/* Return card info. */
|
|
int agent_learn (struct agent_card_info_s *info);
|
|
|
|
/* Check whether the secret key for the key identified by HEXKEYGRIP
|
|
is available. Return 0 for yes or an error code. */
|
|
int agent_havekey (const char *hexkeygrip);
|
|
|
|
/* Return card info. */
|
|
int agent_scd_getattr (const char *name, struct agent_card_info_s *info);
|
|
|
|
/* Send a SETATTR command to the SCdaemon. */
|
|
int agent_scd_setattr (const char *name,
|
|
const unsigned char *value, size_t valuelen);
|
|
|
|
/* Send a GENKEY command to the SCdaemon. */
|
|
int agent_scd_genkey (struct agent_card_genkey_s *info, int keyno, int force);
|
|
|
|
/* Send a PKSIGN command to the SCdaemon. */
|
|
int agent_scd_pksign (const char *keyid, int hashalgo,
|
|
const unsigned char *indata, size_t indatalen,
|
|
unsigned char **r_buf, size_t *r_buflen);
|
|
|
|
/* Send a PKDECRYPT command to the SCdaemon. */
|
|
int agent_scd_pkdecrypt (const char *serialno,
|
|
const unsigned char *indata, size_t indatalen,
|
|
unsigned char **r_buf, size_t *r_buflen);
|
|
|
|
/* Change the PIN of an OpenPGP card or reset the retry counter. */
|
|
int agent_scd_change_pin (int chvno);
|
|
|
|
/* Send a CHECKPIN command. */
|
|
int agent_scd_checkpin (const char *serialnobuf);
|
|
|
|
|
|
#endif /*ENABLE_CARD_SUPPORT*/
|
|
#endif /*GNUPG_G10_CARDGLUE_H*/
|
|
|