No OneTemporary
Actions

Size

301 KB

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/scd/app-common.h b/scd/app-common.h
	index d8b301c9a..e9d167ecc 100644
	--- a/scd/app-common.h
	+++ b/scd/app-common.h
	@@ -1,218 +1,218 @@
	/* app-common.h - Common declarations for all card applications
	* Copyright (C) 2003, 2005, 2008 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 3 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, see <https://www.gnu.org/licenses/>.
	*
	* $Id$
	*/

	#ifndef GNUPG_SCD_APP_COMMON_H
	#define GNUPG_SCD_APP_COMMON_H

	#include <npth.h>
	#include <ksba.h>

	/* Flags used with app_change_pin. */
	#define APP_CHANGE_FLAG_RESET 1 /* PIN Reset mode. */
	#define APP_CHANGE_FLAG_NULLPIN 2 /* NULL PIN mode. */
	#define APP_CHANGE_FLAG_CLEAR 4 /* Clear the given PIN. */

	/* Flags used with app_genkey. */
	#define APP_GENKEY_FLAG_FORCE 1 /* Force overwriting existing key. */

	/* Bit flags set by the decipher function into R_INFO. */
	#define APP_DECIPHER_INFO_NOPAD 1 /* Padding has been removed. */


	struct app_local_s; /* Defined by all app-.c. /

	struct app_ctx_s {
	struct app_ctx_s *next;

	npth_mutex_t lock;

	/* Number of connections currently using this application context.
	If this is not 0 the application has been initialized and the
	function pointers may be used. Note that for unsupported
	operations the particular function pointer is set to NULL */
	unsigned int ref_count;

	/* Used reader slot. */
	int slot;

	unsigned char serialno; / Serialnumber in raw form, allocated. */
	size_t serialnolen; /* Length in octets of serialnumber. */
	const char cardtype; / NULL or string with the token's type. */
	const char *apptype;
	unsigned int card_version;
	unsigned int card_status;
	unsigned int reset_requested:1;
	unsigned int periodical_check_needed:1;
	unsigned int did_chv1:1;
	unsigned int force_chv1:1; /* True if the card does not cache CHV1. */
	unsigned int did_chv2:1;
	unsigned int did_chv3:1;
	struct app_local_s app_local; / Local to the application. */
	struct {
	void (*deinit) (app_t app);
	gpg_error_t (*learn_status) (app_t app, ctrl_t ctrl, unsigned int flags);
	gpg_error_t (readcert) (app_t app, const char certid,
	unsigned char *cert, size_t certlen);
	gpg_error_t (readkey) (app_t app, int advanced, const char certid,
	unsigned char *pk, size_t pklen);
	gpg_error_t (getattr) (app_t app, ctrl_t ctrl, const char name);
	gpg_error_t (setattr) (app_t app, const char name,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const unsigned char *value, size_t valuelen);
	gpg_error_t (*sign) (app_t app,
	const char *keyidstr, int hashalgo,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen );
	gpg_error_t (auth) (app_t app, const char keyidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen);
	gpg_error_t (decipher) (app_t app, const char keyidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen,
	unsigned int *r_info);
	gpg_error_t (*writecert) (app_t app, ctrl_t ctrl,
	const char *certid,
	gpg_error_t (pincb)(void,const char ,char *),
	void *pincb_arg,
	const unsigned char *data, size_t datalen);
	gpg_error_t (*writekey) (app_t app, ctrl_t ctrl,
	const char *keyid, unsigned int flags,
	gpg_error_t (pincb)(void,const char ,char *),
	void *pincb_arg,
	const unsigned char *pk, size_t pklen);
	gpg_error_t (*genkey) (app_t app, ctrl_t ctrl,
	- const char *keynostr, unsigned int flags,
	- time_t createtime,
	+ const char keyref, const char keytype,
	+ unsigned int flags, time_t createtime,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg);
	gpg_error_t (*change_pin) (app_t app, ctrl_t ctrl,
	const char *chvnostr, unsigned int flags,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg);
	gpg_error_t (check_pin) (app_t app, const char keyidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg);
	} fnc;
	};

	/-- app-help.c --/
	unsigned int app_help_count_bits (const unsigned char *a, size_t len);
	gpg_error_t app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip);
	size_t app_help_read_length_of_cert (int slot, int fid, size_t *r_certoff);


	/-- app.c --/
	void app_send_card_list (ctrl_t ctrl);
	char *app_get_serialno (app_t app);

	void app_dump_state (void);
	void application_notify_card_reset (int slot);
	gpg_error_t check_application_conflict (const char *name, app_t app);
	gpg_error_t app_reset (app_t app, ctrl_t ctrl, int send_reset);
	gpg_error_t select_application (ctrl_t ctrl, const char name, app_t r_app,
	int scan, const unsigned char *serialno_bin,
	size_t serialno_bin_len);
	char *get_supported_applications (void);
	void release_application (app_t app, int locked_already);
	gpg_error_t app_munge_serialno (app_t app);
	gpg_error_t app_write_learn_status (app_t app, ctrl_t ctrl,
	unsigned int flags);
	gpg_error_t app_readcert (app_t app, ctrl_t ctrl, const char *certid,
	unsigned char *cert, size_t certlen);
	gpg_error_t app_readkey (app_t app, ctrl_t ctrl, int advanced,
	const char keyid, unsigned char pk, size_t pklen);
	gpg_error_t app_getattr (app_t app, ctrl_t ctrl, const char *name);
	gpg_error_t app_setattr (app_t app, ctrl_t ctrl, const char *name,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const unsigned char *value, size_t valuelen);
	gpg_error_t app_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen );
	gpg_error_t app_auth (app_t app, ctrl_t ctrl, const char *keyidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen);
	gpg_error_t app_decipher (app_t app, ctrl_t ctrl, const char *keyidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen,
	unsigned int *r_info);
	gpg_error_t app_writecert (app_t app, ctrl_t ctrl,
	const char *certidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const unsigned char *keydata, size_t keydatalen);
	gpg_error_t app_writekey (app_t app, ctrl_t ctrl,
	const char *keyidstr, unsigned int flags,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const unsigned char *keydata, size_t keydatalen);
	gpg_error_t app_genkey (app_t app, ctrl_t ctrl,
	- const char *keynostr, unsigned int flags,
	- time_t createtime,
	+ const char keynostr, const char keytype,
	+ unsigned int flags, time_t createtime,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg);
	gpg_error_t app_get_challenge (app_t app, ctrl_t ctrl, size_t nbytes,
	unsigned char *buffer);
	gpg_error_t app_change_pin (app_t app, ctrl_t ctrl,
	const char *chvnostr, unsigned int flags,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg);
	gpg_error_t app_check_pin (app_t app, ctrl_t ctrl, const char *keyidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg);


	/-- app-openpgp.c --/
	gpg_error_t app_select_openpgp (app_t app);

	/-- app-nks.c --/
	gpg_error_t app_select_nks (app_t app);

	/-- app-dinsig.c --/
	gpg_error_t app_select_dinsig (app_t app);

	/-- app-p15.c --/
	gpg_error_t app_select_p15 (app_t app);

	/-- app-geldkarte.c --/
	gpg_error_t app_select_geldkarte (app_t app);

	/-- app-sc-hsm.c --/
	gpg_error_t app_select_sc_hsm (app_t app);

	/-- app-piv.c --/
	gpg_error_t app_select_piv (app_t app);


	#endif /GNUPG_SCD_APP_COMMON_H/
	diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
	index 72ed80a3d..ae87d19f1 100644
	--- a/scd/app-openpgp.c
	+++ b/scd/app-openpgp.c
	@@ -1,5348 +1,5350 @@
	/* app-openpgp.c - The OpenPGP card application.
	* Copyright (C) 2003, 2004, 2005, 2007, 2008,
	* 2009, 2013, 2014, 2015 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 3 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, see <https://www.gnu.org/licenses/>.
	*/

	/* Some notes:

	CHV means Card Holder Verification and is nothing else than a PIN
	or password. That term seems to have been used originally with GSM
	cards. Version v2 of the specs changes the term to the clearer
	term PW for password. We use the terms here interchangeable
	because we do not want to change existing strings i18n wise.

	Version 2 of the specs also drops the separate PW2 which was
	required in v1 due to ISO requirements. It is now possible to have
	one physical PW but two reference to it so that they can be
	individually be verified (e.g. to implement a forced verification
	for one key). Thus you will noticed the use of PW2 with the verify
	command but not with change_reference_data because the latter
	operates directly on the physical PW.

	The Reset Code (RC) as implemented by v2 cards uses the same error
	counter as the PW2 of v1 cards. By default no RC is set and thus
	that error counter is set to 0. After setting the RC the error
	counter will be initialized to 3.

	*/

	#include <config.h>
	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <stdarg.h>
	#include <string.h>
	#include <assert.h>
	#include <time.h>

	#if GNUPG_MAJOR_VERSION == 1
	/* This is used with GnuPG version < 1.9. The code has been source
	copied from the current GnuPG >= 1.9 and is maintained over
	there. */
	#include "options.h"
	#include "errors.h"
	#include "memory.h"
	#include "cardglue.h"
	#else /* GNUPG_MAJOR_VERSION != 1 */
	#include "scdaemon.h"
	#endif /* GNUPG_MAJOR_VERSION != 1 */

	#include "../common/util.h"
	#include "../common/i18n.h"
	#include "iso7816.h"
	#include "app-common.h"
	#include "../common/tlv.h"
	#include "../common/host2net.h"
	#include "../common/openpgpdefs.h"


	/* A table describing the DOs of the card. */
	static struct {
	int tag;
	int constructed;
	int get_from; /* Constructed DO with this DO or 0 for direct access. */
	unsigned int binary:1;
	unsigned int dont_cache:1;
	unsigned int flush_on_error:1;
	unsigned int get_immediate_in_v11:1; /* Enable a hack to bypass the cache of
	this data object if it is used in 1.1
	and later versions of the card. This
	does not work with composite DO and
	is currently only useful for the CHV
	status bytes. */
	unsigned int try_extlen:2; /* Large object; try to use an extended
	length APDU when !=0. The size is
	determined by extcap.max_certlen_3
	when == 1, and by extcap.max_special_do
	when == 2. */
	char *desc;
	} data_objects[] = {
	{ 0x005E, 0, 0, 1, 0, 0, 0, 2, "Login Data" },
	{ 0x5F50, 0, 0, 0, 0, 0, 0, 2, "URL" },
	{ 0x5F52, 0, 0, 1, 0, 0, 0, 0, "Historical Bytes" },
	{ 0x0065, 1, 0, 1, 0, 0, 0, 0, "Cardholder Related Data"},
	{ 0x005B, 0, 0x65, 0, 0, 0, 0, 0, "Name" },
	{ 0x5F2D, 0, 0x65, 0, 0, 0, 0, 0, "Language preferences" },
	{ 0x5F35, 0, 0x65, 0, 0, 0, 0, 0, "Salutation" },
	{ 0x006E, 1, 0, 1, 0, 0, 0, 0, "Application Related Data" },
	{ 0x004F, 0, 0x6E, 1, 0, 0, 0, 0, "AID" },
	{ 0x0073, 1, 0, 1, 0, 0, 0, 0, "Discretionary Data Objects" },
	{ 0x0047, 0, 0x6E, 1, 1, 0, 0, 0, "Card Capabilities" },
	{ 0x00C0, 0, 0x6E, 1, 1, 0, 0, 0, "Extended Card Capabilities" },
	{ 0x00C1, 0, 0x6E, 1, 1, 0, 0, 0, "Algorithm Attributes Signature" },
	{ 0x00C2, 0, 0x6E, 1, 1, 0, 0, 0, "Algorithm Attributes Decryption" },
	{ 0x00C3, 0, 0x6E, 1, 1, 0, 0, 0, "Algorithm Attributes Authentication" },
	{ 0x00C4, 0, 0x6E, 1, 0, 1, 1, 0, "CHV Status Bytes" },
	{ 0x00C5, 0, 0x6E, 1, 0, 0, 0, 0, "Fingerprints" },
	{ 0x00C6, 0, 0x6E, 1, 0, 0, 0, 0, "CA Fingerprints" },
	{ 0x00CD, 0, 0x6E, 1, 0, 0, 0, 0, "Generation time" },
	{ 0x007A, 1, 0, 1, 0, 0, 0, 0, "Security Support Template" },
	{ 0x0093, 0, 0x7A, 1, 1, 0, 0, 0, "Digital Signature Counter" },
	{ 0x0101, 0, 0, 0, 0, 0, 0, 2, "Private DO 1"},
	{ 0x0102, 0, 0, 0, 0, 0, 0, 2, "Private DO 2"},
	{ 0x0103, 0, 0, 0, 0, 0, 0, 2, "Private DO 3"},
	{ 0x0104, 0, 0, 0, 0, 0, 0, 2, "Private DO 4"},
	{ 0x7F21, 1, 0, 1, 0, 0, 0, 1, "Cardholder certificate"},
	/* V3.0 */
	{ 0x7F74, 0, 0x6E, 1, 0, 0, 0, 0, "General Feature Management"},
	{ 0x00D5, 0, 0, 1, 0, 0, 0, 0, "AES key data"},
	{ 0x00D6, 0, 0x6E, 1, 0, 0, 0, 0, "UIF for Signature"},
	{ 0x00D7, 0, 0x6E, 1, 0, 0, 0, 0, "UIF for Decryption"},
	{ 0x00D8, 0, 0x6E, 1, 0, 0, 0, 0, "UIF for Authentication"},
	{ 0x00F9, 0, 0, 1, 0, 0, 0, 0, "KDF data object"},
	{ 0 }
	};


	/* Type of keys. */
	typedef enum
	{
	KEY_TYPE_ECC,
	KEY_TYPE_RSA,
	}
	key_type_t;


	/* The format of RSA private keys. */
	typedef enum
	{
	RSA_UNKNOWN_FMT,
	RSA_STD,
	RSA_STD_N,
	RSA_CRT,
	RSA_CRT_N
	}
	rsa_key_format_t;


	/* One cache item for DOs. */
	struct cache_s {
	struct cache_s *next;
	int tag;
	size_t length;
	unsigned char data[1];
	};


	/* Object with application (i.e. OpenPGP card) specific data. */
	struct app_local_s {
	/* A linked list with cached DOs. */
	struct cache_s *cache;

	/* Keep track of the public keys. */
	struct
	{
	int read_done; /* True if we have at least tried to read them. */
	unsigned char key; / This is a malloced buffer with a canonical
	encoded S-expression encoding a public
	key. Might be NULL if key is not
	available. */
	size_t keylen; /* The length of the above S-expression. This
	is usually only required for cross checks
	because the length of an S-expression is
	implicitly available. */
	} pk[3];

	unsigned char status_indicator; /* The card status indicator. */

	unsigned int manufacturer:16; /* Manufacturer ID from the s/n. */

	/* Keep track of the ISO card capabilities. */
	struct
	{
	unsigned int cmd_chaining:1; /* Command chaining is supported. */
	unsigned int ext_lc_le:1; /* Extended Lc and Le are supported. */
	} cardcap;

	/* Keep track of extended card capabilities. */
	struct
	{
	unsigned int is_v2:1; /* Compatible to v2 or later. */
	unsigned int extcap_v3:1; /* Extcap is in v3 format. */
	unsigned int has_button:1; /* Has confirmation button or not. */

	unsigned int sm_supported:1; /* Secure Messaging is supported. */
	unsigned int get_challenge:1;
	unsigned int key_import:1;
	unsigned int change_force_chv:1;
	unsigned int private_dos:1;
	unsigned int algo_attr_change:1; /* Algorithm attributes changeable. */
	unsigned int has_decrypt:1; /* Support symmetric decryption. */
	unsigned int kdf_do:1; /* Support KDF DO. */

	unsigned int sm_algo:2; /* Symmetric crypto algo for SM. */
	unsigned int pin_blk2:1; /* PIN block 2 format supported. */
	unsigned int mse:1; /* MSE command supported. */
	unsigned int max_certlen_3:16;
	unsigned int max_get_challenge:16; /* Maximum size for get_challenge. */
	unsigned int max_special_do:16; /* Maximum size for special DOs. */
	} extcap;

	/* Flags used to control the application. */
	struct
	{
	unsigned int no_sync:1; /* Do not sync CHV1 and CHV2 */
	unsigned int def_chv2:1; /* Use 123456 for CHV2. */
	} flags;

	/* Pinpad request specified on card. */
	struct
	{
	unsigned int specified:1;
	int fixedlen_user;
	int fixedlen_admin;
	} pinpad;

	struct
	{
	key_type_t key_type;
	union {
	struct {
	unsigned int n_bits; /* Size of the modulus in bits. The rest
	of this strucuire is only valid if
	this is not 0. */
	unsigned int e_bits; /* Size of the public exponent in bits. */
	rsa_key_format_t format;
	} rsa;
	struct {
	const char *curve;
	int flags;
	} ecc;
	};
	} keyattr[3];
	};

	#define ECC_FLAG_DJB_TWEAK (1 << 0)
	#define ECC_FLAG_PUBKEY (1 << 1)


	/*** Local prototypes ***/
	static unsigned long convert_sig_counter_value (const unsigned char *value,
	size_t valuelen);
	static unsigned long get_sig_counter (app_t app);
	static gpg_error_t do_auth (app_t app, const char *keyidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen);
	static void parse_algorithm_attribute (app_t app, int keyno);
	static gpg_error_t change_keyattr_from_string
	(app_t app,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *value, size_t valuelen);





	/* Deconstructor. */
	static void
	do_deinit (app_t app)
	{
	if (app && app->app_local)
	{
	struct cache_s c, c2;
	int i;

	for (c = app->app_local->cache; c; c = c2)
	{
	c2 = c->next;
	xfree (c);
	}

	for (i=0; i < DIM (app->app_local->pk); i++)
	{
	xfree (app->app_local->pk[i].key);
	app->app_local->pk[i].read_done = 0;
	}
	xfree (app->app_local);
	app->app_local = NULL;
	}
	}


	/* Wrapper around iso7816_get_data which first tries to get the data
	from the cache. With GET_IMMEDIATE passed as true, the cache is
	bypassed. With TRY_EXTLEN extended lengths APDUs are use if
	supported by the card. */
	static gpg_error_t
	get_cached_data (app_t app, int tag,
	unsigned char *result, size_t resultlen,
	int get_immediate, int try_extlen)
	{
	gpg_error_t err;
	int i;
	unsigned char *p;
	size_t len;
	struct cache_s *c;
	int exmode;

	*result = NULL;
	*resultlen = 0;

	if (!get_immediate)
	{
	for (c=app->app_local->cache; c; c = c->next)
	if (c->tag == tag)
	{
	if(c->length)
	{
	p = xtrymalloc (c->length);
	if (!p)
	return gpg_error (gpg_err_code_from_errno (errno));
	memcpy (p, c->data, c->length);
	*result = p;
	}

	*resultlen = c->length;

	return 0;
	}
	}

	if (try_extlen && app->app_local->cardcap.ext_lc_le)
	{
	if (try_extlen == 1)
	exmode = app->app_local->extcap.max_certlen_3;
	else if (try_extlen == 2 && app->app_local->extcap.extcap_v3)
	exmode = app->app_local->extcap.max_special_do;
	else
	exmode = 0;
	}
	else
	exmode = 0;

	err = iso7816_get_data (app->slot, exmode, tag, &p, &len);
	if (err)
	return err;
	if (len)
	*result = p;
	*resultlen = len;

	/* Check whether we should cache this object. */
	if (get_immediate)
	return 0;

	for (i=0; data_objects[i].tag; i++)
	if (data_objects[i].tag == tag)
	{
	if (data_objects[i].dont_cache)
	return 0;
	break;
	}

	/* Okay, cache it. */
	for (c=app->app_local->cache; c; c = c->next)
	assert (c->tag != tag);

	c = xtrymalloc (sizeof *c + len);
	if (c)
	{
	if (len)
	memcpy (c->data, p, len);
	else
	xfree (p);
	c->length = len;
	c->tag = tag;
	c->next = app->app_local->cache;
	app->app_local->cache = c;
	}

	return 0;
	}

	/* Remove DO at TAG from the cache. */
	static void
	flush_cache_item (app_t app, int tag)
	{
	struct cache_s c, cprev;
	int i;

	if (!app->app_local)
	return;

	for (c=app->app_local->cache, cprev=NULL; c ; cprev=c, c = c->next)
	if (c->tag == tag)
	{
	if (cprev)
	cprev->next = c->next;
	else
	app->app_local->cache = c->next;
	xfree (c);

	for (c=app->app_local->cache; c ; c = c->next)
	{
	assert (c->tag != tag); /* Oops: duplicated entry. */
	}
	return;
	}

	/* Try again if we have an outer tag. */
	for (i=0; data_objects[i].tag; i++)
	if (data_objects[i].tag == tag && data_objects[i].get_from
	&& data_objects[i].get_from != tag)
	flush_cache_item (app, data_objects[i].get_from);
	}

	/* Flush all entries from the cache which might be out of sync after
	an error. */
	static void
	flush_cache_after_error (app_t app)
	{
	int i;

	for (i=0; data_objects[i].tag; i++)
	if (data_objects[i].flush_on_error)
	flush_cache_item (app, data_objects[i].tag);
	}


	/* Flush the entire cache. */
	static void
	flush_cache (app_t app)
	{
	if (app && app->app_local)
	{
	struct cache_s c, c2;

	for (c = app->app_local->cache; c; c = c2)
	{
	c2 = c->next;
	xfree (c);
	}
	app->app_local->cache = NULL;
	}
	}


	/* Get the DO identified by TAG from the card in SLOT and return a
	buffer with its content in RESULT and NBYTES. The return value is
	NULL if not found or a pointer which must be used to release the
	buffer holding value. */
	static void *
	get_one_do (app_t app, int tag, unsigned char *result, size_t nbytes,
	int *r_rc)
	{
	int rc, i;
	unsigned char *buffer;
	size_t buflen;
	unsigned char *value;
	size_t valuelen;
	int dummyrc;
	int exmode;

	if (!r_rc)
	r_rc = &dummyrc;

	*result = NULL;
	*nbytes = 0;
	*r_rc = 0;
	for (i=0; data_objects[i].tag && data_objects[i].tag != tag; i++)
	;

	if (app->card_version > 0x0100 && data_objects[i].get_immediate_in_v11)
	{
	exmode = 0;
	rc = iso7816_get_data (app->slot, exmode, tag, &buffer, &buflen);
	if (rc)
	{
	*r_rc = rc;
	return NULL;
	}
	*result = buffer;
	*nbytes = buflen;
	return buffer;
	}

	value = NULL;
	rc = -1;
	if (data_objects[i].tag && data_objects[i].get_from)
	{
	rc = get_cached_data (app, data_objects[i].get_from,
	&buffer, &buflen,
	(data_objects[i].dont_cache
	\|\| data_objects[i].get_immediate_in_v11),
	data_objects[i].try_extlen);
	if (!rc)
	{
	const unsigned char *s;

	s = find_tlv_unchecked (buffer, buflen, tag, &valuelen);
	if (!s)
	value = NULL; /* not found */
	else if (valuelen > buflen - (s - buffer))
	{
	log_error ("warning: constructed DO too short\n");
	value = NULL;
	xfree (buffer); buffer = NULL;
	}
	else
	value = buffer + (s - buffer);
	}
	}

	if (!value) /* Not in a constructed DO, try simple. */
	{
	rc = get_cached_data (app, tag, &buffer, &buflen,
	(data_objects[i].dont_cache
	\|\| data_objects[i].get_immediate_in_v11),
	data_objects[i].try_extlen);
	if (!rc)
	{
	value = buffer;
	valuelen = buflen;
	}
	}

	if (!rc)
	{
	*nbytes = valuelen;
	*result = value;
	return buffer;
	}
	*r_rc = rc;
	return NULL;
	}


	static void
	dump_all_do (int slot)
	{
	int rc, i, j;
	unsigned char *buffer;
	size_t buflen;

	for (i=0; data_objects[i].tag; i++)
	{
	if (data_objects[i].get_from)
	continue;

	/* We don't try extended length APDU because such large DO would
	be pretty useless in a log file. */
	rc = iso7816_get_data (slot, 0, data_objects[i].tag, &buffer, &buflen);
	if (gpg_err_code (rc) == GPG_ERR_NO_OBJ)
	;
	else if (rc)
	log_info ("DO '%s' not available: %s\n",
	data_objects[i].desc, gpg_strerror (rc));
	else
	{
	if (data_objects[i].binary)
	{
	log_info ("DO '%s': ", data_objects[i].desc);
	log_printhex (buffer, buflen, "");
	}
	else
	log_info ("DO '%s': '%.*s'\n",
	data_objects[i].desc,
	(int)buflen, buffer); /* FIXME: sanitize */

	if (data_objects[i].constructed)
	{
	for (j=0; data_objects[j].tag; j++)
	{
	const unsigned char *value;
	size_t valuelen;

	if (j==i \|\| data_objects[i].tag != data_objects[j].get_from)
	continue;
	value = find_tlv_unchecked (buffer, buflen,
	data_objects[j].tag, &valuelen);
	if (!value)
	; /* not found */
	else if (valuelen > buflen - (value - buffer))
	log_error ("warning: constructed DO too short\n");
	else
	{
	if (data_objects[j].binary)
	{
	log_info ("DO '%s': ", data_objects[j].desc);
	if (valuelen > 200)
	log_info ("[%u]\n", (unsigned int)valuelen);
	else
	log_printhex (value, valuelen, "");
	}
	else
	log_info ("DO '%s': '%.*s'\n",
	data_objects[j].desc,
	(int)valuelen, value); /* FIXME: sanitize */
	}
	}
	}
	}
	xfree (buffer); buffer = NULL;
	}
	}


	/* Count the number of bits, assuming the A represents an unsigned big
	integer of length LEN bytes. */
	static unsigned int
	count_bits (const unsigned char *a, size_t len)
	{
	unsigned int n = len * 8;
	int i;

	for (; len && !*a; len--, a++, n -=8)
	;
	if (len)
	{
	for (i=7; i && !(*a & (1<<i)); i--)
	n--;
	}
	return n;
	}

	/* GnuPG makes special use of the login-data DO, this function parses
	the login data to store the flags for later use. It may be called
	at any time and should be called after changing the login-data DO.

	Everything up to a LF is considered a mailbox or account name. If
	the first LF is followed by DC4 (0x14) control sequence are
	expected up to the next LF. Control sequences are separated by FS
	(0x18) and consist of key=value pairs. There are two keys defined:

	F=<flags>

	Where FLAGS is a plain hexadecimal number representing flag values.
	The lsb is here the rightmost bit. Defined flags bits are:

	Bit 0 = CHV1 and CHV2 are not synchronized
	Bit 1 = CHV2 has been set to the default PIN of "123456"
	(this implies that bit 0 is also set).

	P=<pinpad-request>

	Where PINPAD_REQUEST is in the format of: <n> or <n>,<m>.
	N for user PIN, M for admin PIN. If M is missing it means M=N.
	0 means to force not to use pinpad.

	*/
	static void
	parse_login_data (app_t app)
	{
	unsigned char buffer, p;
	size_t buflen, len;
	void *relptr;

	/* Set defaults. */
	app->app_local->flags.no_sync = 0;
	app->app_local->flags.def_chv2 = 0;
	app->app_local->pinpad.specified = 0;
	app->app_local->pinpad.fixedlen_user = -1;
	app->app_local->pinpad.fixedlen_admin = -1;

	/* Read the DO. */
	relptr = get_one_do (app, 0x005E, &buffer, &buflen, NULL);
	if (!relptr)
	return; /* Ooops. */
	for (; buflen; buflen--, buffer++)
	if (*buffer == '\n')
	break;
	if (buflen < 2 \|\| buffer[1] != '\x14')
	{
	xfree (relptr);
	return; /* No control sequences. */
	}

	buflen--;
	buffer++;
	do
	{
	buflen--;
	buffer++;
	if (buflen > 1 && *buffer == 'F' && buffer[1] == '=')
	{
	/* Flags control sequence found. */
	int lastdig = 0;

	/* For now we are only interested in the last digit, so skip
	any leading digits but bail out on invalid characters. */
	for (p=buffer+2, len = buflen-2; len && hexdigitp (p); p++, len--)
	lastdig = xtoi_1 (p);
	buffer = p;
	buflen = len;
	if (len && !(p == '\n' \|\| p == '\x18'))
	goto next; /* Invalid characters in field. */
	app->app_local->flags.no_sync = !!(lastdig & 1);
	app->app_local->flags.def_chv2 = (lastdig & 3) == 3;
	}
	else if (buflen > 1 && *buffer == 'P' && buffer[1] == '=')
	{
	/* Pinpad request control sequence found. */
	buffer += 2;
	buflen -= 2;

	if (buflen)
	{
	if (digitp (buffer))
	{
	char *q;
	int n, m;

	n = strtol (buffer, &q, 10);
	if (q >= (char *)buffer + buflen
	\|\| q == '\x18' \|\| q == '\n')
	m = n;
	else
	{
	if (*q++ != ',' \|\| !digitp (q))
	goto next;
	m = strtol (q, &q, 10);
	}

	if (buflen < ((unsigned char *)q - buffer))
	break;

	buflen -= ((unsigned char *)q - buffer);
	buffer = q;

	if (buflen && !(buffer == '\n' \|\| buffer == '\x18'))
	goto next;
	app->app_local->pinpad.specified = 1;
	app->app_local->pinpad.fixedlen_user = n;
	app->app_local->pinpad.fixedlen_admin = m;
	}
	}
	}
	next:
	/* Skip to FS (0x18) or LF (\n). */
	for (; buflen && buffer != '\x18' && buffer != '\n'; buflen--)
	buffer++;
	}
	while (buflen && *buffer != '\n');

	xfree (relptr);
	}


	#define MAX_ARGS_STORE_FPR 3

	/* Note, that FPR must be at least 20 bytes. */
	static gpg_error_t
	store_fpr (app_t app, int keynumber, u32 timestamp, unsigned char *fpr,
	int algo, ...)
	{
	unsigned int n, nbits;
	unsigned char buffer, p;
	int tag, tag2;
	int rc;
	const unsigned char *m[MAX_ARGS_STORE_FPR];
	size_t mlen[MAX_ARGS_STORE_FPR];
	va_list ap;
	int argc;
	int i;

	n = 6; /* key packet version, 4-byte timestamps, and algorithm */
	if (algo == PUBKEY_ALGO_ECDH)
	argc = 3;
	else
	argc = 2;

	va_start (ap, algo);
	for (i = 0; i < argc; i++)
	{
	m[i] = va_arg (ap, const unsigned char *);
	mlen[i] = va_arg (ap, size_t);
	if (algo == PUBKEY_ALGO_RSA \|\| i == 1)
	n += 2;
	n += mlen[i];
	}
	va_end (ap);

	p = buffer = xtrymalloc (3 + n);
	if (!buffer)
	return gpg_error_from_syserror ();

	p++ = 0x99; / ctb */
	p++ = n >> 8; / 2 byte length header */
	*p++ = n;
	p++ = 4; / key packet version */
	*p++ = timestamp >> 24;
	*p++ = timestamp >> 16;
	*p++ = timestamp >> 8;
	*p++ = timestamp;
	*p++ = algo;

	for (i = 0; i < argc; i++)
	{
	if (algo == PUBKEY_ALGO_RSA \|\| i == 1)
	{
	nbits = count_bits (m[i], mlen[i]);
	*p++ = nbits >> 8;
	*p++ = nbits;
	}
	memcpy (p, m[i], mlen[i]);
	p += mlen[i];
	}

	gcry_md_hash_buffer (GCRY_MD_SHA1, fpr, buffer, n+3);

	xfree (buffer);

	tag = (app->card_version > 0x0007? 0xC7 : 0xC6) + keynumber;
	flush_cache_item (app, 0xC5);
	tag2 = 0xCE + keynumber;
	flush_cache_item (app, 0xCD);

	rc = iso7816_put_data (app->slot, 0, tag, fpr, 20);
	if (rc)
	log_error (_("failed to store the fingerprint: %s\n"),gpg_strerror (rc));

	if (!rc && app->card_version > 0x0100)
	{
	unsigned char buf[4];

	buf[0] = timestamp >> 24;
	buf[1] = timestamp >> 16;
	buf[2] = timestamp >> 8;
	buf[3] = timestamp;

	rc = iso7816_put_data (app->slot, 0, tag2, buf, 4);
	if (rc)
	log_error (_("failed to store the creation date: %s\n"),
	gpg_strerror (rc));
	}

	return rc;
	}


	static void
	send_fpr_if_not_null (ctrl_t ctrl, const char *keyword,
	int number, const unsigned char *fpr)
	{
	int i;
	char buf[41];
	char numbuf[25];

	for (i=0; i < 20 && !fpr[i]; i++)
	;
	if (i==20)
	return; /* All zero. */
	bin2hex (fpr, 20, buf);
	if (number == -1)
	numbuf = 0; / Don't print the key number */
	else
	sprintf (numbuf, "%d", number);
	send_status_info (ctrl, keyword,
	numbuf, (size_t)strlen(numbuf),
	buf, (size_t)strlen (buf), NULL, 0);
	}

	static void
	send_fprtime_if_not_null (ctrl_t ctrl, const char *keyword,
	int number, const unsigned char *stamp)
	{
	char numbuf1[50], numbuf2[50];
	unsigned long value;

	value = buf32_to_ulong (stamp);
	if (!value)
	return;
	sprintf (numbuf1, "%d", number);
	sprintf (numbuf2, "%lu", value);
	send_status_info (ctrl, keyword,
	numbuf1, (size_t)strlen(numbuf1),
	numbuf2, (size_t)strlen(numbuf2), NULL, 0);
	}

	static void
	send_key_data (ctrl_t ctrl, const char *name,
	const unsigned char *a, size_t alen)
	{
	char buffer, buf;
	size_t buflen;

	buffer = buf = bin2hex (a, alen, NULL);
	if (!buffer)
	{
	log_error ("memory allocation error in send_key_data\n");
	return;
	}
	buflen = strlen (buffer);

	/* 768 is the hexified size for the modulus of an 3072 bit key. We
	use extra chunks to transmit larger data (i.e for 4096 bit). */
	for ( ;buflen > 768; buflen -= 768, buf += 768)
	send_status_info (ctrl, "KEY-DATA",
	"-", 1,
	buf, 768,
	NULL, 0);
	send_status_info (ctrl, "KEY-DATA",
	name, (size_t)strlen(name),
	buf, buflen,
	NULL, 0);
	xfree (buffer);
	}


	static void
	send_key_attr (ctrl_t ctrl, app_t app, const char *keyword, int keyno)
	{
	char buffer[200];

	assert (keyno >=0 && keyno < DIM(app->app_local->keyattr));

	if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_RSA)
	snprintf (buffer, sizeof buffer, "%d 1 rsa%u %u %d",
	keyno+1,
	app->app_local->keyattr[keyno].rsa.n_bits,
	app->app_local->keyattr[keyno].rsa.e_bits,
	app->app_local->keyattr[keyno].rsa.format);
	else if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_ECC)
	{
	snprintf (buffer, sizeof buffer, "%d %d %s",
	keyno+1,
	keyno==1? PUBKEY_ALGO_ECDH :
	(app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK)?
	PUBKEY_ALGO_EDDSA : PUBKEY_ALGO_ECDSA,
	app->app_local->keyattr[keyno].ecc.curve);
	}
	else
	snprintf (buffer, sizeof buffer, "%d 0 0 UNKNOWN", keyno+1);

	send_status_direct (ctrl, keyword, buffer);
	}


	#define RSA_SMALL_SIZE_KEY 1952
	#define RSA_SMALL_SIZE_OP 2048

	static int
	determine_rsa_response (app_t app, int keyno)
	{
	int size;

	size = 2 + 3 /* header */
	+ 4 /* tag+len */ + (app->app_local->keyattr[keyno].rsa.n_bits+7)/8
	+ 2 /* tag+len */ + (app->app_local->keyattr[keyno].rsa.e_bits+7)/8;

	return size;
	}


	/* Implement the GETATTR command. This is similar to the LEARN
	command but returns just one value via the status interface. */
	static gpg_error_t
	do_getattr (app_t app, ctrl_t ctrl, const char *name)
	{
	static struct {
	const char *name;
	int tag;
	int special;
	} table[] = {
	{ "DISP-NAME", 0x005B },
	{ "LOGIN-DATA", 0x005E },
	{ "DISP-LANG", 0x5F2D },
	{ "DISP-SEX", 0x5F35 },
	{ "PUBKEY-URL", 0x5F50 },
	{ "KEY-FPR", 0x00C5, 3 },
	{ "KEY-TIME", 0x00CD, 4 },
	{ "KEY-ATTR", 0x0000, -5 },
	{ "CA-FPR", 0x00C6, 3 },
	{ "CHV-STATUS", 0x00C4, 1 },
	{ "SIG-COUNTER", 0x0093, 2 },
	{ "SERIALNO", 0x004F, -1 },
	{ "AID", 0x004F },
	{ "EXTCAP", 0x0000, -2 },
	{ "PRIVATE-DO-1", 0x0101 },
	{ "PRIVATE-DO-2", 0x0102 },
	{ "PRIVATE-DO-3", 0x0103 },
	{ "PRIVATE-DO-4", 0x0104 },
	{ "$AUTHKEYID", 0x0000, -3 },
	{ "$DISPSERIALNO",0x0000, -4 },
	{ "UIF-1", 0x00D6, 0 },
	{ "UIF-2", 0x00D7, 0 },
	{ "UIF-3", 0x00D8, 0 },
	{ "KDF", 0x00F9 },
	{ NULL, 0 }
	};
	int idx, i, rc;
	void *relptr;
	unsigned char *value;
	size_t valuelen;

	for (idx=0; table[idx].name && strcmp (table[idx].name, name); idx++)
	;
	if (!table[idx].name)
	return gpg_error (GPG_ERR_INV_NAME);

	if (table[idx].special == -1)
	{
	/* The serial number is very special. We could have used the
	AID DO to retrieve it. The AID DO is available anyway but
	not hex formatted. */
	char *serial = app_get_serialno (app);

	if (serial)
	{
	send_status_direct (ctrl, "SERIALNO", serial);
	xfree (serial);
	}
	return 0;
	}
	if (table[idx].special == -2)
	{
	char tmp[110];

	snprintf (tmp, sizeof tmp,
	"gc=%d ki=%d fc=%d pd=%d mcl3=%u aac=%d "
	"sm=%d si=%u dec=%d bt=%d kdf=%d",
	app->app_local->extcap.get_challenge,
	app->app_local->extcap.key_import,
	app->app_local->extcap.change_force_chv,
	app->app_local->extcap.private_dos,
	app->app_local->extcap.max_certlen_3,
	app->app_local->extcap.algo_attr_change,
	(app->app_local->extcap.sm_supported
	? (app->app_local->extcap.sm_algo == 0? CIPHER_ALGO_3DES :
	(app->app_local->extcap.sm_algo == 1?
	CIPHER_ALGO_AES : CIPHER_ALGO_AES256))
	: 0),
	app->app_local->status_indicator,
	app->app_local->extcap.has_decrypt,
	app->app_local->extcap.has_button,
	app->app_local->extcap.kdf_do);
	send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0);
	return 0;
	}
	if (table[idx].special == -3)
	{
	char const tmp[] = "OPENPGP.3";
	send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0);
	return 0;
	}
	if (table[idx].special == -4)
	{
	char *serial = app_get_serialno (app);

	if (serial)
	{
	if (strlen (serial) > 16+12)
	{
	send_status_info (ctrl, table[idx].name, serial+16, 12, NULL, 0);
	xfree (serial);
	return 0;
	}
	xfree (serial);
	}
	return gpg_error (GPG_ERR_INV_NAME);
	}
	if (table[idx].special == -5)
	{
	for (i=0; i < 3; i++)
	send_key_attr (ctrl, app, table[idx].name, i);
	return 0;
	}

	relptr = get_one_do (app, table[idx].tag, &value, &valuelen, &rc);
	if (relptr)
	{
	if (table[idx].special == 1)
	{
	char numbuf[7*23];

	for (i=0,*numbuf=0; i < valuelen && i < 7; i++)
	sprintf (numbuf+strlen (numbuf), " %d", value[i]);
	send_status_info (ctrl, table[idx].name,
	numbuf, strlen (numbuf), NULL, 0);
	}
	else if (table[idx].special == 2)
	{
	char numbuf[50];

	sprintf (numbuf, "%lu", convert_sig_counter_value (value, valuelen));
	send_status_info (ctrl, table[idx].name,
	numbuf, strlen (numbuf), NULL, 0);
	}
	else if (table[idx].special == 3)
	{
	if (valuelen >= 60)
	for (i=0; i < 3; i++)
	send_fpr_if_not_null (ctrl, table[idx].name, i+1, value+i*20);
	}
	else if (table[idx].special == 4)
	{
	if (valuelen >= 12)
	for (i=0; i < 3; i++)
	send_fprtime_if_not_null (ctrl, table[idx].name, i+1, value+i*4);
	}
	else
	send_status_info (ctrl, table[idx].name, value, valuelen, NULL, 0);

	xfree (relptr);
	}
	return rc;
	}


	/* Return the DISP-NAME without any padding characters. Caller must
	* free the result. If not found or empty NULL is returned. */
	static char *
	get_disp_name (app_t app)
	{
	int rc;
	void *relptr;
	unsigned char *value;
	size_t valuelen;
	char *string;
	char p, given;
	char *result;

	relptr = get_one_do (app, 0x005B, &value, &valuelen, &rc);
	if (!relptr)
	return NULL;

	string = xtrymalloc (valuelen + 1);
	if (!string)
	{
	xfree (relptr);
	return NULL;
	}
	memcpy (string, value, valuelen);
	string[valuelen] = 0;
	xfree (relptr);

	/* Swap surname and given name. */
	given = strstr (string, "<<");
	for (p = string; *p; p++)
	if (*p == '<')
	*p = ' ';

	if (given && given[2])
	{
	*given = 0;
	given += 2;
	result = strconcat (given, " ", string, NULL);
	}
	else
	{
	result = string;
	string = NULL;
	}

	xfree (string);
	return result;
	}


	/* Return the pretty formatted serialnumber. On error NULL is
	* returned. */
	static char *
	get_disp_serialno (app_t app)
	{
	char *serial = app_get_serialno (app);

	/* For our OpenPGP cards we do not want to show the entire serial
	* number but a nicely reformatted actual serial number. */
	if (serial && strlen (serial) > 16+12)
	{
	memmove (serial, serial+16, 4);
	serial[4] = ' ';
	/* memmove (serial+5, serial+20, 4); */
	/* serial[9] = ' '; */
	/* memmove (serial+10, serial+24, 4); */
	/* serial[14] = 0; */
	memmove (serial+5, serial+20, 8);
	serial[13] = 0;
	}
	return serial;
	}


	/* Return the number of remaining tries for the standard or the admin
	* pw. Returns -1 on card error. */
	static int
	get_remaining_tries (app_t app, int adminpw)
	{
	void *relptr;
	unsigned char *value;
	size_t valuelen;
	int remaining;

	relptr = get_one_do (app, 0x00C4, &value, &valuelen, NULL);
	if (!relptr \|\| valuelen < 7)
	{
	log_error (_("error retrieving CHV status from card\n"));
	xfree (relptr);
	return -1;
	}
	remaining = value[adminpw? 6 : 4];
	xfree (relptr);
	return remaining;
	}


	/* Retrieve the fingerprint from the card inserted in SLOT and write
	the according hex representation to FPR. Caller must have provide
	a buffer at FPR of least 41 bytes. Returns 0 on success or an
	error code. */
	#if GNUPG_MAJOR_VERSION > 1
	static gpg_error_t
	retrieve_fpr_from_card (app_t app, int keyno, char *fpr)
	{
	gpg_error_t err = 0;
	void *relptr;
	unsigned char *value;
	size_t valuelen;

	assert (keyno >=0 && keyno <= 2);

	relptr = get_one_do (app, 0x00C5, &value, &valuelen, NULL);
	if (relptr && valuelen >= 60)
	bin2hex (value+keyno*20, 20, fpr);
	else
	err = gpg_error (GPG_ERR_NOT_FOUND);
	xfree (relptr);
	return err;
	}
	#endif /GNUPG_MAJOR_VERSION > 1/


	/* Retrieve the public key material for the RSA key, whose fingerprint
	is FPR, from gpg output, which can be read through the stream FP.
	The RSA modulus will be stored at the address of M and MLEN, the
	public exponent at E and ELEN. Returns zero on success, an error
	code on failure. Caller must release the allocated buffers at M
	and E if the function returns success. */
	#if GNUPG_MAJOR_VERSION > 1
	static gpg_error_t
	retrieve_key_material (FILE fp, const char hexkeyid,
	const unsigned char *m, size_t mlen,
	const unsigned char *e, size_t elen)
	{
	gcry_error_t err = 0;
	char line = NULL; / read_line() buffer. */
	size_t line_size = 0; /* Helper for for read_line. */
	int found_key = 0; /* Helper to find a matching key. */
	unsigned char *m_new = NULL;
	unsigned char *e_new = NULL;
	size_t m_new_n = 0;
	size_t e_new_n = 0;

	/* Loop over all records until we have found the subkey
	corresponding to the fingerprint. Inm general the first record
	should be the pub record, but we don't rely on that. Given that
	we only need to look at one key, it is sufficient to compare the
	keyid so that we don't need to look at "fpr" records. */
	for (;;)
	{
	char *p;
	char *fields[6] = { NULL, NULL, NULL, NULL, NULL, NULL };
	int nfields;
	size_t max_length;
	gcry_mpi_t mpi;
	int i;

	max_length = 4096;
	i = read_line (fp, &line, &line_size, &max_length);
	if (!i)
	break; /* EOF. */
	if (i < 0)
	{
	err = gpg_error_from_syserror ();
	goto leave; /* Error. */
	}
	if (!max_length)
	{
	err = gpg_error (GPG_ERR_TRUNCATED);
	goto leave; /* Line truncated - we better stop processing. */
	}

	/* Parse the line into fields. */
	for (nfields=0, p=line; p && nfields < DIM (fields); nfields++)
	{
	fields[nfields] = p;
	p = strchr (p, ':');
	if (p)
	*(p++) = 0;
	}
	if (!nfields)
	continue; /* No fields at all - skip line. */

	if (!found_key)
	{
	if ( (!strcmp (fields[0], "sub") \|\| !strcmp (fields[0], "pub") )
	&& nfields > 4 && !strcmp (fields[4], hexkeyid))
	found_key = 1;
	continue;
	}

	if ( !strcmp (fields[0], "sub") \|\| !strcmp (fields[0], "pub") )
	break; /* Next key - stop. */

	if ( strcmp (fields[0], "pkd") )
	continue; /* Not a key data record. */
	if ( nfields < 4 \|\| (i = atoi (fields[1])) < 0 \|\| i > 1
	\|\| (!i && m_new) \|\| (i && e_new))
	{
	err = gpg_error (GPG_ERR_GENERAL);
	goto leave; /* Error: Invalid key data record or not an RSA key. */
	}

	err = gcry_mpi_scan (&mpi, GCRYMPI_FMT_HEX, fields[3], 0, NULL);
	if (err)
	mpi = NULL;
	else if (!i)
	err = gcry_mpi_aprint (GCRYMPI_FMT_STD, &m_new, &m_new_n, mpi);
	else
	err = gcry_mpi_aprint (GCRYMPI_FMT_STD, &e_new, &e_new_n, mpi);
	gcry_mpi_release (mpi);
	if (err)
	goto leave;
	}

	if (m_new && e_new)
	{
	*m = m_new;
	*mlen = m_new_n;
	m_new = NULL;
	*e = e_new;
	*elen = e_new_n;
	e_new = NULL;
	}
	else
	err = gpg_error (GPG_ERR_GENERAL);

	leave:
	xfree (m_new);
	xfree (e_new);
	xfree (line);
	return err;
	}
	#endif /GNUPG_MAJOR_VERSION > 1/


	static gpg_error_t
	rsa_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
	const unsigned char data, size_t datalen, gcry_sexp_t r_sexp)
	{
	gpg_error_t err;
	const unsigned char m, e;
	size_t mlen, elen;
	unsigned char mbuf = NULL, ebuf = NULL;

	m = find_tlv (data, datalen, 0x0081, &mlen);
	if (!m)
	{
	log_error (_("response does not contain the RSA modulus\n"));
	return gpg_error (GPG_ERR_CARD);
	}

	e = find_tlv (data, datalen, 0x0082, &elen);
	if (!e)
	{
	log_error (_("response does not contain the RSA public exponent\n"));
	return gpg_error (GPG_ERR_CARD);
	}

	if (ctrl)
	{
	send_key_data (ctrl, "n", m, mlen);
	send_key_data (ctrl, "e", e, elen);
	}

	for (; mlen && !m; mlen--, m++) / strip leading zeroes */
	;
	for (; elen && !e; elen--, e++) / strip leading zeroes */
	;

	if (ctrl)
	{
	unsigned char fprbuf[20];

	err = store_fpr (app, keyno, created_at, fprbuf, PUBKEY_ALGO_RSA,
	m, mlen, e, elen);
	if (err)
	return err;

	send_fpr_if_not_null (ctrl, "KEY-FPR", -1, fprbuf);
	}

	mbuf = xtrymalloc (mlen + 1);
	if (!mbuf)
	{
	err = gpg_error_from_syserror ();
	goto leave;
	}
	/* Prepend numbers with a 0 if needed. */
	if (mlen && (*m & 0x80))
	{
	*mbuf = 0;
	memcpy (mbuf+1, m, mlen);
	mlen++;
	}
	else
	memcpy (mbuf, m, mlen);

	ebuf = xtrymalloc (elen + 1);
	if (!ebuf)
	{
	err = gpg_error_from_syserror ();
	goto leave;
	}
	/* Prepend numbers with a 0 if needed. */
	if (elen && (*e & 0x80))
	{
	*ebuf = 0;
	memcpy (ebuf+1, e, elen);
	elen++;
	}
	else
	memcpy (ebuf, e, elen);

	err = gcry_sexp_build (r_sexp, NULL, "(public-key(rsa(n%b)(e%b)))",
	(int)mlen, mbuf, (int)elen, ebuf);
	leave:
	xfree (mbuf);
	xfree (ebuf);
	return err;
	}


	/* Determine KDF hash algorithm and KEK encryption algorithm by CURVE. */
	static const unsigned char*
	ecdh_params (const char *curve)
	{
	unsigned int nbits;

	openpgp_curve_to_oid (curve, &nbits);

	/* See RFC-6637 for those constants.
	0x03: Number of bytes
	0x01: Version for this parameter format
	KDF algo
	KEK algo
	*/
	if (nbits <= 256)
	return (const unsigned char*)"\x03\x01\x08\x07";
	else if (nbits <= 384)
	return (const unsigned char*)"\x03\x01\x09\x08";
	else
	return (const unsigned char*)"\x03\x01\x0a\x09";
	}

	static gpg_error_t
	ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
	const unsigned char data, size_t datalen, gcry_sexp_t r_sexp)
	{
	gpg_error_t err;
	unsigned char *qbuf = NULL;
	const unsigned char *ecc_q;
	size_t ecc_q_len;
	gcry_mpi_t oid = NULL;
	int n;
	const char *curve;
	const char *oidstr;
	const unsigned char *oidbuf;
	size_t oid_len;
	int algo;
	const char *format;

	ecc_q = find_tlv (data, datalen, 0x0086, &ecc_q_len);
	if (!ecc_q)
	{
	log_error (_("response does not contain the EC public key\n"));
	return gpg_error (GPG_ERR_CARD);
	}

	curve = app->app_local->keyattr[keyno].ecc.curve;
	oidstr = openpgp_curve_to_oid (curve, NULL);
	err = openpgp_oid_from_str (oidstr, &oid);
	if (err)
	return err;
	oidbuf = gcry_mpi_get_opaque (oid, &n);
	if (!oidbuf)
	{
	err = gpg_error_from_syserror ();
	goto leave;
	}
	oid_len = (n+7)/8;

	qbuf = xtrymalloc (ecc_q_len + 1);
	if (!qbuf)
	{
	err = gpg_error_from_syserror ();
	goto leave;
	}

	if ((app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK))
	{ /* Prepend 0x40 prefix. */
	*qbuf = 0x40;
	memcpy (qbuf+1, ecc_q, ecc_q_len);
	ecc_q_len++;
	}
	else
	memcpy (qbuf, ecc_q, ecc_q_len);

	if (ctrl)
	{
	send_key_data (ctrl, "q", qbuf, ecc_q_len);
	send_key_data (ctrl, "curve", oidbuf, oid_len);
	}

	if (keyno == 1)
	{
	if (ctrl)
	send_key_data (ctrl, "kdf/kek", ecdh_params (curve), (size_t)4);
	algo = PUBKEY_ALGO_ECDH;
	}
	else
	{
	if ((app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK))
	algo = PUBKEY_ALGO_EDDSA;
	else
	algo = PUBKEY_ALGO_ECDSA;
	}

	if (ctrl)
	{
	unsigned char fprbuf[20];

	err = store_fpr (app, keyno, created_at, fprbuf, algo, oidbuf, oid_len,
	qbuf, ecc_q_len, ecdh_params (curve), (size_t)4);
	if (err)
	goto leave;

	send_fpr_if_not_null (ctrl, "KEY-FPR", -1, fprbuf);
	}

	if (!(app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK))
	format = "(public-key(ecc(curve%s)(q%b)))";
	else if (keyno == 1)
	format = "(public-key(ecc(curve%s)(flags djb-tweak)(q%b)))";
	else
	format = "(public-key(ecc(curve%s)(flags eddsa)(q%b)))";

	err = gcry_sexp_build (r_sexp, NULL, format,
	app->app_local->keyattr[keyno].ecc.curve,
	(int)ecc_q_len, qbuf);
	leave:
	gcry_mpi_release (oid);
	xfree (qbuf);
	return err;
	}


	/* Parse tag-length-value data for public key in BUFFER of BUFLEN
	length. Key of KEYNO in APP is updated with an S-expression of
	public key. When CTRL is not NULL, fingerprint is computed with
	CREATED_AT, and fingerprint is written to the card, and key data
	and fingerprint are send back to the client side.
	*/
	static gpg_error_t
	read_public_key (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
	const unsigned char *buffer, size_t buflen)
	{
	gpg_error_t err;
	const unsigned char *data;
	size_t datalen;
	gcry_sexp_t s_pkey = NULL;

	data = find_tlv (buffer, buflen, 0x7F49, &datalen);
	if (!data)
	{
	log_error (_("response does not contain the public key data\n"));
	return gpg_error (GPG_ERR_CARD);
	}

	if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_RSA)
	err = rsa_read_pubkey (app, ctrl, created_at, keyno,
	data, datalen, &s_pkey);
	else if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_ECC)
	err = ecc_read_pubkey (app, ctrl, created_at, keyno,
	data, datalen, &s_pkey);
	else
	err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);

	if (!err)
	{
	unsigned char *keybuf;
	size_t len;

	len = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
	keybuf = xtrymalloc (len);
	if (!data)
	{
	err = gpg_error_from_syserror ();
	gcry_sexp_release (s_pkey);
	return err;
	}

	gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, keybuf, len);
	gcry_sexp_release (s_pkey);

	app->app_local->pk[keyno].key = keybuf;
	/* Decrement for trailing '\0' */
	app->app_local->pk[keyno].keylen = len - 1;
	}

	return err;
	}


	/* Get the public key for KEYNO and store it as an S-expression with
	the APP handle. On error that field gets cleared. If we already
	know about the public key we will just return. Note that this does
	not mean a key is available; this is solely indicated by the
	presence of the app->app_local->pk[KEYNO].key field.

	Note that GnuPG 1.x does not need this and it would be too time
	consuming to send it just for the fun of it. However, given that we
	use the same code in gpg 1.4, we can't use the gcry S-expression
	here but need to open encode it. */
	#if GNUPG_MAJOR_VERSION > 1
	static gpg_error_t
	get_public_key (app_t app, int keyno)
	{
	gpg_error_t err = 0;
	unsigned char *buffer;
	const unsigned char m, e;
	size_t buflen;
	size_t mlen = 0;
	size_t elen = 0;
	char *keybuf = NULL;
	gcry_sexp_t s_pkey;
	size_t len;

	if (keyno < 0 \|\| keyno > 2)
	return gpg_error (GPG_ERR_INV_ID);

	/* Already cached? */
	if (app->app_local->pk[keyno].read_done)
	return 0;

	xfree (app->app_local->pk[keyno].key);
	app->app_local->pk[keyno].key = NULL;
	app->app_local->pk[keyno].keylen = 0;

	m = e = NULL; /* (avoid cc warning) */

	if (app->card_version > 0x0100)
	{
	int exmode, le_value;

	/* We may simply read the public key out of these cards. */
	if (app->app_local->cardcap.ext_lc_le
	&& app->app_local->keyattr[keyno].key_type == KEY_TYPE_RSA
	&& app->app_local->keyattr[keyno].rsa.n_bits > RSA_SMALL_SIZE_KEY)
	{
	exmode = 1; /* Use extended length. */
	le_value = determine_rsa_response (app, keyno);
	}
	else
	{
	exmode = 0;
	le_value = 256; /* Use legacy value. */
	}

	err = iso7816_read_public_key (app->slot, exmode,
	(keyno == 0? "\xB6" :
	keyno == 1? "\xB8" : "\xA4"),
	2, le_value, &buffer, &buflen);
	if (err)
	{
	log_error (_("reading public key failed: %s\n"), gpg_strerror (err));
	goto leave;
	}

	err = read_public_key (app, NULL, 0U, keyno, buffer, buflen);
	}
	else
	{
	/* Due to a design problem in v1.0 cards we can't get the public
	key out of these cards without doing a verify on CHV3.
	Clearly that is not an option and thus we try to locate the
	key using an external helper.

	The helper we use here is gpg itself, which should know about
	the key in any case. */

	char fpr[41];
	char *hexkeyid;
	char *command = NULL;
	FILE *fp;
	int ret;

	buffer = NULL; /* We don't need buffer. */

	err = retrieve_fpr_from_card (app, keyno, fpr);
	if (err)
	{
	log_error ("error while retrieving fpr from card: %s\n",
	gpg_strerror (err));
	goto leave;
	}
	hexkeyid = fpr + 24;

	ret = gpgrt_asprintf
	(&command, "gpg --list-keys --with-colons --with-key-data '%s'", fpr);
	if (ret < 0)
	{
	err = gpg_error_from_syserror ();
	goto leave;
	}

	fp = popen (command, "r");
	xfree (command);
	if (!fp)
	{
	err = gpg_error_from_syserror ();
	log_error ("running gpg failed: %s\n", gpg_strerror (err));
	goto leave;
	}

	err = retrieve_key_material (fp, hexkeyid, &m, &mlen, &e, &elen);
	pclose (fp);
	if (err)
	{
	log_error ("error while retrieving key material through pipe: %s\n",
	gpg_strerror (err));
	goto leave;
	}

	err = gcry_sexp_build (&s_pkey, NULL, "(public-key(rsa(n%b)(e%b)))",
	(int)mlen, m, (int)elen, e);
	if (err)
	goto leave;

	len = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);

	keybuf = xtrymalloc (len);
	if (!keybuf)
	{
	err = gpg_error_from_syserror ();
	gcry_sexp_release (s_pkey);
	goto leave;
	}

	gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, keybuf, len);
	gcry_sexp_release (s_pkey);

	app->app_local->pk[keyno].key = (unsigned char*)keybuf;
	/* Decrement for trailing '\0' */
	app->app_local->pk[keyno].keylen = len - 1;
	}

	leave:
	/* Set a flag to indicate that we tried to read the key. */
	app->app_local->pk[keyno].read_done = 1;

	xfree (buffer);
	return err;
	}
	#endif /* GNUPG_MAJOR_VERSION > 1 */



	/* Send the KEYPAIRINFO back. KEY needs to be in the range [1,3].
	This is used by the LEARN command. */
	static gpg_error_t
	send_keypair_info (app_t app, ctrl_t ctrl, int key)
	{
	int keyno = key - 1;
	gpg_error_t err = 0;
	/* Note that GnuPG 1.x does not need this and it would be too time
	consuming to send it just for the fun of it. */
	#if GNUPG_MAJOR_VERSION > 1
	unsigned char grip[20];
	char gripstr[41];
	char idbuf[50];

	err = get_public_key (app, keyno);
	if (err)
	goto leave;

	assert (keyno >= 0 && keyno <= 2);
	if (!app->app_local->pk[keyno].key)
	goto leave; /* No such key - ignore. */

	err = keygrip_from_canon_sexp (app->app_local->pk[keyno].key,
	app->app_local->pk[keyno].keylen,
	grip);
	if (err)
	goto leave;

	bin2hex (grip, 20, gripstr);

	sprintf (idbuf, "OPENPGP.%d", keyno+1);
	send_status_info (ctrl, "KEYPAIRINFO",
	gripstr, 40,
	idbuf, strlen (idbuf),
	NULL, (size_t)0);

	leave:
	#endif /* GNUPG_MAJOR_VERSION > 1 */

	return err;
	}


	/* Handle the LEARN command for OpenPGP. */
	static gpg_error_t
	do_learn_status (app_t app, ctrl_t ctrl, unsigned int flags)
	{
	(void)flags;

	do_getattr (app, ctrl, "EXTCAP");
	do_getattr (app, ctrl, "DISP-NAME");
	do_getattr (app, ctrl, "DISP-LANG");
	do_getattr (app, ctrl, "DISP-SEX");
	do_getattr (app, ctrl, "PUBKEY-URL");
	do_getattr (app, ctrl, "LOGIN-DATA");
	do_getattr (app, ctrl, "KEY-FPR");
	if (app->card_version > 0x0100)
	do_getattr (app, ctrl, "KEY-TIME");
	do_getattr (app, ctrl, "CA-FPR");
	do_getattr (app, ctrl, "CHV-STATUS");
	do_getattr (app, ctrl, "SIG-COUNTER");
	if (app->app_local->extcap.kdf_do)
	do_getattr (app, ctrl, "KDF");
	if (app->app_local->extcap.has_button)
	{
	do_getattr (app, ctrl, "UIF-1");
	do_getattr (app, ctrl, "UIF-2");
	do_getattr (app, ctrl, "UIF-3");
	}
	if (app->app_local->extcap.private_dos)
	{
	do_getattr (app, ctrl, "PRIVATE-DO-1");
	do_getattr (app, ctrl, "PRIVATE-DO-2");
	if (app->did_chv2)
	do_getattr (app, ctrl, "PRIVATE-DO-3");
	if (app->did_chv3)
	do_getattr (app, ctrl, "PRIVATE-DO-4");
	}
	send_keypair_info (app, ctrl, 1);
	send_keypair_info (app, ctrl, 2);
	send_keypair_info (app, ctrl, 3);
	/* Note: We do not send the Cardholder Certificate, because that is
	relatively long and for OpenPGP applications not really needed. */
	return 0;
	}


	/* Handle the READKEY command for OpenPGP. On success a canonical
	encoded S-expression with the public key will get stored at PK and
	its length (for assertions) at PKLEN; the caller must release that
	buffer. On error PK and PKLEN are not changed and an error code is
	returned. */
	static gpg_error_t
	do_readkey (app_t app, int advanced, const char *keyid,
	unsigned char *pk, size_t pklen)
	{
	#if GNUPG_MAJOR_VERSION > 1
	gpg_error_t err;
	int keyno;
	unsigned char *buf;

	if (!strcmp (keyid, "OPENPGP.1"))
	keyno = 0;
	else if (!strcmp (keyid, "OPENPGP.2"))
	keyno = 1;
	else if (!strcmp (keyid, "OPENPGP.3"))
	keyno = 2;
	else
	return gpg_error (GPG_ERR_INV_ID);

	err = get_public_key (app, keyno);
	if (err)
	return err;

	buf = app->app_local->pk[keyno].key;
	if (!buf)
	return gpg_error (GPG_ERR_NO_PUBKEY);

	if (advanced)
	{
	gcry_sexp_t s_key;

	err = gcry_sexp_new (&s_key, buf, app->app_local->pk[keyno].keylen, 0);
	if (err)
	return err;

	*pklen = gcry_sexp_sprint (s_key, GCRYSEXP_FMT_ADVANCED, NULL, 0);
	pk = xtrymalloc (pklen);
	if (!*pk)
	{
	err = gpg_error_from_syserror ();
	*pklen = 0;
	return err;
	}

	gcry_sexp_sprint (s_key, GCRYSEXP_FMT_ADVANCED, pk, pklen);
	gcry_sexp_release (s_key);
	/* Decrement for trailing '\0' */
	pklen = pklen - 1;
	}
	else
	{
	*pklen = app->app_local->pk[keyno].keylen;
	pk = xtrymalloc (pklen);
	if (!*pk)
	{
	err = gpg_error_from_syserror ();
	*pklen = 0;
	return err;
	}
	memcpy (pk, buf, pklen);
	}

	return 0;
	#else
	return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
	#endif
	}

	/* Read the standard certificate of an OpenPGP v2 card. It is
	returned in a freshly allocated buffer with that address stored at
	CERT and the length of the certificate stored at CERTLEN. CERTID
	needs to be set to "OPENPGP.3". */
	static gpg_error_t
	do_readcert (app_t app, const char *certid,
	unsigned char *cert, size_t certlen)
	{
	#if GNUPG_MAJOR_VERSION > 1
	gpg_error_t err;
	unsigned char *buffer;
	size_t buflen;
	void *relptr;

	*cert = NULL;
	*certlen = 0;
	if (strcmp (certid, "OPENPGP.3"))
	return gpg_error (GPG_ERR_INV_ID);
	if (!app->app_local->extcap.is_v2)
	return gpg_error (GPG_ERR_NOT_FOUND);

	relptr = get_one_do (app, 0x7F21, &buffer, &buflen, NULL);
	if (!relptr)
	return gpg_error (GPG_ERR_NOT_FOUND);

	if (!buflen)
	err = gpg_error (GPG_ERR_NOT_FOUND);
	else if (!(*cert = xtrymalloc (buflen)))
	err = gpg_error_from_syserror ();
	else
	{
	memcpy (*cert, buffer, buflen);
	*certlen = buflen;
	err = 0;
	}
	xfree (relptr);
	return err;
	#else
	return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
	#endif
	}


	/* Decide if we use the pinpad of the reader for PIN input according
	to the user preference on the card, and the capability of the
	reader. This routine is only called when the reader has pinpad.
	Returns 0 if we use pinpad, 1 otherwise. */
	static int
	check_pinpad_request (app_t app, pininfo_t *pininfo, int admin_pin)
	{
	if (app->app_local->pinpad.specified == 0) /* No preference on card. */
	{
	if (pininfo->fixedlen == 0) /* Reader has varlen capability. */
	return 0; /* Then, use pinpad. */
	else
	/*
	* Reader has limited capability, and it may not match PIN of
	* the card.
	*/
	return 1;
	}

	if (admin_pin)
	pininfo->fixedlen = app->app_local->pinpad.fixedlen_admin;
	else
	pininfo->fixedlen = app->app_local->pinpad.fixedlen_user;

	if (pininfo->fixedlen == 0 /* User requests disable pinpad. */
	\|\| pininfo->fixedlen < pininfo->minlen
	\|\| pininfo->fixedlen > pininfo->maxlen
	/* Reader doesn't have the capability to input a PIN which
	* length is FIXEDLEN. */)
	return 1;

	return 0;
	}


	/* Return a string with information about the card for use in a
	* prompt. Returns NULL on memory failure. */
	static char *
	get_prompt_info (app_t app, int chvno, unsigned long sigcount, int remaining)
	{
	char serial, disp_name, rembuf, tmpbuf, *result;

	serial = get_disp_serialno (app);
	if (!serial)
	return NULL;

	disp_name = get_disp_name (app);
	if (chvno == 1)
	{
	/* TRANSLATORS: Put a \x1f right before a colon. This can be
	* used by pinentry to nicely align the names and values. Keep
	* the %s at the start and end of the string. */
	result = xtryasprintf (_("%s"
	"Number\x1f: %s%%0A"
	"Holder\x1f: %s%%0A"
	"Counter\x1f: %lu"
	"%s"),
	"\x1e",
	serial,
	disp_name? disp_name:"",
	sigcount,
	"");
	}
	else
	{
	result = xtryasprintf (_("%s"
	"Number\x1f: %s%%0A"
	"Holder\x1f: %s"
	"%s"),
	"\x1e",
	serial,
	disp_name? disp_name:"",
	"");
	}
	xfree (disp_name);
	xfree (serial);

	if (remaining != -1)
	{
	/* TRANSLATORS: This is the number of remaining attempts to
	* enter a PIN. Use %%0A (double-percent,0A) for a linefeed. */
	rembuf = xtryasprintf (_("Remaining attempts: %d"), remaining);
	if (!rembuf)
	{
	xfree (result);
	return NULL;
	}
	tmpbuf = strconcat (result, "%0A%0A", rembuf, NULL);
	xfree (rembuf);
	if (!tmpbuf)
	{
	xfree (result);
	return NULL;
	}
	xfree (result);
	result = tmpbuf;
	}

	return result;
	}

	#define KDF_DATA_LENGTH_MIN 90
	#define KDF_DATA_LENGTH_MAX 110

	/* Compute hash if KDF-DO is available. CHVNO must be 0 for reset
	code, 1 or 2 for user pin and 3 for admin pin.
	*/
	static gpg_error_t
	pin2hash_if_kdf (app_t app, int chvno, char pinvalue, int r_pinlen)
	{
	gpg_error_t err = 0;
	void *relptr = NULL;
	unsigned char *buffer;
	size_t buflen;

	if (app->app_local->extcap.kdf_do
	&& (relptr = get_one_do (app, 0x00F9, &buffer, &buflen, NULL))
	&& buflen >= KDF_DATA_LENGTH_MIN && (buffer[2] == 0x03))
	{
	const char *salt;
	unsigned long s2k_count;
	char dek[32];
	int salt_index;

	s2k_count = (((unsigned int)buffer[8] << 24)
	\| (buffer[9] << 16) \| (buffer[10] << 8) \| buffer[11]);

	if (buflen == KDF_DATA_LENGTH_MIN)
	salt_index =14;
	else if (buflen == KDF_DATA_LENGTH_MAX)
	salt_index = (chvno==3 ? 34 : (chvno==0 ? 24 : 14));
	else
	{
	err = gpg_error (GPG_ERR_INV_DATA);
	goto leave;
	}

	salt = &buffer[salt_index];
	err = gcry_kdf_derive (pinvalue, strlen (pinvalue),
	GCRY_KDF_ITERSALTED_S2K,
	DIGEST_ALGO_SHA256, salt, 8,
	s2k_count, sizeof (dek), dek);
	if (!err)
	{
	/* pinvalue has a buffer of MAXLEN_PIN+1, 32 is OK. */
	*r_pinlen = 32;
	memcpy (pinvalue, dek, *r_pinlen);
	wipememory (dek, *r_pinlen);
	}
	}
	else
	*r_pinlen = strlen (pinvalue);

	leave:
	xfree (relptr);
	return err;
	}


	/* Verify a CHV either using the pinentry or if possible by
	using a pinpad. PINCB and PINCB_ARG describe the usual callback
	for the pinentry. CHVNO must be either 1 or 2. SIGCOUNT is only
	used with CHV1. PINVALUE is the address of a pointer which will
	receive a newly allocated block with the actual PIN (this is useful
	in case that PIN shall be used for another verify operation). The
	caller needs to free this value. If the function returns with
	success and NULL is stored at PINVALUE, the caller should take this
	as an indication that the pinpad has been used.
	*/
	static gpg_error_t
	verify_a_chv (app_t app,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg, int chvno, unsigned long sigcount,
	char *pinvalue, int pinlen)
	{
	int rc = 0;
	char *prompt_buffer = NULL;
	const char *prompt;
	pininfo_t pininfo;
	int minlen = 6;
	int remaining;

	log_assert (chvno == 1 \|\| chvno == 2);

	*pinvalue = NULL;
	*pinlen = 0;

	remaining = get_remaining_tries (app, 0);
	if (remaining == -1)
	return gpg_error (GPG_ERR_CARD);

	if (chvno == 2 && app->app_local->flags.def_chv2)
	{
	/* Special case for def_chv2 mechanism. */
	if (opt.verbose)
	log_info (_("using default PIN as %s\n"), "CHV2");
	rc = iso7816_verify (app->slot, 0x82, "123456", 6);
	if (rc)
	{
	/* Verification of CHV2 with the default PIN failed,
	although the card pretends to have the default PIN set as
	CHV2. We better disable the def_chv2 flag now. */
	log_info (_("failed to use default PIN as %s: %s"
	" - disabling further default use\n"),
	"CHV2", gpg_strerror (rc));
	app->app_local->flags.def_chv2 = 0;
	}
	return rc;
	}

	memset (&pininfo, 0, sizeof pininfo);
	pininfo.fixedlen = -1;
	pininfo.minlen = minlen;

	{
	const char *firstline = _("\|\|Please unlock the card");
	char *infoblock = get_prompt_info (app, chvno, sigcount,
	remaining < 3? remaining : -1);

	prompt_buffer = strconcat (firstline, "%0A%0A", infoblock, NULL);
	if (prompt_buffer)
	prompt = prompt_buffer;
	else
	prompt = firstline; /* ENOMEM fallback. */

	xfree (infoblock);
	}

	if (!opt.disable_pinpad
	&& !iso7816_check_pinpad (app->slot, ISO7816_VERIFY, &pininfo)
	&& !check_pinpad_request (app, &pininfo, 0))
	{
	/* The reader supports the verify command through the pinpad.
	Note that the pincb appends a text to the prompt telling the
	user to use the pinpad. */
	rc = pincb (pincb_arg, prompt, NULL);
	prompt = NULL;
	xfree (prompt_buffer);
	prompt_buffer = NULL;
	if (rc)
	{
	log_info (_("PIN callback returned error: %s\n"),
	gpg_strerror (rc));
	return rc;
	}
	rc = iso7816_verify_kp (app->slot, 0x80+chvno, &pininfo);
	/* Dismiss the prompt. */
	pincb (pincb_arg, NULL, NULL);

	log_assert (!*pinvalue);
	}
	else
	{
	/* The reader has no pinpad or we don't want to use it. */
	rc = pincb (pincb_arg, prompt, pinvalue);
	prompt = NULL;
	xfree (prompt_buffer);
	prompt_buffer = NULL;
	if (rc)
	{
	log_info (_("PIN callback returned error: %s\n"),
	gpg_strerror (rc));
	return rc;
	}

	if (strlen (*pinvalue) < minlen)
	{
	log_error (_("PIN for CHV%d is too short;"
	" minimum length is %d\n"), chvno, minlen);
	xfree (*pinvalue);
	*pinvalue = NULL;
	return gpg_error (GPG_ERR_BAD_PIN);
	}

	rc = pin2hash_if_kdf (app, chvno, *pinvalue, pinlen);
	if (!rc)
	rc = iso7816_verify (app->slot, 0x80+chvno, pinvalue, pinlen);
	}

	if (rc)
	{
	log_error (_("verify CHV%d failed: %s\n"), chvno, gpg_strerror (rc));
	xfree (*pinvalue);
	*pinvalue = NULL;
	flush_cache_after_error (app);
	}

	return rc;
	}


	/* Verify CHV2 if required. Depending on the configuration of the
	card CHV1 will also be verified. */
	static gpg_error_t
	verify_chv2 (app_t app,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	int rc;
	char *pinvalue;
	int pinlen;

	if (app->did_chv2)
	return 0; /* We already verified CHV2. */

	rc = verify_a_chv (app, pincb, pincb_arg, 2, 0, &pinvalue, &pinlen);
	if (rc)
	return rc;
	app->did_chv2 = 1;

	if (!app->did_chv1 && !app->force_chv1 && pinvalue)
	{
	/* For convenience we verify CHV1 here too. We do this only if
	the card is not configured to require a verification before
	each CHV1 controlled operation (force_chv1) and if we are not
	using the pinpad (PINVALUE == NULL). */
	rc = iso7816_verify (app->slot, 0x81, pinvalue, pinlen);
	if (gpg_err_code (rc) == GPG_ERR_BAD_PIN)
	rc = gpg_error (GPG_ERR_PIN_NOT_SYNCED);
	if (rc)
	{
	log_error (_("verify CHV%d failed: %s\n"), 1, gpg_strerror (rc));
	flush_cache_after_error (app);
	}
	else
	app->did_chv1 = 1;
	}

	xfree (pinvalue);

	return rc;
	}


	/* Build the prompt to enter the Admin PIN. The prompt depends on the
	current sdtate of the card. */
	static gpg_error_t
	build_enter_admin_pin_prompt (app_t app, char **r_prompt)
	{
	int remaining;
	char *prompt;
	char *infoblock;

	*r_prompt = NULL;

	remaining = get_remaining_tries (app, 1);
	if (remaining == -1)
	return gpg_error (GPG_ERR_CARD);
	if (!remaining)
	{
	log_info (_("card is permanently locked!\n"));
	return gpg_error (GPG_ERR_BAD_PIN);
	}

	log_info (ngettext("%d Admin PIN attempt remaining before card"
	" is permanently locked\n",
	"%d Admin PIN attempts remaining before card"
	" is permanently locked\n",
	remaining), remaining);

	infoblock = get_prompt_info (app, 3, 0, remaining < 3? remaining : -1);

	/* TRANSLATORS: Do not translate the "\|A\|" prefix but keep it at
	the start of the string. Use %0A (single percent) for a linefeed. */
	prompt = strconcat (_("\|A\|Please enter the Admin PIN"),
	"%0A%0A", infoblock, NULL);
	xfree (infoblock);
	if (!prompt)
	return gpg_error_from_syserror ();

	*r_prompt = prompt;
	return 0;
	}


	/* Verify CHV3 if required. */
	static gpg_error_t
	verify_chv3 (app_t app,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	int rc = 0;

	#if GNUPG_MAJOR_VERSION != 1
	if (!opt.allow_admin)
	{
	log_info (_("access to admin commands is not configured\n"));
	return gpg_error (GPG_ERR_EACCES);
	}
	#endif

	if (!app->did_chv3)
	{
	pininfo_t pininfo;
	int minlen = 8;
	char *prompt;

	memset (&pininfo, 0, sizeof pininfo);
	pininfo.fixedlen = -1;
	pininfo.minlen = minlen;

	rc = build_enter_admin_pin_prompt (app, &prompt);
	if (rc)
	return rc;

	if (!opt.disable_pinpad
	&& !iso7816_check_pinpad (app->slot, ISO7816_VERIFY, &pininfo)
	&& !check_pinpad_request (app, &pininfo, 1))
	{
	/* The reader supports the verify command through the pinpad. */
	rc = pincb (pincb_arg, prompt, NULL);
	xfree (prompt);
	prompt = NULL;
	if (rc)
	{
	log_info (_("PIN callback returned error: %s\n"),
	gpg_strerror (rc));
	return rc;
	}
	rc = iso7816_verify_kp (app->slot, 0x83, &pininfo);
	/* Dismiss the prompt. */
	pincb (pincb_arg, NULL, NULL);
	}
	else
	{
	char *pinvalue;
	int pinlen;

	rc = pincb (pincb_arg, prompt, &pinvalue);
	xfree (prompt);
	prompt = NULL;
	if (rc)
	{
	log_info (_("PIN callback returned error: %s\n"),
	gpg_strerror (rc));
	return rc;
	}

	if (strlen (pinvalue) < minlen)
	{
	log_error (_("PIN for CHV%d is too short;"
	" minimum length is %d\n"), 3, minlen);
	xfree (pinvalue);
	return gpg_error (GPG_ERR_BAD_PIN);
	}

	rc = pin2hash_if_kdf (app, 3, pinvalue, &pinlen);
	if (!rc)
	rc = iso7816_verify (app->slot, 0x83, pinvalue, pinlen);
	xfree (pinvalue);
	}

	if (rc)
	{
	log_error (_("verify CHV%d failed: %s\n"), 3, gpg_strerror (rc));
	flush_cache_after_error (app);
	return rc;
	}
	app->did_chv3 = 1;
	}
	return rc;
	}


	/* Handle the SETATTR operation. All arguments are already basically
	checked. */
	static gpg_error_t
	do_setattr (app_t app, const char *name,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const unsigned char *value, size_t valuelen)
	{
	gpg_error_t rc;
	int idx;
	static struct {
	const char *name;
	int tag;
	int flush_tag; /* The tag which needs to be flushed or 0. */
	int need_chv;
	int special;
	unsigned int need_v2:1;
	} table[] = {
	{ "DISP-NAME", 0x005B, 0, 3 },
	{ "LOGIN-DATA", 0x005E, 0, 3, 2 },
	{ "DISP-LANG", 0x5F2D, 0, 3 },
	{ "DISP-SEX", 0x5F35, 0, 3 },
	{ "PUBKEY-URL", 0x5F50, 0, 3 },
	{ "CHV-STATUS-1", 0x00C4, 0, 3, 1 },
	{ "CA-FPR-1", 0x00CA, 0x00C6, 3 },
	{ "CA-FPR-2", 0x00CB, 0x00C6, 3 },
	{ "CA-FPR-3", 0x00CC, 0x00C6, 3 },
	{ "PRIVATE-DO-1", 0x0101, 0, 2 },
	{ "PRIVATE-DO-2", 0x0102, 0, 3 },
	{ "PRIVATE-DO-3", 0x0103, 0, 2 },
	{ "PRIVATE-DO-4", 0x0104, 0, 3 },
	{ "CERT-3", 0x7F21, 0, 3, 0, 1 },
	{ "SM-KEY-ENC", 0x00D1, 0, 3, 0, 1 },
	{ "SM-KEY-MAC", 0x00D2, 0, 3, 0, 1 },
	{ "KEY-ATTR", 0, 0, 0, 3, 1 },
	{ "AESKEY", 0x00D5, 0, 3, 0, 1 },
	{ "UIF-1", 0x00D6, 0, 3, 5, 1 },
	{ "UIF-2", 0x00D7, 0, 3, 5, 1 },
	{ "UIF-3", 0x00D8, 0, 3, 5, 1 },
	{ "KDF", 0x00F9, 0, 3, 4, 1 },
	{ NULL, 0 }
	};
	int exmode;

	for (idx=0; table[idx].name && strcmp (table[idx].name, name); idx++)
	;
	if (!table[idx].name)
	return gpg_error (GPG_ERR_INV_NAME);
	if (table[idx].need_v2 && !app->app_local->extcap.is_v2)
	return gpg_error (GPG_ERR_NOT_SUPPORTED); /* Not yet supported. */

	if (table[idx].special == 5 && app->app_local->extcap.has_button == 0)
	return gpg_error (GPG_ERR_INV_OBJ);

	if (table[idx].special == 3)
	return change_keyattr_from_string (app, pincb, pincb_arg, value, valuelen);

	switch (table[idx].need_chv)
	{
	case 2:
	rc = verify_chv2 (app, pincb, pincb_arg);
	break;
	case 3:
	rc = verify_chv3 (app, pincb, pincb_arg);
	break;
	default:
	rc = 0;
	}
	if (rc)
	return rc;

	/* Flush the cache before writing it, so that the next get operation
	will reread the data from the card and thus get synced in case of
	errors (e.g. data truncated by the card). */
	flush_cache_item (app, table[idx].flush_tag? table[idx].flush_tag
	/* */ : table[idx].tag);

	if (app->app_local->cardcap.ext_lc_le && valuelen > 254)
	exmode = 1; /* Use extended length w/o a limit. */
	else if (app->app_local->cardcap.cmd_chaining && valuelen > 254)
	exmode = -254; /* Command chaining with max. 254 bytes. */
	else
	exmode = 0;
	rc = iso7816_put_data (app->slot, exmode, table[idx].tag, value, valuelen);
	if (rc)
	log_error ("failed to set '%s': %s\n", table[idx].name, gpg_strerror (rc));

	if (table[idx].special == 1)
	app->force_chv1 = (valuelen && *value == 0);
	else if (table[idx].special == 2)
	parse_login_data (app);
	else if (table[idx].special == 4)
	{
	app->did_chv1 = 0;
	app->did_chv2 = 0;
	app->did_chv3 = 0;
	}

	return rc;
	}


	/* Handle the WRITECERT command for OpenPGP. This writes the standard
	* certificate to the card; CERTID needs to be set to "OPENPGP.3".
	* PINCB and PINCB_ARG are the usual arguments for the pinentry
	* callback. */
	static gpg_error_t
	do_writecert (app_t app, ctrl_t ctrl,
	const char *certidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const unsigned char *certdata, size_t certdatalen)
	{
	(void)ctrl;
	#if GNUPG_MAJOR_VERSION > 1
	if (strcmp (certidstr, "OPENPGP.3"))
	return gpg_error (GPG_ERR_INV_ID);
	if (!certdata \|\| !certdatalen)
	return gpg_error (GPG_ERR_INV_ARG);
	if (!app->app_local->extcap.is_v2)
	return gpg_error (GPG_ERR_NOT_SUPPORTED);
	if (certdatalen > app->app_local->extcap.max_certlen_3)
	return gpg_error (GPG_ERR_TOO_LARGE);
	return do_setattr (app, "CERT-3", pincb, pincb_arg, certdata, certdatalen);
	#else
	return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
	#endif
	}



	/* Handle the PASSWD command. The following combinations are
	possible:

	Flags CHVNO Vers. Description
	RESET 1 1 Verify CHV3 and set a new CHV1 and CHV2
	RESET 1 2 Verify PW3 and set a new PW1.
	RESET 2 1 Verify CHV3 and set a new CHV1 and CHV2.
	RESET 2 2 Verify PW3 and set a new Reset Code.
	RESET 3 any Returns GPG_ERR_INV_ID.
	- 1 1 Verify CHV2 and set a new CHV1 and CHV2.
	- 1 2 Verify PW1 and set a new PW1.
	- 2 1 Verify CHV2 and set a new CHV1 and CHV2.
	- 2 2 Verify Reset Code and set a new PW1.
	- 3 any Verify CHV3/PW3 and set a new CHV3/PW3.

	The CHVNO can be prefixed with "OPENPGP.".
	*/
	static gpg_error_t
	do_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr,
	unsigned int flags,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	int rc = 0;
	int chvno;
	char *resetcode = NULL;
	char *oldpinvalue = NULL;
	char *pinvalue = NULL;
	int reset_mode = !!(flags & APP_CHANGE_FLAG_RESET);
	int set_resetcode = 0;
	pininfo_t pininfo;
	int use_pinpad = 0;
	int minlen = 6;
	int pinlen0 = 0;
	int pinlen = 0;

	(void)ctrl;

	if (digitp (chvnostr))
	chvno = atoi (chvnostr);
	else if (!ascii_strcasecmp (chvnostr, "OPENPGP.1"))
	chvno = 1;
	else if (!ascii_strcasecmp (chvnostr, "OPENPGP.2"))
	chvno = 2;
	else if (!ascii_strcasecmp (chvnostr, "OPENPGP.3"))
	chvno = 3;
	else
	return gpg_error (GPG_ERR_INV_ID);

	memset (&pininfo, 0, sizeof pininfo);
	pininfo.fixedlen = -1;
	pininfo.minlen = minlen;

	if ((flags & APP_CHANGE_FLAG_CLEAR))
	{
	unsigned char apdu[4];

	if (!app->app_local->extcap.is_v2)
	return GPG_ERR_UNSUPPORTED_OPERATION;

	apdu[0] = 0x00;
	apdu[1] = ISO7816_VERIFY;
	apdu[2] = 0xff;
	apdu[3] = 0x80+chvno;

	rc = iso7816_apdu_direct (app->slot, apdu, 4, 0, NULL, NULL, NULL);
	if (rc)
	{
	if (rc == GPG_ERR_INV_VALUE)
	rc = GPG_ERR_UNSUPPORTED_OPERATION;
	return rc;
	}

	if (chvno == 1)
	{
	apdu[3]++;
	rc = iso7816_apdu_direct (app->slot, apdu, 4, 0, NULL, NULL, NULL);
	app->did_chv1 = app->did_chv2 = 0;
	}
	else if (chvno == 2)
	app->did_chv2 = 0;
	else if (chvno == 3)
	app->did_chv3 = 0;

	return rc;
	}

	if (reset_mode && chvno == 3)
	{
	rc = gpg_error (GPG_ERR_INV_ID);
	goto leave;
	}

	if (!app->app_local->extcap.is_v2)
	{
	/* Version 1 cards. */

	if (reset_mode \|\| chvno == 3)
	{
	/* We always require that the PIN is entered. */
	app->did_chv3 = 0;
	rc = verify_chv3 (app, pincb, pincb_arg);
	if (rc)
	goto leave;
	}
	else if (chvno == 1 \|\| chvno == 2)
	{
	/* On a v1.x card CHV1 and CVH2 should always have the same
	value, thus we enforce it here. */
	int save_force = app->force_chv1;

	app->force_chv1 = 0;
	app->did_chv1 = 0;
	app->did_chv2 = 0;
	rc = verify_chv2 (app, pincb, pincb_arg);
	app->force_chv1 = save_force;
	if (rc)
	goto leave;
	}
	else
	{
	rc = gpg_error (GPG_ERR_INV_ID);
	goto leave;
	}
	}
	else
	{
	/* Version 2 cards. */

	if (!opt.disable_pinpad
	&& !iso7816_check_pinpad (app->slot,
	ISO7816_CHANGE_REFERENCE_DATA, &pininfo)
	&& !check_pinpad_request (app, &pininfo, chvno == 3))
	use_pinpad = 1;

	if (reset_mode)
	{
	/* To reset a PIN the Admin PIN is required. */
	use_pinpad = 0;
	app->did_chv3 = 0;
	rc = verify_chv3 (app, pincb, pincb_arg);
	if (rc)
	goto leave;

	if (chvno == 2)
	set_resetcode = 1;
	}
	else if (chvno == 1 \|\| chvno == 3)
	{
	if (!use_pinpad)
	{
	char *promptbuf = NULL;
	const char *prompt;

	if (chvno == 3)
	{
	minlen = 8;
	rc = build_enter_admin_pin_prompt (app, &promptbuf);
	if (rc)
	goto leave;
	prompt = promptbuf;
	}
	else
	prompt = _("\|\|Please enter the PIN");
	rc = pincb (pincb_arg, prompt, &oldpinvalue);
	xfree (promptbuf);
	promptbuf = NULL;
	if (rc)
	{
	log_info (_("PIN callback returned error: %s\n"),
	gpg_strerror (rc));
	goto leave;
	}

	if (strlen (oldpinvalue) < minlen)
	{
	log_info (_("PIN for CHV%d is too short;"
	" minimum length is %d\n"), chvno, minlen);
	rc = gpg_error (GPG_ERR_BAD_PIN);
	goto leave;
	}
	}
	}
	else if (chvno == 2)
	{
	/* There is no PW2 for v2 cards. We use this condition to
	allow a PW reset using the Reset Code. */
	void *relptr;
	unsigned char *value;
	size_t valuelen;
	int remaining;

	use_pinpad = 0;
	minlen = 8;
	relptr = get_one_do (app, 0x00C4, &value, &valuelen, NULL);
	if (!relptr \|\| valuelen < 7)
	{
	log_error (_("error retrieving CHV status from card\n"));
	xfree (relptr);
	rc = gpg_error (GPG_ERR_CARD);
	goto leave;
	}
	remaining = value[5];
	xfree (relptr);
	if (!remaining)
	{
	log_error (_("Reset Code not or not anymore available\n"));
	rc = gpg_error (GPG_ERR_BAD_PIN);
	goto leave;
	}

	rc = pincb (pincb_arg,
	_("\|\|Please enter the Reset Code for the card"),
	&resetcode);
	if (rc)
	{
	log_info (_("PIN callback returned error: %s\n"),
	gpg_strerror (rc));
	goto leave;
	}
	if (strlen (resetcode) < minlen)
	{
	log_info (_("Reset Code is too short; minimum length is %d\n"),
	minlen);
	rc = gpg_error (GPG_ERR_BAD_PIN);
	goto leave;
	}
	}
	else
	{
	rc = gpg_error (GPG_ERR_INV_ID);
	goto leave;
	}
	}

	if (chvno == 3)
	app->did_chv3 = 0;
	else
	app->did_chv1 = app->did_chv2 = 0;

	if (!use_pinpad)
	{
	/* TRANSLATORS: Do not translate the "\|*\|" prefixes but
	keep it at the start of the string. We need this elsewhere
	to get some infos on the string. */
	rc = pincb (pincb_arg, set_resetcode? _("\|RN\|New Reset Code") :
	chvno == 3? _("\|AN\|New Admin PIN") : _("\|N\|New PIN"),
	&pinvalue);
	if (rc \|\| pinvalue == NULL)
	{
	log_error (_("error getting new PIN: %s\n"), gpg_strerror (rc));
	goto leave;
	}
	}


	if (resetcode)
	{
	char *buffer;

	buffer = xtrymalloc (strlen (resetcode) + strlen (pinvalue) + 1);
	if (!buffer)
	rc = gpg_error_from_syserror ();
	else
	{
	strcpy (buffer, resetcode);
	rc = pin2hash_if_kdf (app, 0, buffer, &pinlen0);
	if (!rc)
	{
	strcpy (buffer+pinlen0, pinvalue);
	rc = pin2hash_if_kdf (app, 0, buffer+pinlen0, &pinlen);
	}
	if (!rc)
	rc = iso7816_reset_retry_counter_with_rc (app->slot, 0x81,
	buffer, pinlen0+pinlen);
	wipememory (buffer, pinlen0 + pinlen);
	xfree (buffer);
	}
	}
	else if (set_resetcode)
	{
	if (strlen (pinvalue) < 8)
	{
	log_error (_("Reset Code is too short; minimum length is %d\n"), 8);
	rc = gpg_error (GPG_ERR_BAD_PIN);
	}
	else
	{
	rc = pin2hash_if_kdf (app, 0, pinvalue, &pinlen);
	if (!rc)
	rc = iso7816_put_data (app->slot, 0, 0xD3, pinvalue, pinlen);
	}
	}
	else if (reset_mode)
	{
	rc = pin2hash_if_kdf (app, 1, pinvalue, &pinlen);
	if (!rc)
	rc = iso7816_reset_retry_counter (app->slot, 0x81, pinvalue, pinlen);
	if (!rc && !app->app_local->extcap.is_v2)
	rc = iso7816_reset_retry_counter (app->slot, 0x82, pinvalue, pinlen);
	}
	else if (!app->app_local->extcap.is_v2)
	{
	/* Version 1 cards. */
	if (chvno == 1 \|\| chvno == 2)
	{
	rc = iso7816_change_reference_data (app->slot, 0x81, NULL, 0,
	pinvalue, strlen (pinvalue));
	if (!rc)
	rc = iso7816_change_reference_data (app->slot, 0x82, NULL, 0,
	pinvalue, strlen (pinvalue));
	}
	else /* CHVNO == 3 */
	{
	rc = iso7816_change_reference_data (app->slot, 0x80 + chvno, NULL, 0,
	pinvalue, strlen (pinvalue));
	}
	}
	else
	{
	/* Version 2 cards. */
	assert (chvno == 1 \|\| chvno == 3);

	if (use_pinpad)
	{
	rc = pincb (pincb_arg,
	chvno == 3 ?
	_("\|\|Please enter the Admin PIN and New Admin PIN") :
	_("\|\|Please enter the PIN and New PIN"), NULL);
	if (rc)
	{
	log_info (_("PIN callback returned error: %s\n"),
	gpg_strerror (rc));
	goto leave;
	}
	rc = iso7816_change_reference_data_kp (app->slot, 0x80 + chvno, 0,
	&pininfo);
	pincb (pincb_arg, NULL, NULL); /* Dismiss the prompt. */
	}
	else
	{
	rc = pin2hash_if_kdf (app, chvno, oldpinvalue, &pinlen0);
	if (!rc)
	rc = pin2hash_if_kdf (app, chvno, pinvalue, &pinlen);
	if (!rc)
	rc = iso7816_change_reference_data (app->slot, 0x80 + chvno,
	oldpinvalue, pinlen0,
	pinvalue, pinlen);
	}
	}

	if (pinvalue)
	{
	wipememory (pinvalue, pinlen);
	xfree (pinvalue);
	}
	if (rc)
	flush_cache_after_error (app);

	leave:
	if (resetcode)
	{
	wipememory (resetcode, strlen (resetcode));
	xfree (resetcode);
	}
	if (oldpinvalue)
	{
	wipememory (oldpinvalue, pinlen0);
	xfree (oldpinvalue);
	}
	return rc;
	}


	/* Check whether a key already exists. KEYIDX is the index of the key
	(0..2). If FORCE is TRUE a diagnositic will be printed but no
	error returned if the key already exists. The flag GENERATING is
	only used to print correct messages. */
	static gpg_error_t
	does_key_exist (app_t app, int keyidx, int generating, int force)
	{
	const unsigned char *fpr;
	unsigned char *buffer;
	size_t buflen, n;
	int i;

	assert (keyidx >=0 && keyidx <= 2);

	if (iso7816_get_data (app->slot, 0, 0x006E, &buffer, &buflen))
	{
	log_error (_("error reading application data\n"));
	return gpg_error (GPG_ERR_GENERAL);
	}
	fpr = find_tlv (buffer, buflen, 0x00C5, &n);
	if (!fpr \|\| n < 60)
	{
	log_error (_("error reading fingerprint DO\n"));
	xfree (buffer);
	return gpg_error (GPG_ERR_GENERAL);
	}
	fpr += 20*keyidx;
	for (i=0; i < 20 && !fpr[i]; i++)
	;
	xfree (buffer);
	if (i!=20 && !force)
	{
	log_error (_("key already exists\n"));
	return gpg_error (GPG_ERR_EEXIST);
	}
	else if (i!=20)
	log_info (_("existing key will be replaced\n"));
	else if (generating)
	log_info (_("generating new key\n"));
	else
	log_info (_("writing new key\n"));
	return 0;
	}


	/* Create a TLV tag and value and store it at BUFFER. Return the length
	of tag and length. A LENGTH greater than 65535 is truncated. */
	static size_t
	add_tlv (unsigned char *buffer, unsigned int tag, size_t length)
	{
	unsigned char *p = buffer;

	assert (tag <= 0xffff);
	if ( tag > 0xff )
	*p++ = tag >> 8;
	*p++ = tag;
	if (length < 128)
	*p++ = length;
	else if (length < 256)
	{
	*p++ = 0x81;
	*p++ = length;
	}
	else
	{
	if (length > 0xffff)
	length = 0xffff;
	*p++ = 0x82;
	*p++ = length >> 8;
	*p++ = length;
	}

	return p - buffer;
	}


	static gpg_error_t
	build_privkey_template (app_t app, int keyno,
	const unsigned char *rsa_n, size_t rsa_n_len,
	const unsigned char *rsa_e, size_t rsa_e_len,
	const unsigned char *rsa_p, size_t rsa_p_len,
	const unsigned char *rsa_q, size_t rsa_q_len,
	const unsigned char *rsa_u, size_t rsa_u_len,
	const unsigned char *rsa_dp, size_t rsa_dp_len,
	const unsigned char *rsa_dq, size_t rsa_dq_len,
	unsigned char *result, size_t resultlen)
	{
	size_t rsa_e_reqlen;
	unsigned char privkey[7*(1+3+3)];
	size_t privkey_len;
	unsigned char exthdr[2+2+3];
	size_t exthdr_len;
	unsigned char suffix[2+3];
	size_t suffix_len;
	unsigned char *tp;
	size_t datalen;
	unsigned char *template;
	size_t template_size;

	*result = NULL;
	*resultlen = 0;

	switch (app->app_local->keyattr[keyno].rsa.format)
	{
	case RSA_STD:
	case RSA_STD_N:
	case RSA_CRT:
	case RSA_CRT_N:
	break;

	default:
	return gpg_error (GPG_ERR_INV_VALUE);
	}

	/* Get the required length for E. Rounded up to the nearest byte */
	rsa_e_reqlen = (app->app_local->keyattr[keyno].rsa.e_bits + 7) / 8;
	assert (rsa_e_len <= rsa_e_reqlen);

	/* Build the 7f48 cardholder private key template. */
	datalen = 0;
	tp = privkey;

	tp += add_tlv (tp, 0x91, rsa_e_reqlen);
	datalen += rsa_e_reqlen;

	tp += add_tlv (tp, 0x92, rsa_p_len);
	datalen += rsa_p_len;

	tp += add_tlv (tp, 0x93, rsa_q_len);
	datalen += rsa_q_len;

	if (app->app_local->keyattr[keyno].rsa.format == RSA_CRT
	\|\| app->app_local->keyattr[keyno].rsa.format == RSA_CRT_N)
	{
	tp += add_tlv (tp, 0x94, rsa_u_len);
	datalen += rsa_u_len;
	tp += add_tlv (tp, 0x95, rsa_dp_len);
	datalen += rsa_dp_len;
	tp += add_tlv (tp, 0x96, rsa_dq_len);
	datalen += rsa_dq_len;
	}

	if (app->app_local->keyattr[keyno].rsa.format == RSA_STD_N
	\|\| app->app_local->keyattr[keyno].rsa.format == RSA_CRT_N)
	{
	tp += add_tlv (tp, 0x97, rsa_n_len);
	datalen += rsa_n_len;
	}
	privkey_len = tp - privkey;

	/* Build the extended header list without the private key template. */
	tp = exthdr;
	*tp++ = keyno ==0 ? 0xb6 : keyno == 1? 0xb8 : 0xa4;
	*tp++ = 0;
	tp += add_tlv (tp, 0x7f48, privkey_len);
	exthdr_len = tp - exthdr;

	/* Build the 5f48 suffix of the data. */
	tp = suffix;
	tp += add_tlv (tp, 0x5f48, datalen);
	suffix_len = tp - suffix;

	/* Now concatenate everything. */
	template_size = (1 + 3 /* 0x4d and len. */
	+ exthdr_len
	+ privkey_len
	+ suffix_len
	+ datalen);
	tp = template = xtrymalloc_secure (template_size);
	if (!template)
	return gpg_error_from_syserror ();

	tp += add_tlv (tp, 0x4d, exthdr_len + privkey_len + suffix_len + datalen);
	memcpy (tp, exthdr, exthdr_len);
	tp += exthdr_len;
	memcpy (tp, privkey, privkey_len);
	tp += privkey_len;
	memcpy (tp, suffix, suffix_len);
	tp += suffix_len;

	memcpy (tp, rsa_e, rsa_e_len);
	if (rsa_e_len < rsa_e_reqlen)
	{
	/* Right justify E. */
	memmove (tp + rsa_e_reqlen - rsa_e_len, tp, rsa_e_len);
	memset (tp, 0, rsa_e_reqlen - rsa_e_len);
	}
	tp += rsa_e_reqlen;

	memcpy (tp, rsa_p, rsa_p_len);
	tp += rsa_p_len;

	memcpy (tp, rsa_q, rsa_q_len);
	tp += rsa_q_len;

	if (app->app_local->keyattr[keyno].rsa.format == RSA_CRT
	\|\| app->app_local->keyattr[keyno].rsa.format == RSA_CRT_N)
	{
	memcpy (tp, rsa_u, rsa_u_len);
	tp += rsa_u_len;
	memcpy (tp, rsa_dp, rsa_dp_len);
	tp += rsa_dp_len;
	memcpy (tp, rsa_dq, rsa_dq_len);
	tp += rsa_dq_len;
	}

	if (app->app_local->keyattr[keyno].rsa.format == RSA_STD_N
	\|\| app->app_local->keyattr[keyno].rsa.format == RSA_CRT_N)
	{
	memcpy (tp, rsa_n, rsa_n_len);
	tp += rsa_n_len;
	}

	/* Sanity check. We don't know the exact length because we
	allocated 3 bytes for the first length header. */
	assert (tp - template <= template_size);

	*result = template;
	*resultlen = tp - template;
	return 0;
	}

	static gpg_error_t
	build_ecc_privkey_template (app_t app, int keyno,
	const unsigned char *ecc_d, size_t ecc_d_len,
	const unsigned char *ecc_q, size_t ecc_q_len,
	unsigned char *result, size_t resultlen)
	{
	unsigned char privkey[2+2];
	size_t privkey_len;
	unsigned char exthdr[2+2+1];
	size_t exthdr_len;
	unsigned char suffix[2+1];
	size_t suffix_len;
	unsigned char *tp;
	size_t datalen;
	unsigned char *template;
	size_t template_size;
	int pubkey_required;

	pubkey_required = !!(app->app_local->keyattr[keyno].ecc.flags
	& ECC_FLAG_PUBKEY);

	*result = NULL;
	*resultlen = 0;

	/* Build the 7f48 cardholder private key template. */
	datalen = 0;
	tp = privkey;

	tp += add_tlv (tp, 0x92, ecc_d_len);
	datalen += ecc_d_len;

	if (pubkey_required)
	{
	tp += add_tlv (tp, 0x99, ecc_q_len);
	datalen += ecc_q_len;
	}

	privkey_len = tp - privkey;


	/* Build the extended header list without the private key template. */
	tp = exthdr;
	*tp++ = keyno ==0 ? 0xb6 : keyno == 1? 0xb8 : 0xa4;
	*tp++ = 0;
	tp += add_tlv (tp, 0x7f48, privkey_len);
	exthdr_len = tp - exthdr;

	/* Build the 5f48 suffix of the data. */
	tp = suffix;
	tp += add_tlv (tp, 0x5f48, datalen);
	suffix_len = tp - suffix;

	/* Now concatenate everything. */
	template_size = (1 + 1 /* 0x4d and len. */
	+ exthdr_len
	+ privkey_len
	+ suffix_len
	+ datalen);
	if (exthdr_len + privkey_len + suffix_len + datalen >= 128)
	template_size++;
	tp = template = xtrymalloc_secure (template_size);
	if (!template)
	return gpg_error_from_syserror ();

	tp += add_tlv (tp, 0x4d, exthdr_len + privkey_len + suffix_len + datalen);
	memcpy (tp, exthdr, exthdr_len);
	tp += exthdr_len;
	memcpy (tp, privkey, privkey_len);
	tp += privkey_len;
	memcpy (tp, suffix, suffix_len);
	tp += suffix_len;

	memcpy (tp, ecc_d, ecc_d_len);
	tp += ecc_d_len;

	if (pubkey_required)
	{
	memcpy (tp, ecc_q, ecc_q_len);
	tp += ecc_q_len;
	}

	assert (tp - template == template_size);

	*result = template;
	*resultlen = tp - template;
	return 0;
	}


	/* Helper for do_writekley to change the size of a key. Not ethat
	this deletes the entire key without asking. */
	static gpg_error_t
	change_keyattr (app_t app, int keyno, const unsigned char *buf, size_t buflen,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	gpg_error_t err;

	assert (keyno >=0 && keyno <= 2);

	/* Prepare for storing the key. */
	err = verify_chv3 (app, pincb, pincb_arg);
	if (err)
	return err;

	/* Change the attribute. */
	err = iso7816_put_data (app->slot, 0, 0xC1+keyno, buf, buflen);
	if (err)
	log_error ("error changing key attribute (key=%d)\n", keyno+1);
	else
	log_info ("key attribute changed (key=%d)\n", keyno+1);
	flush_cache (app);
	parse_algorithm_attribute (app, keyno);
	app->did_chv1 = 0;
	app->did_chv2 = 0;
	app->did_chv3 = 0;
	return err;
	}


	static gpg_error_t
	change_rsa_keyattr (app_t app, int keyno, unsigned int nbits,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	gpg_error_t err = 0;
	unsigned char *buf;
	size_t buflen;
	void *relptr;

	/* Read the current attributes into a buffer. */
	relptr = get_one_do (app, 0xC1+keyno, &buf, &buflen, NULL);
	if (!relptr)
	err = gpg_error (GPG_ERR_CARD);
	else if (buflen < 6)
	{
	/* Attributes too short. */
	xfree (relptr);
	err = gpg_error (GPG_ERR_CARD);
	}
	else
	{
	/* If key attribute was RSA, we only change n_bits and don't
	touch anything else. Before we do so, we round up NBITS to a
	sensible way in the same way as gpg's key generation does it.
	This may help to sort out problems with a few bits too short
	keys. */
	nbits = ((nbits + 31) / 32) * 32;
	buf[1] = (nbits >> 8);
	buf[2] = nbits;

	/* If it was not RSA, we need to fill other parts. */
	if (buf[0] != PUBKEY_ALGO_RSA)
	{
	buf[0] = PUBKEY_ALGO_RSA;
	buf[3] = 0;
	buf[4] = 32;
	buf[5] = 0;
	buflen = 6;
	}

	err = change_keyattr (app, keyno, buf, buflen, pincb, pincb_arg);
	xfree (relptr);
	}

	return err;
	}


	/* Helper to process an setattr command for name KEY-ATTR.
	In (VALUE,VALUELEN), it expects following string:
	RSA: "--force <key> <algo> rsa<nbits>"
	ECC: "--force <key> <algo> <curvename>"
	*/
	static gpg_error_t
	change_keyattr_from_string (app_t app,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *value, size_t valuelen)
	{
	gpg_error_t err = 0;
	char *string;
	int key, keyno, algo;
	int n = 0;

	/* VALUE is expected to be a string but not guaranteed to be
	terminated. Thus copy it to an allocated buffer first. */
	string = xtrymalloc (valuelen+1);
	if (!string)
	return gpg_error_from_syserror ();
	memcpy (string, value, valuelen);
	string[valuelen] = 0;

	/* Because this function deletes the key we require the string
	"--force" in the data to make clear that something serious might
	happen. */
	sscanf (string, "--force %d %d %n", &key, &algo, &n);
	if (n < 12)
	{
	err = gpg_error (GPG_ERR_INV_DATA);
	goto leave;
	}

	keyno = key - 1;
	if (keyno < 0 \|\| keyno > 2)
	err = gpg_error (GPG_ERR_INV_ID);
	else if (algo == PUBKEY_ALGO_RSA)
	{
	unsigned int nbits;

	errno = 0;
	nbits = strtoul (string+n+3, NULL, 10);
	if (errno)
	err = gpg_error (GPG_ERR_INV_DATA);
	else if (nbits < 1024)
	err = gpg_error (GPG_ERR_TOO_SHORT);
	else if (nbits > 4096)
	err = gpg_error (GPG_ERR_TOO_LARGE);
	else
	err = change_rsa_keyattr (app, keyno, nbits, pincb, pincb_arg);
	}
	else if (algo == PUBKEY_ALGO_ECDH \|\| algo == PUBKEY_ALGO_ECDSA
	\|\| algo == PUBKEY_ALGO_EDDSA)
	{
	const char *oidstr;
	gcry_mpi_t oid;
	const unsigned char *oidbuf;
	size_t oid_len;

	oidstr = openpgp_curve_to_oid (string+n, NULL);
	if (!oidstr)
	{
	err = gpg_error (GPG_ERR_INV_DATA);
	goto leave;
	}

	err = openpgp_oid_from_str (oidstr, &oid);
	if (err)
	goto leave;

	oidbuf = gcry_mpi_get_opaque (oid, &n);
	oid_len = (n+7)/8;

	/* We have enough room at STRING. */
	string[0] = algo;
	memcpy (string+1, oidbuf+1, oid_len-1);
	err = change_keyattr (app, keyno, string, oid_len, pincb, pincb_arg);
	gcry_mpi_release (oid);
	}
	else
	err = gpg_error (GPG_ERR_PUBKEY_ALGO);

	leave:
	xfree (string);
	return err;
	}


	static gpg_error_t
	rsa_writekey (app_t app, gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg, int keyno,
	const unsigned char *buf, size_t buflen, int depth)
	{
	gpg_error_t err;
	const unsigned char *tok;
	size_t toklen;
	int last_depth1, last_depth2;
	const unsigned char *rsa_n = NULL;
	const unsigned char *rsa_e = NULL;
	const unsigned char *rsa_p = NULL;
	const unsigned char *rsa_q = NULL;
	size_t rsa_n_len, rsa_e_len, rsa_p_len, rsa_q_len;
	unsigned int nbits;
	unsigned int maxbits;
	unsigned char *template = NULL;
	unsigned char *tp;
	size_t template_len;
	unsigned char fprbuf[20];
	u32 created_at = 0;

	if (app->app_local->keyattr[keyno].key_type != KEY_TYPE_RSA)
	{
	log_error (_("unsupported algorithm: %s"), "RSA");
	err = gpg_error (GPG_ERR_INV_VALUE);
	goto leave;
	}

	last_depth1 = depth;
	while (!(err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen))
	&& depth && depth >= last_depth1)
	{
	if (tok)
	{
	err = gpg_error (GPG_ERR_UNKNOWN_SEXP);
	goto leave;
	}
	if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
	goto leave;
	if (tok && toklen == 1)
	{
	const unsigned char **mpi;
	size_t *mpi_len;

	switch (*tok)
	{
	case 'n': mpi = &rsa_n; mpi_len = &rsa_n_len; break;
	case 'e': mpi = &rsa_e; mpi_len = &rsa_e_len; break;
	case 'p': mpi = &rsa_p; mpi_len = &rsa_p_len; break;
	case 'q': mpi = &rsa_q; mpi_len = &rsa_q_len;break;
	default: mpi = NULL; mpi_len = NULL; break;
	}
	if (mpi && *mpi)
	{
	err = gpg_error (GPG_ERR_DUP_VALUE);
	goto leave;
	}
	if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
	goto leave;
	if (tok && mpi)
	{
	/* Strip off leading zero bytes and save. */
	for (;toklen && !*tok; toklen--, tok++)
	;
	*mpi = tok;
	*mpi_len = toklen;
	}
	}
	/* Skip until end of list. */
	last_depth2 = depth;
	while (!(err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen))
	&& depth && depth >= last_depth2)
	;
	if (err)
	goto leave;
	}
	/* Parse other attributes. */
	last_depth1 = depth;
	while (!(err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen))
	&& depth && depth >= last_depth1)
	{
	if (tok)
	{
	err = gpg_error (GPG_ERR_UNKNOWN_SEXP);
	goto leave;
	}
	if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
	goto leave;
	if (tok && toklen == 10 && !memcmp ("created-at", tok, toklen))
	{
	if ((err = parse_sexp (&buf,&buflen,&depth,&tok,&toklen)))
	goto leave;
	if (tok)
	{
	for (created_at=0; toklen && tok && tok >= '0' && *tok <= '9';
	tok++, toklen--)
	created_at = created_at10 + (tok - '0');
	}
	}
	/* Skip until end of list. */
	last_depth2 = depth;
	while (!(err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen))
	&& depth && depth >= last_depth2)
	;
	if (err)
	goto leave;
	}


	/* Check that we have all parameters and that they match the card
	description. */
	if (!created_at)
	{
	log_error (_("creation timestamp missing\n"));
	err = gpg_error (GPG_ERR_INV_VALUE);
	goto leave;
	}

	maxbits = app->app_local->keyattr[keyno].rsa.n_bits;
	nbits = rsa_n? count_bits (rsa_n, rsa_n_len) : 0;
	if (opt.verbose)
	log_info ("RSA modulus size is %u bits\n", nbits);
	if (nbits && nbits != maxbits
	&& app->app_local->extcap.algo_attr_change)
	{
	/* Try to switch the key to a new length. */
	err = change_rsa_keyattr (app, keyno, nbits, pincb, pincb_arg);
	if (!err)
	maxbits = app->app_local->keyattr[keyno].rsa.n_bits;
	}
	if (nbits != maxbits)
	{
	log_error (_("RSA modulus missing or not of size %d bits\n"),
	(int)maxbits);
	err = gpg_error (GPG_ERR_BAD_SECKEY);
	goto leave;
	}

	maxbits = app->app_local->keyattr[keyno].rsa.e_bits;
	if (maxbits > 32 && !app->app_local->extcap.is_v2)
	maxbits = 32; /* Our code for v1 does only support 32 bits. */
	nbits = rsa_e? count_bits (rsa_e, rsa_e_len) : 0;
	if (nbits < 2 \|\| nbits > maxbits)
	{
	log_error (_("RSA public exponent missing or larger than %d bits\n"),
	(int)maxbits);
	err = gpg_error (GPG_ERR_BAD_SECKEY);
	goto leave;
	}

	maxbits = app->app_local->keyattr[keyno].rsa.n_bits/2;
	nbits = rsa_p? count_bits (rsa_p, rsa_p_len) : 0;
	if (nbits != maxbits)
	{
	log_error (_("RSA prime %s missing or not of size %d bits\n"),
	"P", (int)maxbits);
	err = gpg_error (GPG_ERR_BAD_SECKEY);
	goto leave;
	}
	nbits = rsa_q? count_bits (rsa_q, rsa_q_len) : 0;
	if (nbits != maxbits)
	{
	log_error (_("RSA prime %s missing or not of size %d bits\n"),
	"Q", (int)maxbits);
	err = gpg_error (GPG_ERR_BAD_SECKEY);
	goto leave;
	}

	/* We need to remove the cached public key. */
	xfree (app->app_local->pk[keyno].key);
	app->app_local->pk[keyno].key = NULL;
	app->app_local->pk[keyno].keylen = 0;
	app->app_local->pk[keyno].read_done = 0;


	if (app->app_local->extcap.is_v2)
	{
	unsigned char rsa_u, rsa_dp, *rsa_dq;
	size_t rsa_u_len, rsa_dp_len, rsa_dq_len;
	gcry_mpi_t mpi_e, mpi_p, mpi_q;
	gcry_mpi_t mpi_u = gcry_mpi_snew (0);
	gcry_mpi_t mpi_dp = gcry_mpi_snew (0);
	gcry_mpi_t mpi_dq = gcry_mpi_snew (0);
	gcry_mpi_t mpi_tmp = gcry_mpi_snew (0);
	int exmode;

	/* Calculate the u, dp and dq components needed by RSA_CRT cards */
	gcry_mpi_scan (&mpi_e, GCRYMPI_FMT_USG, rsa_e, rsa_e_len, NULL);
	gcry_mpi_scan (&mpi_p, GCRYMPI_FMT_USG, rsa_p, rsa_p_len, NULL);
	gcry_mpi_scan (&mpi_q, GCRYMPI_FMT_USG, rsa_q, rsa_q_len, NULL);

	gcry_mpi_invm (mpi_u, mpi_q, mpi_p);
	gcry_mpi_sub_ui (mpi_tmp, mpi_p, 1);
	gcry_mpi_invm (mpi_dp, mpi_e, mpi_tmp);
	gcry_mpi_sub_ui (mpi_tmp, mpi_q, 1);
	gcry_mpi_invm (mpi_dq, mpi_e, mpi_tmp);

	gcry_mpi_aprint (GCRYMPI_FMT_USG, &rsa_u, &rsa_u_len, mpi_u);
	gcry_mpi_aprint (GCRYMPI_FMT_USG, &rsa_dp, &rsa_dp_len, mpi_dp);
	gcry_mpi_aprint (GCRYMPI_FMT_USG, &rsa_dq, &rsa_dq_len, mpi_dq);

	gcry_mpi_release (mpi_e);
	gcry_mpi_release (mpi_p);
	gcry_mpi_release (mpi_q);
	gcry_mpi_release (mpi_u);
	gcry_mpi_release (mpi_dp);
	gcry_mpi_release (mpi_dq);
	gcry_mpi_release (mpi_tmp);

	/* Build the private key template as described in section 4.3.3.7 of
	the OpenPGP card specs version 2.0. */
	err = build_privkey_template (app, keyno,
	rsa_n, rsa_n_len,
	rsa_e, rsa_e_len,
	rsa_p, rsa_p_len,
	rsa_q, rsa_q_len,
	rsa_u, rsa_u_len,
	rsa_dp, rsa_dp_len,
	rsa_dq, rsa_dq_len,
	&template, &template_len);
	xfree(rsa_u);
	xfree(rsa_dp);
	xfree(rsa_dq);

	if (err)
	goto leave;

	/* Prepare for storing the key. */
	err = verify_chv3 (app, pincb, pincb_arg);
	if (err)
	goto leave;

	/* Store the key. */
	if (app->app_local->cardcap.ext_lc_le && template_len > 254)
	exmode = 1; /* Use extended length w/o a limit. */
	else if (app->app_local->cardcap.cmd_chaining && template_len > 254)
	exmode = -254;
	else
	exmode = 0;
	err = iso7816_put_data_odd (app->slot, exmode, 0x3fff,
	template, template_len);
	}
	else
	{
	/* Build the private key template as described in section 4.3.3.6 of
	the OpenPGP card specs version 1.1:
	0xC0 <length> public exponent
	0xC1 <length> prime p
	0xC2 <length> prime q
	*/
	assert (rsa_e_len <= 4);
	template_len = (1 + 1 + 4
	+ 1 + 1 + rsa_p_len
	+ 1 + 1 + rsa_q_len);
	template = tp = xtrymalloc_secure (template_len);
	if (!template)
	{
	err = gpg_error_from_syserror ();
	goto leave;
	}
	*tp++ = 0xC0;
	*tp++ = 4;
	memcpy (tp, rsa_e, rsa_e_len);
	if (rsa_e_len < 4)
	{
	/* Right justify E. */
	memmove (tp+4-rsa_e_len, tp, rsa_e_len);
	memset (tp, 0, 4-rsa_e_len);
	}
	tp += 4;

	*tp++ = 0xC1;
	*tp++ = rsa_p_len;
	memcpy (tp, rsa_p, rsa_p_len);
	tp += rsa_p_len;

	*tp++ = 0xC2;
	*tp++ = rsa_q_len;
	memcpy (tp, rsa_q, rsa_q_len);
	tp += rsa_q_len;

	assert (tp - template == template_len);

	/* Prepare for storing the key. */
	err = verify_chv3 (app, pincb, pincb_arg);
	if (err)
	goto leave;

	/* Store the key. */
	err = iso7816_put_data (app->slot, 0,
	(app->card_version > 0x0007? 0xE0:0xE9)+keyno,
	template, template_len);
	}
	if (err)
	{
	log_error (_("failed to store the key: %s\n"), gpg_strerror (err));
	goto leave;
	}

	err = store_fpr (app, keyno, created_at, fprbuf, PUBKEY_ALGO_RSA,
	rsa_n, rsa_n_len, rsa_e, rsa_e_len);
	if (err)
	goto leave;


	leave:
	xfree (template);
	return err;
	}


	static gpg_error_t
	ecc_writekey (app_t app, gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg, int keyno,
	const unsigned char *buf, size_t buflen, int depth)
	{
	gpg_error_t err;
	const unsigned char *tok;
	size_t toklen;
	int last_depth1, last_depth2;
	const unsigned char *ecc_q = NULL;
	const unsigned char *ecc_d = NULL;
	size_t ecc_q_len, ecc_d_len;
	const char *curve = NULL;
	u32 created_at = 0;
	const char *oidstr;
	int flag_djb_tweak = 0;
	int algo;
	gcry_mpi_t oid = NULL;
	const unsigned char *oidbuf;
	unsigned int n;
	size_t oid_len;
	unsigned char fprbuf[20];

	/* (private-key(ecc(curve%s)(q%m)(d%m))(created-at%d)):
	curve = "NIST P-256" */
	/* (private-key(ecc(curve%s)(q%m)(d%m))(created-at%d)):
	curve = "secp256k1" */
	/* (private-key(ecc(curve%s)(flags eddsa)(q%m)(d%m))(created-at%d)):
	curve = "Ed25519" */
	last_depth1 = depth;
	while (!(err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen))
	&& depth && depth >= last_depth1)
	{
	if (tok)
	{
	err = gpg_error (GPG_ERR_UNKNOWN_SEXP);
	goto leave;
	}
	if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
	goto leave;

	if (tok && toklen == 5 && !memcmp (tok, "curve", 5))
	{
	char *curve_name;

	if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
	goto leave;

	curve_name = xtrymalloc (toklen+1);
	if (!curve_name)
	{
	err = gpg_error_from_syserror ();
	goto leave;
	}

	memcpy (curve_name, tok, toklen);
	curve_name[toklen] = 0;
	curve = openpgp_is_curve_supported (curve_name, NULL, NULL);
	xfree (curve_name);
	}
	else if (tok && toklen == 5 && !memcmp (tok, "flags", 5))
	{
	if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
	goto leave;

	if (tok)
	{
	if ((toklen == 5 && !memcmp (tok, "eddsa", 5))
	\|\| (toklen == 9 && !memcmp (tok, "djb-tweak", 9)))
	flag_djb_tweak = 1;
	}
	}
	else if (tok && toklen == 1)
	{
	const unsigned char **buf2;
	size_t *buf2len;
	int native = flag_djb_tweak;

	switch (*tok)
	{
	case 'q': buf2 = &ecc_q; buf2len = &ecc_q_len; break;
	case 'd': buf2 = &ecc_d; buf2len = &ecc_d_len; native = 0; break;
	default: buf2 = NULL; buf2len = NULL; break;
	}
	if (buf2 && *buf2)
	{
	err = gpg_error (GPG_ERR_DUP_VALUE);
	goto leave;
	}
	if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
	goto leave;
	if (tok && buf2)
	{
	if (!native)
	/* Strip off leading zero bytes and save. */
	for (;toklen && !*tok; toklen--, tok++)
	;

	*buf2 = tok;
	*buf2len = toklen;
	}
	}
	/* Skip until end of list. */
	last_depth2 = depth;
	while (!(err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen))
	&& depth && depth >= last_depth2)
	;
	if (err)
	goto leave;
	}
	/* Parse other attributes. */
	last_depth1 = depth;
	while (!(err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen))
	&& depth && depth >= last_depth1)
	{
	if (tok)
	{
	err = gpg_error (GPG_ERR_UNKNOWN_SEXP);
	goto leave;
	}
	if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
	goto leave;
	if (tok && toklen == 10 && !memcmp ("created-at", tok, toklen))
	{
	if ((err = parse_sexp (&buf,&buflen,&depth,&tok,&toklen)))
	goto leave;
	if (tok)
	{
	for (created_at=0; toklen && tok && tok >= '0' && *tok <= '9';
	tok++, toklen--)
	created_at = created_at10 + (tok - '0');
	}
	}
	/* Skip until end of list. */
	last_depth2 = depth;
	while (!(err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen))
	&& depth && depth >= last_depth2)
	;
	if (err)
	goto leave;
	}


	/* Check that we have all parameters and that they match the card
	description. */
	if (!curve)
	{
	log_error (_("unsupported curve\n"));
	err = gpg_error (GPG_ERR_INV_VALUE);
	goto leave;
	}
	if (!created_at)
	{
	log_error (_("creation timestamp missing\n"));
	err = gpg_error (GPG_ERR_INV_VALUE);
	goto leave;
	}
	if (flag_djb_tweak && keyno != 1)
	algo = PUBKEY_ALGO_EDDSA;
	else if (keyno == 1)
	algo = PUBKEY_ALGO_ECDH;
	else
	algo = PUBKEY_ALGO_ECDSA;

	oidstr = openpgp_curve_to_oid (curve, NULL);
	err = openpgp_oid_from_str (oidstr, &oid);
	if (err)
	goto leave;
	oidbuf = gcry_mpi_get_opaque (oid, &n);
	if (!oidbuf)
	{
	err = gpg_error_from_syserror ();
	goto leave;
	}
	oid_len = (n+7)/8;

	if (app->app_local->keyattr[keyno].key_type != KEY_TYPE_ECC
	\|\| app->app_local->keyattr[keyno].ecc.curve != curve
	\|\| (flag_djb_tweak !=
	(app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK)))
	{
	if (app->app_local->extcap.algo_attr_change)
	{
	unsigned char *keyattr;

	if (!oid_len)
	{
	err = gpg_error (GPG_ERR_INTERNAL);
	goto leave;
	}
	keyattr = xtrymalloc (oid_len);
	if (!keyattr)
	{
	err = gpg_error_from_syserror ();
	goto leave;
	}
	keyattr[0] = algo;
	memcpy (keyattr+1, oidbuf+1, oid_len-1);
	err = change_keyattr (app, keyno, keyattr, oid_len, pincb, pincb_arg);
	xfree (keyattr);
	if (err)
	goto leave;
	}
	else
	{
	log_error ("key attribute on card doesn't match\n");
	err = gpg_error (GPG_ERR_INV_VALUE);
	goto leave;
	}
	}

	if (opt.verbose)
	log_info ("ECC private key size is %u bytes\n", (unsigned int)ecc_d_len);

	/* We need to remove the cached public key. */
	xfree (app->app_local->pk[keyno].key);
	app->app_local->pk[keyno].key = NULL;
	app->app_local->pk[keyno].keylen = 0;
	app->app_local->pk[keyno].read_done = 0;

	if (app->app_local->extcap.is_v2)
	{
	/* Build the private key template as described in section 4.3.3.7 of
	the OpenPGP card specs version 2.0. */
	unsigned char *template;
	size_t template_len;
	int exmode;

	err = build_ecc_privkey_template (app, keyno,
	ecc_d, ecc_d_len,
	ecc_q, ecc_q_len,
	&template, &template_len);
	if (err)
	goto leave;

	/* Prepare for storing the key. */
	err = verify_chv3 (app, pincb, pincb_arg);
	if (err)
	{
	xfree (template);
	goto leave;
	}

	/* Store the key. */
	if (app->app_local->cardcap.ext_lc_le && template_len > 254)
	exmode = 1; /* Use extended length w/o a limit. */
	else if (app->app_local->cardcap.cmd_chaining && template_len > 254)
	exmode = -254;
	else
	exmode = 0;
	err = iso7816_put_data_odd (app->slot, exmode, 0x3fff,
	template, template_len);
	xfree (template);
	}
	else
	err = gpg_error (GPG_ERR_NOT_SUPPORTED);

	if (err)
	{
	log_error (_("failed to store the key: %s\n"), gpg_strerror (err));
	goto leave;
	}

	err = store_fpr (app, keyno, created_at, fprbuf, algo, oidbuf, oid_len,
	ecc_q, ecc_q_len, ecdh_params (curve), (size_t)4);

	leave:
	gcry_mpi_release (oid);
	return err;
	}

	/* Handle the WRITEKEY command for OpenPGP. This function expects a
	canonical encoded S-expression with the secret key in KEYDATA and
	its length (for assertions) in KEYDATALEN. KEYID needs to be the
	usual keyid which for OpenPGP is the string "OPENPGP.n" with
	n=1,2,3. Bit 0 of FLAGS indicates whether an existing key shall
	get overwritten. PINCB and PINCB_ARG are the usual arguments for
	the pinentry callback. */
	static gpg_error_t
	do_writekey (app_t app, ctrl_t ctrl,
	const char *keyid, unsigned int flags,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const unsigned char *keydata, size_t keydatalen)
	{
	gpg_error_t err;
	int force = (flags & 1);
	int keyno;
	const unsigned char buf, tok;
	size_t buflen, toklen;
	int depth;

	(void)ctrl;

	if (!strcmp (keyid, "OPENPGP.1"))
	keyno = 0;
	else if (!strcmp (keyid, "OPENPGP.2"))
	keyno = 1;
	else if (!strcmp (keyid, "OPENPGP.3"))
	keyno = 2;
	else
	return gpg_error (GPG_ERR_INV_ID);

	err = does_key_exist (app, keyno, 0, force);
	if (err)
	return err;


	/*
	Parse the S-expression
	*/
	buf = keydata;
	buflen = keydatalen;
	depth = 0;
	if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
	goto leave;
	if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
	goto leave;
	if (!tok \|\| toklen != 11 \|\| memcmp ("private-key", tok, toklen))
	{
	if (!tok)
	;
	else if (toklen == 21 && !memcmp ("protected-private-key", tok, toklen))
	log_info ("protected-private-key passed to writekey\n");
	else if (toklen == 20 && !memcmp ("shadowed-private-key", tok, toklen))
	log_info ("shadowed-private-key passed to writekey\n");
	err = gpg_error (GPG_ERR_BAD_SECKEY);
	goto leave;
	}
	if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
	goto leave;
	if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
	goto leave;
	if (tok && toklen == 3 && memcmp ("rsa", tok, toklen) == 0)
	err = rsa_writekey (app, pincb, pincb_arg, keyno, buf, buflen, depth);
	else if (tok && toklen == 3 && memcmp ("ecc", tok, toklen) == 0)
	err = ecc_writekey (app, pincb, pincb_arg, keyno, buf, buflen, depth);
	else
	{
	err = gpg_error (GPG_ERR_WRONG_PUBKEY_ALGO);
	goto leave;
	}

	leave:
	return err;
	}



	/* Handle the GENKEY command. */
	static gpg_error_t
	-do_genkey (app_t app, ctrl_t ctrl, const char *keynostr, unsigned int flags,
	- time_t createtime,
	+do_genkey (app_t app, ctrl_t ctrl, const char keynostr, const char keytype,
	+ unsigned int flags, time_t createtime,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	gpg_error_t err;
	char numbuf[30];
	unsigned char *buffer = NULL;
	const unsigned char *keydata;
	size_t buflen, keydatalen;
	u32 created_at;
	int keyno = atoi (keynostr) - 1;
	int force = (flags & 1);
	time_t start_at;
	int exmode = 0;
	int le_value = 256; /* Use legacy value. */

	+ (void)keytype; /* Ignored for OpenPGP cards. */
	+
	if (keyno < 0 \|\| keyno > 2)
	return gpg_error (GPG_ERR_INV_ID);

	/* We flush the cache to increase the traffic before a key
	generation. This _might_ help a card to gather more entropy. */
	flush_cache (app);

	/* Obviously we need to remove the cached public key. */
	xfree (app->app_local->pk[keyno].key);
	app->app_local->pk[keyno].key = NULL;
	app->app_local->pk[keyno].keylen = 0;
	app->app_local->pk[keyno].read_done = 0;

	/* Check whether a key already exists. */
	err = does_key_exist (app, keyno, 1, force);
	if (err)
	return err;

	if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_RSA)
	{
	unsigned int keybits = app->app_local->keyattr[keyno].rsa.n_bits;

	/* Because we send the key parameter back via status lines we need
	to put a limit on the max. allowed keysize. 2048 bit will
	already lead to a 527 byte long status line and thus a 4096 bit
	key would exceed the Assuan line length limit. */
	if (keybits > 4096)
	return gpg_error (GPG_ERR_TOO_LARGE);

	if (app->app_local->cardcap.ext_lc_le && keybits > RSA_SMALL_SIZE_KEY
	&& app->app_local->keyattr[keyno].key_type == KEY_TYPE_RSA)
	{
	exmode = 1; /* Use extended length w/o a limit. */
	le_value = determine_rsa_response (app, keyno);
	/* No need to check le_value because it comes from a 16 bit
	value and thus can't create an overflow on a 32 bit
	system. */
	}
	}

	/* Prepare for key generation by verifying the Admin PIN. */
	err = verify_chv3 (app, pincb, pincb_arg);
	if (err)
	return err;


	log_info (_("please wait while key is being generated ...\n"));
	start_at = time (NULL);
	- err = iso7816_generate_keypair (app->slot, exmode,
	+ err = iso7816_generate_keypair (app->slot, exmode, 0x80, 0,
	(keyno == 0? "\xB6" :
	keyno == 1? "\xB8" : "\xA4"),
	2, le_value, &buffer, &buflen);
	if (err)
	{
	log_error (_("generating key failed\n"));
	return gpg_error (GPG_ERR_CARD);
	}

	{
	int nsecs = (int)(time (NULL) - start_at);
	log_info (ngettext("key generation completed (%d second)\n",
	"key generation completed (%d seconds)\n",
	nsecs), nsecs);
	}

	keydata = find_tlv (buffer, buflen, 0x7F49, &keydatalen);
	if (!keydata)
	{
	err = gpg_error (GPG_ERR_CARD);
	log_error (_("response does not contain the public key data\n"));
	goto leave;
	}

	created_at = (u32)(createtime? createtime : gnupg_get_time ());
	sprintf (numbuf, "%u", created_at);
	send_status_info (ctrl, "KEY-CREATED-AT",
	numbuf, (size_t)strlen(numbuf), NULL, 0);

	err = read_public_key (app, ctrl, created_at, keyno, buffer, buflen);
	leave:
	xfree (buffer);
	return err;
	}


	static unsigned long
	convert_sig_counter_value (const unsigned char *value, size_t valuelen)
	{
	unsigned long ul;

	if (valuelen == 3 )
	ul = (value[0] << 16) \| (value[1] << 8) \| value[2];
	else
	{
	log_error (_("invalid structure of OpenPGP card (DO 0x93)\n"));
	ul = 0;
	}
	return ul;
	}

	static unsigned long
	get_sig_counter (app_t app)
	{
	void *relptr;
	unsigned char *value;
	size_t valuelen;
	unsigned long ul;

	relptr = get_one_do (app, 0x0093, &value, &valuelen, NULL);
	if (!relptr)
	return 0;
	ul = convert_sig_counter_value (value, valuelen);
	xfree (relptr);
	return ul;
	}

	static gpg_error_t
	compare_fingerprint (app_t app, int keyno, unsigned char *sha1fpr)
	{
	const unsigned char *fpr;
	unsigned char *buffer;
	size_t buflen, n;
	int rc, i;

	assert (keyno >= 0 && keyno <= 2);

	rc = get_cached_data (app, 0x006E, &buffer, &buflen, 0, 0);
	if (rc)
	{
	log_error (_("error reading application data\n"));
	return gpg_error (GPG_ERR_GENERAL);
	}
	fpr = find_tlv (buffer, buflen, 0x00C5, &n);
	if (!fpr \|\| n != 60)
	{
	xfree (buffer);
	log_error (_("error reading fingerprint DO\n"));
	return gpg_error (GPG_ERR_GENERAL);
	}
	fpr += keyno*20;
	for (i=0; i < 20; i++)
	if (sha1fpr[i] != fpr[i])
	{
	xfree (buffer);
	log_info (_("fingerprint on card does not match requested one\n"));
	return gpg_error (GPG_ERR_WRONG_SECKEY);
	}
	xfree (buffer);
	return 0;
	}


	/* If a fingerprint has been specified check it against the one on the
	card. This allows for a meaningful error message in case the key
	on the card has been replaced but the shadow information known to
	gpg has not been updated. If there is no fingerprint we assume
	that this is okay. */
	static gpg_error_t
	check_against_given_fingerprint (app_t app, const char *fpr, int key)
	{
	unsigned char tmp[20];
	const char *s;
	int n;

	for (s=fpr, n=0; hexdigitp (s); s++, n++)
	;
	if (n != 40)
	return gpg_error (GPG_ERR_INV_ID);
	else if (!*s)
	; /* okay */
	else
	return gpg_error (GPG_ERR_INV_ID);

	for (s=fpr, n=0; n < 20; s += 2, n++)
	tmp[n] = xtoi_2 (s);
	return compare_fingerprint (app, key-1, tmp);
	}



	/* Compute a digital signature on INDATA which is expected to be the
	raw message digest. For this application the KEYIDSTR consists of
	the serialnumber and the fingerprint delimited by a slash.

	Note that this function may return the error code
	GPG_ERR_WRONG_CARD to indicate that the card currently present does
	not match the one required for the requested action (e.g. the
	serial number does not match).

	As a special feature a KEYIDSTR of "OPENPGP.3" redirects the
	operation to the auth command.
	*/
	static gpg_error_t
	do_sign (app_t app, const char *keyidstr, int hashalgo,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen )
	{
	static unsigned char rmd160_prefix[15] = /* Object ID is 1.3.36.3.2.1 */
	{ 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x24, 0x03,
	0x02, 0x01, 0x05, 0x00, 0x04, 0x14 };
	static unsigned char sha1_prefix[15] = /* (1.3.14.3.2.26) */
	{ 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03,
	0x02, 0x1a, 0x05, 0x00, 0x04, 0x14 };
	static unsigned char sha224_prefix[19] = /* (2.16.840.1.101.3.4.2.4) */
	{ 0x30, 0x2D, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48,
	0x01, 0x65, 0x03, 0x04, 0x02, 0x04, 0x05, 0x00, 0x04,
	0x1C };
	static unsigned char sha256_prefix[19] = /* (2.16.840.1.101.3.4.2.1) */
	{ 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86,
	0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05,
	0x00, 0x04, 0x20 };
	static unsigned char sha384_prefix[19] = /* (2.16.840.1.101.3.4.2.2) */
	{ 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86,
	0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02, 0x05,
	0x00, 0x04, 0x30 };
	static unsigned char sha512_prefix[19] = /* (2.16.840.1.101.3.4.2.3) */
	{ 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86,
	0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03, 0x05,
	0x00, 0x04, 0x40 };
	int rc;
	unsigned char data[19+64];
	size_t datalen;
	unsigned char tmp_sn[20]; /* Actually 16 bytes but also for the fpr. */
	const char *s;
	int n;
	const char *fpr = NULL;
	unsigned long sigcount;
	int use_auth = 0;
	int exmode, le_value;

	if (!keyidstr \|\| !*keyidstr)
	return gpg_error (GPG_ERR_INV_VALUE);

	/* Strip off known prefixes. */
	#define X(a,b,c,d) \
	if (hashalgo == GCRY_MD_ ## a \
	&& (d) \
	&& indatalen == sizeof b ## _prefix + (c) \
	&& !memcmp (indata, b ## _prefix, sizeof b ## _prefix)) \
	{ \
	indata = (const char*)indata + sizeof b ## _prefix; \
	indatalen -= sizeof b ## _prefix; \
	}

	if (indatalen == 20)
	; /* Assume a plain SHA-1 or RMD160 digest has been given. */
	else X(SHA1, sha1, 20, 1)
	else X(RMD160, rmd160, 20, 1)
	else X(SHA224, sha224, 28, app->app_local->extcap.is_v2)
	else X(SHA256, sha256, 32, app->app_local->extcap.is_v2)
	else X(SHA384, sha384, 48, app->app_local->extcap.is_v2)
	else X(SHA512, sha512, 64, app->app_local->extcap.is_v2)
	else if ((indatalen == 28 \|\| indatalen == 32
	\|\| indatalen == 48 \|\| indatalen ==64)
	&& app->app_local->extcap.is_v2)
	; /* Assume a plain SHA-3 digest has been given. */
	else
	{
	log_error (_("card does not support digest algorithm %s\n"),
	gcry_md_algo_name (hashalgo));
	/* Or the supplied digest length does not match an algorithm. */
	return gpg_error (GPG_ERR_INV_VALUE);
	}
	#undef X

	/* Check whether an OpenPGP card of any version has been requested. */
	if (!strcmp (keyidstr, "OPENPGP.1"))
	;
	else if (!strcmp (keyidstr, "OPENPGP.3"))
	use_auth = 1;
	else if (strlen (keyidstr) < 32 \|\| strncmp (keyidstr, "D27600012401", 12))
	return gpg_error (GPG_ERR_INV_ID);
	else
	{
	for (s=keyidstr, n=0; hexdigitp (s); s++, n++)
	;
	if (n != 32)
	return gpg_error (GPG_ERR_INV_ID);
	else if (!*s)
	; /* no fingerprint given: we allow this for now. */
	else if (*s == '/')
	fpr = s + 1;
	else
	return gpg_error (GPG_ERR_INV_ID);

	for (s=keyidstr, n=0; n < 16; s += 2, n++)
	tmp_sn[n] = xtoi_2 (s);

	if (app->serialnolen != 16)
	return gpg_error (GPG_ERR_INV_CARD);
	if (memcmp (app->serialno, tmp_sn, 16))
	return gpg_error (GPG_ERR_WRONG_CARD);
	}

	/* If a fingerprint has been specified check it against the one on
	the card. This is allows for a meaningful error message in case
	the key on the card has been replaced but the shadow information
	known to gpg was not updated. If there is no fingerprint, gpg
	will detect a bogus signature anyway due to the
	verify-after-signing feature. */
	rc = fpr? check_against_given_fingerprint (app, fpr, 1) : 0;
	if (rc)
	return rc;

	/* Concatenate prefix and digest. */
	#define X(a,b,d) \
	if (hashalgo == GCRY_MD_ ## a && (d) ) \
	{ \
	datalen = sizeof b ## _prefix + indatalen; \
	assert (datalen <= sizeof data); \
	memcpy (data, b ## _prefix, sizeof b ## _prefix); \
	memcpy (data + sizeof b ## _prefix, indata, indatalen); \
	}

	if (use_auth
	\|\| app->app_local->keyattr[use_auth? 2: 0].key_type == KEY_TYPE_RSA)
	{
	X(SHA1, sha1, 1)
	else X(RMD160, rmd160, 1)
	else X(SHA224, sha224, app->app_local->extcap.is_v2)
	else X(SHA256, sha256, app->app_local->extcap.is_v2)
	else X(SHA384, sha384, app->app_local->extcap.is_v2)
	else X(SHA512, sha512, app->app_local->extcap.is_v2)
	else
	return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM);
	}
	else
	{
	datalen = indatalen;
	memcpy (data, indata, indatalen);
	}
	#undef X

	/* Redirect to the AUTH command if asked to. */
	if (use_auth)
	{
	return do_auth (app, "OPENPGP.3", pincb, pincb_arg,
	data, datalen,
	outdata, outdatalen);
	}

	/* Show the number of signature done using this key. */
	sigcount = get_sig_counter (app);
	log_info (_("signatures created so far: %lu\n"), sigcount);

	/* Check CHV if needed. */
	if (!app->did_chv1 \|\| app->force_chv1)
	{
	char *pinvalue;
	int pinlen;

	rc = verify_a_chv (app, pincb, pincb_arg, 1, sigcount, &pinvalue, &pinlen);
	if (rc)
	return rc;

	app->did_chv1 = 1;

	/* For cards with versions < 2 we want to keep CHV1 and CHV2 in
	sync, thus we verify CHV2 here using the given PIN. Cards
	with version2 to not have the need for a separate CHV2 and
	internally use just one. Obviously we can't do that if the
	pinpad has been used. */
	if (!app->did_chv2 && pinvalue && !app->app_local->extcap.is_v2)
	{
	rc = iso7816_verify (app->slot, 0x82, pinvalue, pinlen);
	if (gpg_err_code (rc) == GPG_ERR_BAD_PIN)
	rc = gpg_error (GPG_ERR_PIN_NOT_SYNCED);
	if (rc)
	{
	log_error (_("verify CHV%d failed: %s\n"), 2, gpg_strerror (rc));
	xfree (pinvalue);
	flush_cache_after_error (app);
	return rc;
	}
	app->did_chv2 = 1;
	}
	xfree (pinvalue);
	}


	if (app->app_local->cardcap.ext_lc_le
	&& app->app_local->keyattr[0].key_type == KEY_TYPE_RSA
	&& app->app_local->keyattr[0].rsa.n_bits > RSA_SMALL_SIZE_OP)
	{
	exmode = 1; /* Use extended length. */
	le_value = app->app_local->keyattr[0].rsa.n_bits / 8;
	}
	else
	{
	exmode = 0;
	le_value = 0;
	}
	rc = iso7816_compute_ds (app->slot, exmode, data, datalen, le_value,
	outdata, outdatalen);
	if (!rc && app->force_chv1)
	app->did_chv1 = 0;

	return rc;
	}

	/* Compute a digital signature using the INTERNAL AUTHENTICATE command
	on INDATA which is expected to be the raw message digest. For this
	application the KEYIDSTR consists of the serialnumber and the
	fingerprint delimited by a slash. Optionally the id OPENPGP.3 may
	be given.

	Note that this function may return the error code
	GPG_ERR_WRONG_CARD to indicate that the card currently present does
	not match the one required for the requested action (e.g. the
	serial number does not match). */
	static gpg_error_t
	do_auth (app_t app, const char *keyidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen )
	{
	int rc;
	unsigned char tmp_sn[20]; /* Actually 16 but we use it also for the fpr. */
	const char *s;
	int n;
	const char *fpr = NULL;

	if (!keyidstr \|\| !*keyidstr)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (app->app_local->keyattr[2].key_type == KEY_TYPE_RSA
	&& indatalen > 101) /* For a 2048 bit key. */
	return gpg_error (GPG_ERR_INV_VALUE);

	if (app->app_local->keyattr[2].key_type == KEY_TYPE_ECC)
	{
	if (!(app->app_local->keyattr[2].ecc.flags & ECC_FLAG_DJB_TWEAK)
	&& (indatalen == 51 \|\| indatalen == 67 \|\| indatalen == 83))
	{
	const char p = (const char )indata + 19;
	indata = p;
	indatalen -= 19;
	}
	else
	{
	const char p = (const char )indata + 15;
	indata = p;
	indatalen -= 15;
	}
	}

	/* Check whether an OpenPGP card of any version has been requested. */
	if (!strcmp (keyidstr, "OPENPGP.3"))
	;
	else if (strlen (keyidstr) < 32 \|\| strncmp (keyidstr, "D27600012401", 12))
	return gpg_error (GPG_ERR_INV_ID);
	else
	{
	for (s=keyidstr, n=0; hexdigitp (s); s++, n++)
	;
	if (n != 32)
	return gpg_error (GPG_ERR_INV_ID);
	else if (!*s)
	; /* no fingerprint given: we allow this for now. */
	else if (*s == '/')
	fpr = s + 1;
	else
	return gpg_error (GPG_ERR_INV_ID);

	for (s=keyidstr, n=0; n < 16; s += 2, n++)
	tmp_sn[n] = xtoi_2 (s);

	if (app->serialnolen != 16)
	return gpg_error (GPG_ERR_INV_CARD);
	if (memcmp (app->serialno, tmp_sn, 16))
	return gpg_error (GPG_ERR_WRONG_CARD);
	}

	/* If a fingerprint has been specified check it against the one on
	the card. This is allows for a meaningful error message in case
	the key on the card has been replaced but the shadow information
	known to gpg was not updated. If there is no fingerprint, gpg
	will detect a bogus signature anyway due to the
	verify-after-signing feature. */
	rc = fpr? check_against_given_fingerprint (app, fpr, 3) : 0;
	if (rc)
	return rc;

	rc = verify_chv2 (app, pincb, pincb_arg);
	if (!rc)
	{
	int exmode, le_value;

	if (app->app_local->cardcap.ext_lc_le
	&& app->app_local->keyattr[2].key_type == KEY_TYPE_RSA
	&& app->app_local->keyattr[2].rsa.n_bits > RSA_SMALL_SIZE_OP)
	{
	exmode = 1; /* Use extended length. */
	le_value = app->app_local->keyattr[2].rsa.n_bits / 8;
	}
	else
	{
	exmode = 0;
	le_value = 0;
	}
	rc = iso7816_internal_authenticate (app->slot, exmode,
	indata, indatalen, le_value,
	outdata, outdatalen);
	}
	return rc;
	}


	static gpg_error_t
	do_decipher (app_t app, const char *keyidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen,
	unsigned int *r_info)
	{
	int rc;
	unsigned char tmp_sn[20]; /* actually 16 but we use it also for the fpr. */
	const char *s;
	int n;
	const char *fpr = NULL;
	int exmode, le_value;
	unsigned char *fixbuf = NULL;
	int padind = 0;
	int fixuplen = 0;

	if (!keyidstr \|\| !*keyidstr \|\| !indatalen)
	return gpg_error (GPG_ERR_INV_VALUE);

	/* Check whether an OpenPGP card of any version has been requested. */
	if (!strcmp (keyidstr, "OPENPGP.2"))
	;
	else if (strlen (keyidstr) < 32 \|\| strncmp (keyidstr, "D27600012401", 12))
	return gpg_error (GPG_ERR_INV_ID);
	else
	{
	for (s=keyidstr, n=0; hexdigitp (s); s++, n++)
	;
	if (n != 32)
	return gpg_error (GPG_ERR_INV_ID);
	else if (!*s)
	; /* no fingerprint given: we allow this for now. */
	else if (*s == '/')
	fpr = s + 1;
	else
	return gpg_error (GPG_ERR_INV_ID);

	for (s=keyidstr, n=0; n < 16; s += 2, n++)
	tmp_sn[n] = xtoi_2 (s);

	if (app->serialnolen != 16)
	return gpg_error (GPG_ERR_INV_CARD);
	if (memcmp (app->serialno, tmp_sn, 16))
	return gpg_error (GPG_ERR_WRONG_CARD);
	}

	/* If a fingerprint has been specified check it against the one on
	the card. This is allows for a meaningful error message in case
	the key on the card has been replaced but the shadow information
	known to gpg was not updated. If there is no fingerprint, the
	decryption won't produce the right plaintext anyway. */
	rc = fpr? check_against_given_fingerprint (app, fpr, 2) : 0;
	if (rc)
	return rc;

	rc = verify_chv2 (app, pincb, pincb_arg);
	if (rc)
	return rc;

	if ((indatalen == 16 + 1 \|\| indatalen == 32 + 1)
	&& ((char *)indata)[0] == 0x02)
	{
	/* PSO:DECIPHER with symmetric key. */
	padind = -1;
	}
	else if (app->app_local->keyattr[1].key_type == KEY_TYPE_RSA)
	{
	/* We might encounter a couple of leading zeroes in the
	cryptogram. Due to internal use of MPIs these leading zeroes
	are stripped. However the OpenPGP card expects exactly 128
	bytes for the cryptogram (for a 1k key). Thus we need to fix
	it up. We do this for up to 16 leading zero bytes; a
	cryptogram with more than this is with a very high
	probability anyway broken. If a signed conversion was used
	we may also encounter one leading zero followed by the correct
	length. We fix that as well. */
	if (indatalen >= (128-16) && indatalen < 128) /* 1024 bit key. */
	fixuplen = 128 - indatalen;
	else if (indatalen >= (192-16) && indatalen < 192) /* 1536 bit key. */
	fixuplen = 192 - indatalen;
	else if (indatalen >= (256-16) && indatalen < 256) /* 2048 bit key. */
	fixuplen = 256 - indatalen;
	else if (indatalen >= (384-16) && indatalen < 384) /* 3072 bit key. */
	fixuplen = 384 - indatalen;
	else if (indatalen >= (512-16) && indatalen < 512) /* 4096 bit key. */
	fixuplen = 512 - indatalen;
	else if (!(const char )indata && (indatalen == 129
	\|\| indatalen == 193
	\|\| indatalen == 257
	\|\| indatalen == 385
	\|\| indatalen == 513))
	fixuplen = -1;
	else
	fixuplen = 0;

	if (fixuplen > 0)
	{
	/* While we have to prepend stuff anyway, we can also
	include the padding byte here so that iso1816_decipher
	does not need to do another data mangling. */
	fixuplen++;

	fixbuf = xtrymalloc (fixuplen + indatalen);
	if (!fixbuf)
	return gpg_error_from_syserror ();

	memset (fixbuf, 0, fixuplen);
	memcpy (fixbuf+fixuplen, indata, indatalen);
	indata = fixbuf;
	indatalen = fixuplen + indatalen;
	padind = -1; /* Already padded. */
	}
	else if (fixuplen < 0)
	{
	/* We use the extra leading zero as the padding byte. */
	padind = -1;
	}
	}
	else if (app->app_local->keyattr[1].key_type == KEY_TYPE_ECC)
	{
	int old_format_len = 0;

	if ((app->app_local->keyattr[1].ecc.flags & ECC_FLAG_DJB_TWEAK))
	{
	if (indatalen > 32 && (indatalen % 2))
	{ /*
	* Skip the prefix. It may be 0x40 (in new format), or MPI
	* head of 0x00 (in old format).
	*/
	indata = (const char *)indata + 1;
	indatalen--;
	}
	else if (indatalen < 32)
	{ /*
	* Old format trancated by MPI handling.
	*/
	old_format_len = indatalen;
	indatalen = 32;
	}
	}

	n = 0;
	if (indatalen < 128)
	fixuplen = 7;
	else
	fixuplen = 10;

	fixbuf = xtrymalloc (fixuplen + indatalen);
	if (!fixbuf)
	return gpg_error_from_syserror ();

	/* Build 'Cipher DO' */
	fixbuf[n++] = '\xa6';
	if (indatalen < 128)
	fixbuf[n++] = (char)(indatalen+5);
	else
	{
	fixbuf[n++] = 0x81;
	fixbuf[n++] = (char)(indatalen+7);
	}
	fixbuf[n++] = '\x7f';
	fixbuf[n++] = '\x49';
	if (indatalen < 128)
	fixbuf[n++] = (char)(indatalen+2);
	else
	{
	fixbuf[n++] = 0x81;
	fixbuf[n++] = (char)(indatalen+3);
	}
	fixbuf[n++] = '\x86';
	if (indatalen < 128)
	fixbuf[n++] = (char)indatalen;
	else
	{
	fixbuf[n++] = 0x81;
	fixbuf[n++] = (char)indatalen;
	}

	if (old_format_len)
	{
	memset (fixbuf+fixuplen, 0, 32 - old_format_len);
	memcpy (fixbuf+fixuplen + 32 - old_format_len,
	indata, old_format_len);
	}
	else
	{
	memcpy (fixbuf+fixuplen, indata, indatalen);
	}
	indata = fixbuf;
	indatalen = fixuplen + indatalen;

	padind = -1;
	}
	else
	return gpg_error (GPG_ERR_INV_VALUE);

	if (app->app_local->cardcap.ext_lc_le
	&& (indatalen > 254
	\|\| (app->app_local->keyattr[1].key_type == KEY_TYPE_RSA
	&& app->app_local->keyattr[1].rsa.n_bits > RSA_SMALL_SIZE_OP)))
	{
	exmode = 1; /* Extended length w/o a limit. */
	le_value = app->app_local->keyattr[1].rsa.n_bits / 8;
	}
	else if (app->app_local->cardcap.cmd_chaining && indatalen > 254)
	{
	exmode = -254; /* Command chaining with max. 254 bytes. */
	le_value = 0;
	}
	else
	exmode = le_value = 0;

	rc = iso7816_decipher (app->slot, exmode,
	indata, indatalen, le_value, padind,
	outdata, outdatalen);
	xfree (fixbuf);
	if (app->app_local->keyattr[1].key_type == KEY_TYPE_ECC)
	{
	unsigned char prefix = 0;

	if (app->app_local->keyattr[1].ecc.flags & ECC_FLAG_DJB_TWEAK)
	prefix = 0x40;
	else if ((outdatalen % 2) == 0) / No 0x04 -> x-coordinate only */
	prefix = 0x41;

	if (prefix)
	{ /* Add the prefix */
	fixbuf = xtrymalloc (*outdatalen + 1);
	if (!fixbuf)
	{
	xfree (*outdata);
	return gpg_error_from_syserror ();
	}
	fixbuf[0] = prefix;
	memcpy (fixbuf+1, outdata, outdatalen);
	xfree (*outdata);
	*outdata = fixbuf;
	outdatalen = outdatalen + 1;
	}
	}

	if (gpg_err_code (rc) == GPG_ERR_CARD /* actual SW is 0x640a */
	&& app->app_local->manufacturer == 5
	&& app->card_version == 0x0200)
	log_info ("NOTE: Cards with manufacturer id 5 and s/n <= 346 (0x15a)"
	" do not work with encryption keys > 2048 bits\n");

	*r_info \|= APP_DECIPHER_INFO_NOPAD;

	return rc;
	}


	/* Perform a simple verify operation for CHV1 and CHV2, so that
	further operations won't ask for CHV2 and it is possible to do a
	cheap check on the PIN: If there is something wrong with the PIN
	entry system, only the regular CHV will get blocked and not the
	dangerous CHV3. KEYIDSTR is the usual card's serial number; an
	optional fingerprint part will be ignored.

	There is a special mode if the keyidstr is "<serialno>[CHV3]" with
	the "[CHV3]" being a literal string: The Admin Pin is checked if
	and only if the retry counter is still at 3. */
	static gpg_error_t
	do_check_pin (app_t app, const char *keyidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	unsigned char tmp_sn[20];
	const char *s;
	int n;
	int admin_pin = 0;

	if (!keyidstr \|\| !*keyidstr)
	return gpg_error (GPG_ERR_INV_VALUE);

	/* Check whether an OpenPGP card of any version has been requested. */
	if (strlen (keyidstr) < 32 \|\| strncmp (keyidstr, "D27600012401", 12))
	return gpg_error (GPG_ERR_INV_ID);

	for (s=keyidstr, n=0; hexdigitp (s); s++, n++)
	;
	if (n != 32)
	return gpg_error (GPG_ERR_INV_ID);
	else if (!*s)
	; /* No fingerprint given: we allow this for now. */
	else if (*s == '/')
	; /* We ignore a fingerprint. */
	else if (!strcmp (s, "[CHV3]") )
	admin_pin = 1;
	else
	return gpg_error (GPG_ERR_INV_ID);

	for (s=keyidstr, n=0; n < 16; s += 2, n++)
	tmp_sn[n] = xtoi_2 (s);

	if (app->serialnolen != 16)
	return gpg_error (GPG_ERR_INV_CARD);
	if (memcmp (app->serialno, tmp_sn, 16))
	return gpg_error (GPG_ERR_WRONG_CARD);

	/* Yes, there is a race conditions: The user might pull the card
	right here and we won't notice that. However this is not a
	problem and the check above is merely for a graceful failure
	between operations. */

	if (admin_pin)
	{
	void *relptr;
	unsigned char *value;
	size_t valuelen;
	int count;

	relptr = get_one_do (app, 0x00C4, &value, &valuelen, NULL);
	if (!relptr \|\| valuelen < 7)
	{
	log_error (_("error retrieving CHV status from card\n"));
	xfree (relptr);
	return gpg_error (GPG_ERR_CARD);
	}
	count = value[6];
	xfree (relptr);

	if (!count)
	{
	log_info (_("card is permanently locked!\n"));
	return gpg_error (GPG_ERR_BAD_PIN);
	}
	else if (count < 3)
	{
	log_info (_("verification of Admin PIN is currently prohibited "
	"through this command\n"));
	return gpg_error (GPG_ERR_GENERAL);
	}

	app->did_chv3 = 0; /* Force verification. */
	return verify_chv3 (app, pincb, pincb_arg);
	}
	else
	return verify_chv2 (app, pincb, pincb_arg);
	}


	/* Show information about card capabilities. */
	static void
	show_caps (struct app_local_s *s)
	{
	log_info ("Version-2+ .....: %s\n", s->extcap.is_v2? "yes":"no");
	log_info ("Extcap-v3 ......: %s\n", s->extcap.extcap_v3? "yes":"no");
	log_info ("Button .........: %s\n", s->extcap.has_button? "yes":"no");

	log_info ("SM-Support .....: %s", s->extcap.sm_supported? "yes":"no");
	if (s->extcap.sm_supported)
	log_printf (" (%s)", s->extcap.sm_algo==2? "3DES":
	(s->extcap.sm_algo==2? "AES-128" : "AES-256"));
	log_info ("Get-Challenge ..: %s", s->extcap.get_challenge? "yes":"no");
	if (s->extcap.get_challenge)
	log_printf (" (%u bytes max)", s->extcap.max_get_challenge);
	log_info ("Key-Import .....: %s\n", s->extcap.key_import? "yes":"no");
	log_info ("Change-Force-PW1: %s\n", s->extcap.change_force_chv? "yes":"no");
	log_info ("Private-DOs ....: %s\n", s->extcap.private_dos? "yes":"no");
	log_info ("Algo-Attr-Change: %s\n", s->extcap.algo_attr_change? "yes":"no");
	log_info ("Symmetric Crypto: %s\n", s->extcap.has_decrypt? "yes":"no");
	log_info ("KDF-Support ....: %s\n", s->extcap.kdf_do? "yes":"no");
	log_info ("Max-Cert3-Len ..: %u\n", s->extcap.max_certlen_3);
	if (s->extcap.extcap_v3)
	{
	log_info ("PIN-Block-2 ....: %s\n", s->extcap.pin_blk2? "yes":"no");
	log_info ("MSE-Support ....: %s\n", s->extcap.mse? "yes":"no");
	log_info ("Max-Special-DOs : %u\n", s->extcap.max_special_do);
	}
	log_info ("Cmd-Chaining ...: %s\n", s->cardcap.cmd_chaining?"yes":"no");
	log_info ("Ext-Lc-Le ......: %s\n", s->cardcap.ext_lc_le?"yes":"no");
	log_info ("Status-Indicator: %02X\n", s->status_indicator);

	log_info ("GnuPG-No-Sync ..: %s\n", s->flags.no_sync? "yes":"no");
	log_info ("GnuPG-Def-PW2 ..: %s\n", s->flags.def_chv2? "yes":"no");
	}


	/* Parse the historical bytes in BUFFER of BUFLEN and store them in
	APPLOC. */
	static void
	parse_historical (struct app_local_s *apploc,
	const unsigned char * buffer, size_t buflen)
	{
	/* Example buffer: 00 31 C5 73 C0 01 80 00 90 00 */
	if (buflen < 4)
	{
	log_error ("warning: historical bytes are too short\n");
	return; /* Too short. */
	}
	if (*buffer)
	{
	log_error ("warning: bad category indicator in historical bytes\n");
	return;
	}

	/* Skip category indicator. */
	buffer++;
	buflen--;

	/* Get the status indicator. */
	apploc->status_indicator = buffer[buflen-3];
	buflen -= 3;

	/* Parse the compact TLV. */
	while (buflen)
	{
	unsigned int tag = (*buffer & 0xf0) >> 4;
	unsigned int len = (*buffer & 0x0f);
	if (len+1 > buflen)
	{
	log_error ("warning: bad Compact-TLV in historical bytes\n");
	return; /* Error. */
	}
	buffer++;
	buflen--;
	if (tag == 7 && len == 3)
	{
	/* Card capabilities. */
	apploc->cardcap.cmd_chaining = !!(buffer[2] & 0x80);
	apploc->cardcap.ext_lc_le = !!(buffer[2] & 0x40);
	}
	buffer += len;
	buflen -= len;
	}
	}


	/*
	* Check if the OID in an DER encoding is available by GnuPG/libgcrypt,
	* and return the curve name. Return NULL if not available.
	* The constant string is not allocated dynamically, never free it.
	*/
	static const char *
	ecc_curve (unsigned char *buf, size_t buflen)
	{
	gcry_mpi_t oid;
	char *oidstr;
	const char *result;
	unsigned char *oidbuf;

	oidbuf = xtrymalloc (buflen + 1);
	if (!oidbuf)
	return NULL;

	memcpy (oidbuf+1, buf, buflen);
	oidbuf[0] = buflen;
	oid = gcry_mpi_set_opaque (NULL, oidbuf, (buflen+1) * 8);
	if (!oid)
	{
	xfree (oidbuf);
	return NULL;
	}

	oidstr = openpgp_oid_to_str (oid);
	gcry_mpi_release (oid);
	if (!oidstr)
	return NULL;

	result = openpgp_oid_to_curve (oidstr, 1);
	xfree (oidstr);
	return result;
	}


	/* Parse and optionally show the algorithm attributes for KEYNO.
	KEYNO must be in the range 0..2. */
	static void
	parse_algorithm_attribute (app_t app, int keyno)
	{
	unsigned char *buffer;
	size_t buflen;
	void *relptr;
	const char desc[3][5] = {"sign", "encr", "auth"};

	assert (keyno >=0 && keyno <= 2);

	app->app_local->keyattr[keyno].key_type = KEY_TYPE_RSA;
	app->app_local->keyattr[keyno].rsa.n_bits = 0;

	relptr = get_one_do (app, 0xC1+keyno, &buffer, &buflen, NULL);
	if (!relptr)
	{
	log_error ("error reading DO 0x%02X\n", 0xc1+keyno);
	return;
	}
	if (buflen < 1)
	{
	log_error ("error reading DO 0x%02X\n", 0xc1+keyno);
	xfree (relptr);
	return;
	}

	if (opt.verbose)
	log_info ("Key-Attr-%s ..: ", desc[keyno]);
	if (*buffer == PUBKEY_ALGO_RSA && (buflen == 5 \|\| buflen == 6))
	{
	app->app_local->keyattr[keyno].rsa.n_bits = (buffer[1]<<8 \| buffer[2]);
	app->app_local->keyattr[keyno].rsa.e_bits = (buffer[3]<<8 \| buffer[4]);
	app->app_local->keyattr[keyno].rsa.format = 0;
	if (buflen < 6)
	app->app_local->keyattr[keyno].rsa.format = RSA_STD;
	else
	app->app_local->keyattr[keyno].rsa.format = (buffer[5] == 0? RSA_STD :
	buffer[5] == 1? RSA_STD_N :
	buffer[5] == 2? RSA_CRT :
	buffer[5] == 3? RSA_CRT_N :
	RSA_UNKNOWN_FMT);

	if (opt.verbose)
	log_printf
	("RSA, n=%u, e=%u, fmt=%s\n",
	app->app_local->keyattr[keyno].rsa.n_bits,
	app->app_local->keyattr[keyno].rsa.e_bits,
	app->app_local->keyattr[keyno].rsa.format == RSA_STD? "std" :
	app->app_local->keyattr[keyno].rsa.format == RSA_STD_N?"std+n":
	app->app_local->keyattr[keyno].rsa.format == RSA_CRT? "crt" :
	app->app_local->keyattr[keyno].rsa.format == RSA_CRT_N?"crt+n":"?");
	}
	else if (buffer == PUBKEY_ALGO_ECDH \|\| buffer == PUBKEY_ALGO_ECDSA
	\|\| *buffer == PUBKEY_ALGO_EDDSA)
	{
	const char *curve;
	int oidlen = buflen - 1;

	app->app_local->keyattr[keyno].ecc.flags = 0;

	if (buffer[buflen-1] == 0x00 \|\| buffer[buflen-1] == 0xff)
	{ /* Found "pubkey required"-byte for private key template. */
	oidlen--;
	if (buffer[buflen-1] == 0xff)
	app->app_local->keyattr[keyno].ecc.flags \|= ECC_FLAG_PUBKEY;
	}

	curve = ecc_curve (buffer + 1, oidlen);

	if (!curve)
	log_printhex (buffer+1, buflen-1, "Curve with OID not supported: ");
	else
	{
	app->app_local->keyattr[keyno].key_type = KEY_TYPE_ECC;
	app->app_local->keyattr[keyno].ecc.curve = curve;
	if (*buffer == PUBKEY_ALGO_EDDSA
	\|\| (*buffer == PUBKEY_ALGO_ECDH
	&& !strcmp (app->app_local->keyattr[keyno].ecc.curve,
	"Curve25519")))
	app->app_local->keyattr[keyno].ecc.flags \|= ECC_FLAG_DJB_TWEAK;
	if (opt.verbose)
	log_printf
	("ECC, curve=%s%s\n", app->app_local->keyattr[keyno].ecc.curve,
	!(app->app_local->keyattr[keyno].ecc.flags & ECC_FLAG_DJB_TWEAK)?
	"": keyno==1? " (djb-tweak)": " (eddsa)");
	}
	}
	else if (opt.verbose)
	log_printhex (buffer, buflen, "");

	xfree (relptr);
	}

	/* Select the OpenPGP application on the card in SLOT. This function
	must be used before any other OpenPGP application functions. */
	gpg_error_t
	app_select_openpgp (app_t app)
	{
	static char const aid[] = { 0xD2, 0x76, 0x00, 0x01, 0x24, 0x01 };
	int slot = app->slot;
	int rc;
	unsigned char *buffer;
	size_t buflen;
	void *relptr;

	/* Note that the card can't cope with P2=0xCO, thus we need to pass a
	special flag value. */
	rc = iso7816_select_application (slot, aid, sizeof aid, 0x0001);
	if (!rc)
	{
	unsigned int manufacturer;

	app->apptype = "OPENPGP";

	app->did_chv1 = 0;
	app->did_chv2 = 0;
	app->did_chv3 = 0;
	app->app_local = NULL;

	/* The OpenPGP card returns the serial number as part of the
	AID; because we prefer to use OpenPGP serial numbers, we
	replace a possibly already set one from a EF.GDO with this
	one. Note, that for current OpenPGP cards, no EF.GDO exists
	and thus it won't matter at all. */
	rc = iso7816_get_data (slot, 0, 0x004F, &buffer, &buflen);
	if (rc)
	goto leave;
	if (opt.verbose)
	{
	log_info ("AID: ");
	log_printhex (buffer, buflen, "");
	}

	app->card_version = buffer[6] << 8;
	app->card_version \|= buffer[7];
	manufacturer = (buffer[8]<<8 \| buffer[9]);

	xfree (app->serialno);
	app->serialno = buffer;
	app->serialnolen = buflen;
	buffer = NULL;
	app->app_local = xtrycalloc (1, sizeof *app->app_local);
	if (!app->app_local)
	{
	rc = gpg_error (gpg_err_code_from_errno (errno));
	goto leave;
	}

	app->app_local->manufacturer = manufacturer;

	if (app->card_version >= 0x0200)
	app->app_local->extcap.is_v2 = 1;

	if (app->card_version >= 0x0300)
	app->app_local->extcap.extcap_v3 = 1;

	/* Read the historical bytes. */
	relptr = get_one_do (app, 0x5f52, &buffer, &buflen, NULL);
	if (relptr)
	{
	if (opt.verbose)
	{
	log_info ("Historical Bytes: ");
	log_printhex (buffer, buflen, "");
	}
	parse_historical (app->app_local, buffer, buflen);
	xfree (relptr);
	}

	/* Read the force-chv1 flag. */
	relptr = get_one_do (app, 0x00C4, &buffer, &buflen, NULL);
	if (!relptr)
	{
	log_error (_("can't access %s - invalid OpenPGP card?\n"),
	"CHV Status Bytes");
	goto leave;
	}
	app->force_chv1 = (buflen && *buffer == 0);
	xfree (relptr);

	/* Read the extended capabilities. */
	relptr = get_one_do (app, 0x00C0, &buffer, &buflen, NULL);
	if (!relptr)
	{
	log_error (_("can't access %s - invalid OpenPGP card?\n"),
	"Extended Capability Flags" );
	goto leave;
	}
	if (buflen)
	{
	app->app_local->extcap.sm_supported = !!(*buffer & 0x80);
	app->app_local->extcap.get_challenge = !!(*buffer & 0x40);
	app->app_local->extcap.key_import = !!(*buffer & 0x20);
	app->app_local->extcap.change_force_chv = !!(*buffer & 0x10);
	app->app_local->extcap.private_dos = !!(*buffer & 0x08);
	app->app_local->extcap.algo_attr_change = !!(*buffer & 0x04);
	app->app_local->extcap.has_decrypt = !!(*buffer & 0x02);
	app->app_local->extcap.kdf_do = !!(*buffer & 0x01);
	}
	if (buflen >= 10)
	{
	/* Available with cards of v2 or later. */
	app->app_local->extcap.sm_algo = buffer[1];
	app->app_local->extcap.max_get_challenge
	= (buffer[2] << 8 \| buffer[3]);
	app->app_local->extcap.max_certlen_3 = (buffer[4] << 8 \| buffer[5]);

	/* Interpretation is different between v2 and v3, unfortunately. */
	if (app->app_local->extcap.extcap_v3)
	{
	app->app_local->extcap.max_special_do
	= (buffer[6] << 8 \| buffer[7]);
	app->app_local->extcap.pin_blk2 = !!(buffer[8] & 0x01);
	app->app_local->extcap.mse= !!(buffer[9] & 0x01);
	}
	}
	xfree (relptr);

	/* Some of the first cards accidentally don't set the
	CHANGE_FORCE_CHV bit but allow it anyway. */
	if (app->card_version <= 0x0100 && manufacturer == 1)
	app->app_local->extcap.change_force_chv = 1;

	/* Check optional DO of "General Feature Management" for button. */
	relptr = get_one_do (app, 0x7f74, &buffer, &buflen, NULL);
	if (relptr)
	/* It must be: 03 81 01 20 */
	app->app_local->extcap.has_button = 1;

	parse_login_data (app);

	if (opt.verbose)
	show_caps (app->app_local);

	parse_algorithm_attribute (app, 0);
	parse_algorithm_attribute (app, 1);
	parse_algorithm_attribute (app, 2);

	if (opt.verbose > 1)
	dump_all_do (slot);

	app->fnc.deinit = do_deinit;
	app->fnc.learn_status = do_learn_status;
	app->fnc.readcert = do_readcert;
	app->fnc.readkey = do_readkey;
	app->fnc.getattr = do_getattr;
	app->fnc.setattr = do_setattr;
	app->fnc.writecert = do_writecert;
	app->fnc.writekey = do_writekey;
	app->fnc.genkey = do_genkey;
	app->fnc.sign = do_sign;
	app->fnc.auth = do_auth;
	app->fnc.decipher = do_decipher;
	app->fnc.change_pin = do_change_pin;
	app->fnc.check_pin = do_check_pin;
	}

	leave:
	if (rc)
	do_deinit (app);
	return rc;
	}
	diff --git a/scd/app.c b/scd/app.c
	index c6c1f84c0..2e2729e32 100644
	--- a/scd/app.c
	+++ b/scd/app.c
	@@ -1,1201 +1,1201 @@
	/* app.c - Application selection.
	* Copyright (C) 2003, 2004, 2005 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 3 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, see <https://www.gnu.org/licenses/>.
	*/

	#include <config.h>
	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <npth.h>

	#include "scdaemon.h"
	#include "../common/exechelp.h"
	#include "app-common.h"
	#include "iso7816.h"
	#include "apdu.h"
	#include "../common/tlv.h"

	static npth_mutex_t app_list_lock;
	static app_t app_top;

	static void
	print_progress_line (void opaque, const char what, int pc, int cur, int tot)
	{
	ctrl_t ctrl = opaque;
	char line[100];

	if (ctrl)
	{
	snprintf (line, sizeof line, "%s %c %d %d", what, pc, cur, tot);
	send_status_direct (ctrl, "PROGRESS", line);
	}
	}


	/* Lock the reader SLOT. This function shall be used right before
	calling any of the actual application functions to serialize access
	to the reader. We do this always even if the reader is not
	actually used. This allows an actual connection to assume that it
	never shares a reader (while performing one command). Returns 0 on
	success; only then the unlock_reader function must be called after
	returning from the handler. */
	static gpg_error_t
	lock_app (app_t app, ctrl_t ctrl)
	{
	if (npth_mutex_lock (&app->lock))
	{
	gpg_error_t err = gpg_error_from_syserror ();
	log_error ("failed to acquire APP lock for %p: %s\n",
	app, gpg_strerror (err));
	return err;
	}

	apdu_set_progress_cb (app->slot, print_progress_line, ctrl);
	apdu_set_prompt_cb (app->slot, popup_prompt, ctrl);

	return 0;
	}

	/* Release a lock on the reader. See lock_reader(). */
	static void
	unlock_app (app_t app)
	{
	apdu_set_progress_cb (app->slot, NULL, NULL);
	apdu_set_prompt_cb (app->slot, NULL, NULL);

	if (npth_mutex_unlock (&app->lock))
	{
	gpg_error_t err = gpg_error_from_syserror ();
	log_error ("failed to release APP lock for %p: %s\n",
	app, gpg_strerror (err));
	}
	}


	/* This function may be called to print information pertaining to the
	current state of this module to the log. */
	void
	app_dump_state (void)
	{
	app_t a;

	npth_mutex_lock (&app_list_lock);
	for (a = app_top; a; a = a->next)
	log_info ("app_dump_state: app=%p type='%s'\n", a, a->apptype);
	npth_mutex_unlock (&app_list_lock);
	}

	/* Check whether the application NAME is allowed. This does not mean
	we have support for it though. */
	static int
	is_app_allowed (const char *name)
	{
	strlist_t l;

	for (l=opt.disabled_applications; l; l = l->next)
	if (!strcmp (l->d, name))
	return 0; /* no */
	return 1; /* yes */
	}


	static gpg_error_t
	check_conflict (app_t app, const char *name)
	{
	if (!app \|\| !name \|\| (app->apptype && !ascii_strcasecmp (app->apptype, name)))
	return 0;

	log_info ("application '%s' in use - can't switch\n",
	app->apptype? app->apptype : "<null>");

	return gpg_error (GPG_ERR_CONFLICT);
	}

	/* This function is used by the serialno command to check for an
	application conflict which may appear if the serialno command is
	used to request a specific application and the connection has
	already done a select_application. */
	gpg_error_t
	check_application_conflict (const char *name, app_t app)
	{
	return check_conflict (app, name);
	}


	gpg_error_t
	app_reset (app_t app, ctrl_t ctrl, int send_reset)
	{
	gpg_error_t err = 0;

	if (send_reset)
	{
	int sw;

	lock_app (app, ctrl);
	sw = apdu_reset (app->slot);
	if (sw)
	err = gpg_error (GPG_ERR_CARD_RESET);

	app->reset_requested = 1;
	unlock_app (app);

	scd_kick_the_loop ();
	gnupg_sleep (1);
	}
	else
	{
	ctrl->app_ctx = NULL;
	release_application (app, 0);
	}

	return err;
	}

	static gpg_error_t
	app_new_register (int slot, ctrl_t ctrl, const char *name,
	int periodical_check_needed)
	{
	gpg_error_t err = 0;
	app_t app = NULL;
	unsigned char *result = NULL;
	size_t resultlen;
	int want_undefined;

	/* Need to allocate a new one. */
	app = xtrycalloc (1, sizeof *app);
	if (!app)
	{
	err = gpg_error_from_syserror ();
	log_info ("error allocating context: %s\n", gpg_strerror (err));
	return err;
	}

	app->slot = slot;
	app->card_status = (unsigned int)-1;

	if (npth_mutex_init (&app->lock, NULL))
	{
	err = gpg_error_from_syserror ();
	log_error ("error initializing mutex: %s\n", gpg_strerror (err));
	xfree (app);
	return err;
	}

	err = lock_app (app, ctrl);
	if (err)
	{
	xfree (app);
	return err;
	}

	want_undefined = (name && !strcmp (name, "undefined"));

	/* Try to read the GDO file first to get a default serial number.
	We skip this if the undefined application has been requested. */
	if (!want_undefined)
	{
	err = iso7816_select_file (slot, 0x3F00, 1);
	if (gpg_err_code (err) == GPG_ERR_CARD)
	{
	/* Might be SW==0x7D00. Let's test whether it is a Yubikey
	* by selecting its manager application and then reading the
	* config. */
	static char const yk_aid[] =
	{ 0xA0, 0x00, 0x00, 0x05, 0x27, 0x47, 0x11, 0x17 }; /MGR/
	unsigned char *buf;
	size_t buflen;
	const unsigned char s0, s1;
	size_t n;

	if (!iso7816_select_application (slot, yk_aid, sizeof yk_aid,
	0x0001)
	&& !iso7816_apdu_direct (slot, "\x00\x1d\x00\x00\x00", 5, 0,
	NULL, &buf, &buflen))
	{
	app->cardtype = "yubikey";
	if (opt.verbose)
	{
	log_info ("Yubico: config=");
	log_printhex (buf, buflen, "");
	}

	/* We skip the first byte which seems to be the total
	* length of the config data. */
	if (buflen > 1)
	{
	s0 = find_tlv (buf+1, buflen-1, 0x04, &n); /* Form factor */
	if (s0 && n == 1)
	{
	s1 = find_tlv (buf+1, buflen-1, 0x02, &n); /* Serial */
	if (s1 && n >= 4)
	{
	app->serialno = xtrymalloc (3 + 1 + n);
	if (app->serialno)
	{
	app->serialnolen = 3 + 1 + n;
	app->serialno[0] = 0xff;
	app->serialno[1] = 0x02;
	app->serialno[2] = 0x0;
	app->serialno[3] = *s0;
	memcpy (app->serialno + 4, s1, n);
	/* Note that we do not clear the error
	* so that no further serial number
	* testing is done. After all we just
	* set the serial number. */
	}
	}
	}
	}
	xfree (buf);
	}
	}

	if (!err)
	err = iso7816_select_file (slot, 0x2F02, 0);
	if (!err)
	err = iso7816_read_binary (slot, 0, 0, &result, &resultlen);
	if (!err)
	{
	size_t n;
	const unsigned char *p;

	p = find_tlv_unchecked (result, resultlen, 0x5A, &n);
	if (p)
	resultlen -= (p-result);
	if (p && n > resultlen && n == 0x0d && resultlen+1 == n)
	{
	/* The object it does not fit into the buffer. This is an
	invalid encoding (or the buffer is too short. However, I
	have some test cards with such an invalid encoding and
	therefore I use this ugly workaround to return something
	I can further experiment with. */
	log_info ("enabling BMI testcard workaround\n");
	n--;
	}

	if (p && n <= resultlen)
	{
	/* The GDO file is pretty short, thus we simply reuse it for
	storing the serial number. */
	memmove (result, p, n);
	app->serialno = result;
	app->serialnolen = n;
	err = app_munge_serialno (app);
	if (err)
	goto leave;
	}
	else
	xfree (result);
	result = NULL;
	}
	}

	/* Figure out the application to use. */
	if (want_undefined)
	{
	/* We switch to the "undefined" application only if explicitly
	requested. */
	app->apptype = "UNDEFINED";
	/* Clear the error so that we don't run through the application
	* selection chain. */
	err = 0;
	}
	else
	{
	/* For certain error codes, there is no need to try more. */
	if (gpg_err_code (err) == GPG_ERR_CARD_NOT_PRESENT
	\|\| gpg_err_code (err) == GPG_ERR_ENODEV)
	goto leave;

	/* Set a default error so that we run through the application
	* selecion chain. */
	err = gpg_error (GPG_ERR_NOT_FOUND);
	}

	if (err && is_app_allowed ("openpgp")
	&& (!name \|\| !strcmp (name, "openpgp")))
	err = app_select_openpgp (app);
	if (err && is_app_allowed ("piv") && (!name \|\| !strcmp (name, "piv")))
	err = app_select_piv (app);
	if (err && is_app_allowed ("nks") && (!name \|\| !strcmp (name, "nks")))
	err = app_select_nks (app);
	if (err && is_app_allowed ("p15") && (!name \|\| !strcmp (name, "p15")))
	err = app_select_p15 (app);
	if (err && is_app_allowed ("geldkarte")
	&& (!name \|\| !strcmp (name, "geldkarte")))
	err = app_select_geldkarte (app);
	if (err && is_app_allowed ("dinsig") && (!name \|\| !strcmp (name, "dinsig")))
	err = app_select_dinsig (app);
	if (err && is_app_allowed ("sc-hsm") && (!name \|\| !strcmp (name, "sc-hsm")))
	err = app_select_sc_hsm (app);
	if (err && name && gpg_err_code (err) != GPG_ERR_OBJ_TERM_STATE)
	err = gpg_error (GPG_ERR_NOT_SUPPORTED);

	leave:
	if (err)
	{
	if (name)
	log_info ("can't select application '%s': %s\n",
	name, gpg_strerror (err));
	else
	log_info ("no supported card application found: %s\n",
	gpg_strerror (err));
	unlock_app (app);
	xfree (app);
	return err;
	}

	app->periodical_check_needed = periodical_check_needed;
	app->next = app_top;
	app_top = app;
	unlock_app (app);
	return 0;
	}

	/* If called with NAME as NULL, select the best fitting application
	and return a context; otherwise select the application with NAME
	and return a context. Returns an error code and stores NULL at
	R_APP if no application was found or no card is present. */
	gpg_error_t
	select_application (ctrl_t ctrl, const char name, app_t r_app,
	int scan, const unsigned char *serialno_bin,
	size_t serialno_bin_len)
	{
	gpg_error_t err = 0;
	app_t a, a_prev = NULL;

	*r_app = NULL;

	npth_mutex_lock (&app_list_lock);

	if (scan \|\| !app_top)
	{
	struct dev_list *l;
	int new_app = 0;

	/* Scan the devices to find new device(s). */
	err = apdu_dev_list_start (opt.reader_port, &l);
	if (err)
	{
	npth_mutex_unlock (&app_list_lock);
	return err;
	}

	while (1)
	{
	int slot;
	int periodical_check_needed_this;

	slot = apdu_open_reader (l, !app_top);
	if (slot < 0)
	break;

	periodical_check_needed_this = apdu_connect (slot);
	if (periodical_check_needed_this < 0)
	{
	/* We close a reader with no card. */
	err = gpg_error (GPG_ERR_ENODEV);
	}
	else
	{
	err = app_new_register (slot, ctrl, name,
	periodical_check_needed_this);
	new_app++;
	}

	if (err)
	apdu_close_reader (slot);
	}

	apdu_dev_list_finish (l);

	/* If new device(s), kick the scdaemon loop. */
	if (new_app)
	scd_kick_the_loop ();
	}

	for (a = app_top; a; a = a->next)
	{
	lock_app (a, ctrl);
	if (serialno_bin == NULL)
	break;
	if (a->serialnolen == serialno_bin_len
	&& !memcmp (a->serialno, serialno_bin, a->serialnolen))
	break;
	unlock_app (a);
	a_prev = a;
	}

	if (a)
	{
	err = check_conflict (a, name);
	if (!err)
	{
	a->ref_count++;
	*r_app = a;
	if (a_prev)
	{
	a_prev->next = a->next;
	a->next = app_top;
	app_top = a;
	}
	}
	unlock_app (a);
	}
	else
	err = gpg_error (GPG_ERR_ENODEV);

	npth_mutex_unlock (&app_list_lock);

	return err;
	}


	char *
	get_supported_applications (void)
	{
	const char *list[] = {
	"openpgp",
	"piv",
	"nks",
	"p15",
	"geldkarte",
	"dinsig",
	"sc-hsm",
	/* Note: "undefined" is not listed here because it needs special
	treatment by the client. */
	NULL
	};
	int idx;
	size_t nbytes;
	char buffer, p;

	for (nbytes=1, idx=0; list[idx]; idx++)
	nbytes += strlen (list[idx]) + 1 + 1;

	buffer = xtrymalloc (nbytes);
	if (!buffer)
	return NULL;

	for (p=buffer, idx=0; list[idx]; idx++)
	if (is_app_allowed (list[idx]))
	p = stpcpy (stpcpy (p, list[idx]), ":\n");
	*p = 0;

	return buffer;
	}


	/* Deallocate the application. */
	static void
	deallocate_app (app_t app)
	{
	app_t a, a_prev = NULL;

	for (a = app_top; a; a = a->next)
	if (a == app)
	{
	if (a_prev == NULL)
	app_top = a->next;
	else
	a_prev->next = a->next;
	break;
	}
	else
	a_prev = a;

	if (app->ref_count)
	log_error ("trying to release context used yet (%d)\n", app->ref_count);

	if (app->fnc.deinit)
	{
	app->fnc.deinit (app);
	app->fnc.deinit = NULL;
	}

	xfree (app->serialno);

	unlock_app (app);
	xfree (app);
	}

	/* Free the resources associated with the application APP. APP is
	allowed to be NULL in which case this is a no-op. Note that we are
	using reference counting to track the users of the application and
	actually deferring the deallocation to allow for a later reuse by
	a new connection. */
	void
	release_application (app_t app, int locked_already)
	{
	if (!app)
	return;

	/* We don't deallocate app here. Instead, we keep it. This is
	useful so that a card does not get reset even if only one session
	is using the card - this way the PIN cache and other cached data
	are preserved. */

	if (!locked_already)
	lock_app (app, NULL);

	if (!app->ref_count)
	log_bug ("trying to release an already released context\n");

	--app->ref_count;
	if (!locked_already)
	unlock_app (app);
	}



	/* The serial number may need some cosmetics. Do it here. This
	function shall only be called once after a new serial number has
	been put into APP->serialno.

	Prefixes we use:

	FF 00 00 = For serial numbers starting with an FF
	FF 01 00 = Some german p15 cards return an empty serial number so the
	serial number from the EF(TokenInfo) is used instead.
	FF 02 00 = Serial number from Yubikey config
	FF 7F 00 = No serialno.

	All other serial number not starting with FF are used as they are.
	*/
	gpg_error_t
	app_munge_serialno (app_t app)
	{
	if (app->serialnolen && app->serialno[0] == 0xff)
	{
	/* The serial number starts with our special prefix. This
	requires that we put our default prefix "FF0000" in front. */
	unsigned char *p = xtrymalloc (app->serialnolen + 3);
	if (!p)
	return gpg_error_from_syserror ();
	memcpy (p, "\xff\0", 3);
	memcpy (p+3, app->serialno, app->serialnolen);
	app->serialnolen += 3;
	xfree (app->serialno);
	app->serialno = p;
	}
	else if (!app->serialnolen)
	{
	unsigned char *p = xtrymalloc (3);
	if (!p)
	return gpg_error_from_syserror ();
	memcpy (p, "\xff\x7f", 3);
	app->serialnolen = 3;
	xfree (app->serialno);
	app->serialno = p;
	}
	return 0;
	}



	/* Retrieve the serial number of the card. The serial number is
	returned as a malloced string (hex encoded) in SERIAL. Caller must
	free SERIAL unless the function returns an error. */
	char *
	app_get_serialno (app_t app)
	{
	char *serial;

	if (!app)
	return NULL;

	if (!app->serialnolen)
	serial = xtrystrdup ("FF7F00");
	else
	serial = bin2hex (app->serialno, app->serialnolen, NULL);

	return serial;
	}


	/* Write out the application specifig status lines for the LEARN
	command. */
	gpg_error_t
	app_write_learn_status (app_t app, ctrl_t ctrl, unsigned int flags)
	{
	gpg_error_t err;

	if (!app)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->fnc.learn_status)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);

	/* We do not send CARD and APPTYPE if only keypairinfo is requested. */
	if (app->cardtype && !(flags & 1))
	send_status_direct (ctrl, "CARDTYPE", app->cardtype);
	if (app->apptype && !(flags & 1))
	send_status_direct (ctrl, "APPTYPE", app->apptype);

	err = lock_app (app, ctrl);
	if (err)
	return err;
	err = app->fnc.learn_status (app, ctrl, flags);
	unlock_app (app);
	return err;
	}


	/* Read the certificate with id CERTID (as returned by learn_status in
	the CERTINFO status lines) and return it in the freshly allocated
	buffer put into CERT and the length of the certificate put into
	CERTLEN. */
	gpg_error_t
	app_readcert (app_t app, ctrl_t ctrl, const char *certid,
	unsigned char *cert, size_t certlen)
	{
	gpg_error_t err;

	if (!app)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->ref_count)
	return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
	if (!app->fnc.readcert)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
	err = lock_app (app, ctrl);
	if (err)
	return err;
	err = app->fnc.readcert (app, certid, cert, certlen);
	unlock_app (app);
	return err;
	}


	/* Read the key with ID KEYID. On success a canonical encoded
	S-expression with the public key will get stored at PK and its
	length (for assertions) at PKLEN; the caller must release that
	buffer. On error NULL will be stored at PK and PKLEN and an error
	code returned.

	This function might not be supported by all applications. */
	gpg_error_t
	app_readkey (app_t app, ctrl_t ctrl, int advanced, const char *keyid,
	unsigned char *pk, size_t pklen)
	{
	gpg_error_t err;

	if (pk)
	*pk = NULL;
	if (pklen)
	*pklen = 0;

	if (!app \|\| !keyid \|\| !pk \|\| !pklen)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->ref_count)
	return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
	if (!app->fnc.readkey)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
	err = lock_app (app, ctrl);
	if (err)
	return err;
	err= app->fnc.readkey (app, advanced, keyid, pk, pklen);
	unlock_app (app);
	return err;
	}


	/* Perform a GETATTR operation. */
	gpg_error_t
	app_getattr (app_t app, ctrl_t ctrl, const char *name)
	{
	gpg_error_t err;

	if (!app \|\| !name \|\| !*name)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->ref_count)
	return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);

	if (app->cardtype && name && !strcmp (name, "CARDTYPE"))
	{
	send_status_direct (ctrl, "CARDTYPE", app->cardtype);
	return 0;
	}
	if (app->apptype && name && !strcmp (name, "APPTYPE"))
	{
	send_status_direct (ctrl, "APPTYPE", app->apptype);
	return 0;
	}
	if (name && !strcmp (name, "SERIALNO"))
	{
	char *serial;

	serial = app_get_serialno (app);
	if (!serial)
	return gpg_error (GPG_ERR_INV_VALUE);

	send_status_direct (ctrl, "SERIALNO", serial);
	xfree (serial);
	return 0;
	}

	if (!app->fnc.getattr)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
	err = lock_app (app, ctrl);
	if (err)
	return err;
	err = app->fnc.getattr (app, ctrl, name);
	unlock_app (app);
	return err;
	}

	/* Perform a SETATTR operation. */
	gpg_error_t
	app_setattr (app_t app, ctrl_t ctrl, const char *name,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const unsigned char *value, size_t valuelen)
	{
	gpg_error_t err;

	if (!app \|\| !name \|\| !*name \|\| !value)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->ref_count)
	return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
	if (!app->fnc.setattr)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
	err = lock_app (app, ctrl);
	if (err)
	return err;
	err = app->fnc.setattr (app, name, pincb, pincb_arg, value, valuelen);
	unlock_app (app);
	return err;
	}

	/* Create the signature and return the allocated result in OUTDATA.
	If a PIN is required the PINCB will be used to ask for the PIN; it
	should return the PIN in an allocated buffer and put it into PIN. */
	gpg_error_t
	app_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen )
	{
	gpg_error_t err;

	if (!app \|\| !indata \|\| !indatalen \|\| !outdata \|\| !outdatalen \|\| !pincb)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->ref_count)
	return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
	if (!app->fnc.sign)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
	err = lock_app (app, ctrl);
	if (err)
	return err;
	err = app->fnc.sign (app, keyidstr, hashalgo,
	pincb, pincb_arg,
	indata, indatalen,
	outdata, outdatalen);
	unlock_app (app);
	if (opt.verbose)
	log_info ("operation sign result: %s\n", gpg_strerror (err));
	return err;
	}

	/* Create the signature using the INTERNAL AUTHENTICATE command and
	return the allocated result in OUTDATA. If a PIN is required the
	PINCB will be used to ask for the PIN; it should return the PIN in
	an allocated buffer and put it into PIN. */
	gpg_error_t
	app_auth (app_t app, ctrl_t ctrl, const char *keyidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen )
	{
	gpg_error_t err;

	if (!app \|\| !indata \|\| !indatalen \|\| !outdata \|\| !outdatalen \|\| !pincb)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->ref_count)
	return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
	if (!app->fnc.auth)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
	err = lock_app (app, ctrl);
	if (err)
	return err;
	err = app->fnc.auth (app, keyidstr,
	pincb, pincb_arg,
	indata, indatalen,
	outdata, outdatalen);
	unlock_app (app);
	if (opt.verbose)
	log_info ("operation auth result: %s\n", gpg_strerror (err));
	return err;
	}


	/* Decrypt the data in INDATA and return the allocated result in OUTDATA.
	If a PIN is required the PINCB will be used to ask for the PIN; it
	should return the PIN in an allocated buffer and put it into PIN. */
	gpg_error_t
	app_decipher (app_t app, ctrl_t ctrl, const char *keyidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const void *indata, size_t indatalen,
	unsigned char *outdata, size_t outdatalen,
	unsigned int *r_info)
	{
	gpg_error_t err;

	*r_info = 0;

	if (!app \|\| !indata \|\| !indatalen \|\| !outdata \|\| !outdatalen \|\| !pincb)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->ref_count)
	return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
	if (!app->fnc.decipher)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
	err = lock_app (app, ctrl);
	if (err)
	return err;
	err = app->fnc.decipher (app, keyidstr,
	pincb, pincb_arg,
	indata, indatalen,
	outdata, outdatalen,
	r_info);
	unlock_app (app);
	if (opt.verbose)
	log_info ("operation decipher result: %s\n", gpg_strerror (err));
	return err;
	}


	/* Perform the WRITECERT operation. */
	gpg_error_t
	app_writecert (app_t app, ctrl_t ctrl,
	const char *certidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const unsigned char *data, size_t datalen)
	{
	gpg_error_t err;

	if (!app \|\| !certidstr \|\| !*certidstr \|\| !pincb)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->ref_count)
	return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
	if (!app->fnc.writecert)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
	err = lock_app (app, ctrl);
	if (err)
	return err;
	err = app->fnc.writecert (app, ctrl, certidstr,
	pincb, pincb_arg, data, datalen);
	unlock_app (app);
	if (opt.verbose)
	log_info ("operation writecert result: %s\n", gpg_strerror (err));
	return err;
	}


	/* Perform the WRITEKEY operation. */
	gpg_error_t
	app_writekey (app_t app, ctrl_t ctrl,
	const char *keyidstr, unsigned int flags,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg,
	const unsigned char *keydata, size_t keydatalen)
	{
	gpg_error_t err;

	if (!app \|\| !keyidstr \|\| !*keyidstr \|\| !pincb)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->ref_count)
	return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
	if (!app->fnc.writekey)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
	err = lock_app (app, ctrl);
	if (err)
	return err;
	err = app->fnc.writekey (app, ctrl, keyidstr, flags,
	pincb, pincb_arg, keydata, keydatalen);
	unlock_app (app);
	if (opt.verbose)
	log_info ("operation writekey result: %s\n", gpg_strerror (err));
	return err;
	}


	/* Perform a SETATTR operation. */
	gpg_error_t
	-app_genkey (app_t app, ctrl_t ctrl, const char *keynostr, unsigned int flags,
	- time_t createtime,
	+app_genkey (app_t app, ctrl_t ctrl, const char *keynostr,
	+ const char *keytype, unsigned int flags, time_t createtime,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	gpg_error_t err;

	if (!app \|\| !keynostr \|\| !*keynostr \|\| !pincb)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->ref_count)
	return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
	if (!app->fnc.genkey)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
	err = lock_app (app, ctrl);
	if (err)
	return err;
	- err = app->fnc.genkey (app, ctrl, keynostr, flags,
	+ err = app->fnc.genkey (app, ctrl, keynostr, keytype, flags,
	createtime, pincb, pincb_arg);
	unlock_app (app);
	if (opt.verbose)
	log_info ("operation genkey result: %s\n", gpg_strerror (err));
	return err;
	}


	/* Perform a GET CHALLENGE operation. This function is special as it
	directly accesses the card without any application specific
	wrapper. */
	gpg_error_t
	app_get_challenge (app_t app, ctrl_t ctrl, size_t nbytes, unsigned char *buffer)
	{
	gpg_error_t err;

	if (!app \|\| !nbytes \|\| !buffer)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->ref_count)
	return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
	err = lock_app (app, ctrl);
	if (err)
	return err;
	err = iso7816_get_challenge (app->slot, nbytes, buffer);
	unlock_app (app);
	return err;
	}



	/* Perform a CHANGE REFERENCE DATA or RESET RETRY COUNTER operation. */
	gpg_error_t
	app_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr,
	unsigned int flags,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	gpg_error_t err;

	if (!app \|\| !chvnostr \|\| !*chvnostr \|\| !pincb)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->ref_count)
	return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
	if (!app->fnc.change_pin)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
	err = lock_app (app, ctrl);
	if (err)
	return err;
	err = app->fnc.change_pin (app, ctrl, chvnostr, flags, pincb, pincb_arg);
	unlock_app (app);
	if (opt.verbose)
	log_info ("operation change_pin result: %s\n", gpg_strerror (err));
	return err;
	}


	/* Perform a VERIFY operation without doing anything else. This may
	be used to initialize a the PIN cache for long lasting other
	operations. Its use is highly application dependent. */
	gpg_error_t
	app_check_pin (app_t app, ctrl_t ctrl, const char *keyidstr,
	gpg_error_t (pincb)(void, const char , char *),
	void *pincb_arg)
	{
	gpg_error_t err;

	if (!app \|\| !keyidstr \|\| !*keyidstr \|\| !pincb)
	return gpg_error (GPG_ERR_INV_VALUE);
	if (!app->ref_count)
	return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
	if (!app->fnc.check_pin)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
	err = lock_app (app, ctrl);
	if (err)
	return err;
	err = app->fnc.check_pin (app, keyidstr, pincb, pincb_arg);
	unlock_app (app);
	if (opt.verbose)
	log_info ("operation check_pin result: %s\n", gpg_strerror (err));
	return err;
	}

	static void
	report_change (int slot, int old_status, int cur_status)
	{
	char homestr, envstr;
	char *fname;
	char templ[50];
	FILE *fp;

	snprintf (templ, sizeof templ, "reader_%d.status", slot);
	fname = make_filename (gnupg_homedir (), templ, NULL );
	fp = fopen (fname, "w");
	if (fp)
	{
	fprintf (fp, "%s\n",
	(cur_status & 1)? "USABLE":
	(cur_status & 4)? "ACTIVE":
	(cur_status & 2)? "PRESENT": "NOCARD");
	fclose (fp);
	}
	xfree (fname);

	homestr = make_filename (gnupg_homedir (), NULL);
	if (gpgrt_asprintf (&envstr, "GNUPGHOME=%s", homestr) < 0)
	log_error ("out of core while building environment\n");
	else
	{
	gpg_error_t err;
	const char args[9], envs[2];
	char numbuf1[30], numbuf2[30], numbuf3[30];

	envs[0] = envstr;
	envs[1] = NULL;

	sprintf (numbuf1, "%d", slot);
	sprintf (numbuf2, "0x%04X", old_status);
	sprintf (numbuf3, "0x%04X", cur_status);
	args[0] = "--reader-port";
	args[1] = numbuf1;
	args[2] = "--old-code";
	args[3] = numbuf2;
	args[4] = "--new-code";
	args[5] = numbuf3;
	args[6] = "--status";
	args[7] = ((cur_status & 1)? "USABLE":
	(cur_status & 4)? "ACTIVE":
	(cur_status & 2)? "PRESENT": "NOCARD");
	args[8] = NULL;

	fname = make_filename (gnupg_homedir (), "scd-event", NULL);
	err = gnupg_spawn_process_detached (fname, args, envs);
	if (err && gpg_err_code (err) != GPG_ERR_ENOENT)
	log_error ("failed to run event handler '%s': %s\n",
	fname, gpg_strerror (err));
	xfree (fname);
	xfree (envstr);
	}
	xfree (homestr);
	}

	int
	scd_update_reader_status_file (void)
	{
	app_t a, app_next;
	int periodical_check_needed = 0;

	npth_mutex_lock (&app_list_lock);
	for (a = app_top; a; a = app_next)
	{
	int sw;
	unsigned int status;

	lock_app (a, NULL);
	app_next = a->next;

	if (a->reset_requested)
	status = 0;
	else
	{
	sw = apdu_get_status (a->slot, 0, &status);
	if (sw == SW_HOST_NO_READER)
	{
	/* Most likely the _reader_ has been unplugged. */
	status = 0;
	}
	else if (sw)
	{
	/* Get status failed. Ignore that. */
	if (a->periodical_check_needed)
	periodical_check_needed = 1;
	unlock_app (a);
	continue;
	}
	}

	if (a->card_status != status)
	{
	report_change (a->slot, a->card_status, status);
	send_client_notifications (a, status == 0);

	if (status == 0)
	{
	log_debug ("Removal of a card: %d\n", a->slot);
	apdu_close_reader (a->slot);
	deallocate_app (a);
	}
	else
	{
	a->card_status = status;
	if (a->periodical_check_needed)
	periodical_check_needed = 1;
	unlock_app (a);
	}
	}
	else
	{
	if (a->periodical_check_needed)
	periodical_check_needed = 1;
	unlock_app (a);
	}
	}
	npth_mutex_unlock (&app_list_lock);

	return periodical_check_needed;
	}

	/* This function must be called once to initialize this module. This
	has to be done before a second thread is spawned. We can't do the
	static initialization because Pth emulation code might not be able
	to do a static init; in particular, it is not possible for W32. */
	gpg_error_t
	initialize_module_command (void)
	{
	gpg_error_t err;

	if (npth_mutex_init (&app_list_lock, NULL))
	{
	err = gpg_error_from_syserror ();
	log_error ("app: error initializing mutex: %s\n", gpg_strerror (err));
	return err;
	}

	return apdu_init ();
	}

	void
	app_send_card_list (ctrl_t ctrl)
	{
	app_t a;
	char buf[65];

	npth_mutex_lock (&app_list_lock);
	for (a = app_top; a; a = a->next)
	{
	if (DIM (buf) < 2 * a->serialnolen + 1)
	continue;

	bin2hex (a->serialno, a->serialnolen, buf);
	send_status_direct (ctrl, "SERIALNO", buf);
	}
	npth_mutex_unlock (&app_list_lock);
	}
	diff --git a/scd/command.c b/scd/command.c
	index fb0ba98fc..8fd6ba55d 100644
	--- a/scd/command.c
	+++ b/scd/command.c
	@@ -1,2098 +1,2099 @@
	/* command.c - SCdaemon command handler
	* Copyright (C) 2001, 2002, 2003, 2004, 2005,
	* 2007, 2008, 2009, 2011 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 3 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, see <https://www.gnu.org/licenses/>.
	*/

	#include <config.h>
	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <ctype.h>
	#include <unistd.h>
	#include <signal.h>
	#ifdef USE_NPTH
	# include <npth.h>
	#endif

	#include "scdaemon.h"
	#include <assuan.h>
	#include <ksba.h>
	#include "app-common.h"
	#include "iso7816.h"
	#include "apdu.h" /* Required for apdu__reader (). /
	#include "atr.h"
	#ifdef HAVE_LIBUSB
	#include "ccid-driver.h"
	#endif
	#include "../common/asshelp.h"
	#include "../common/server-help.h"

	/* Maximum length allowed as a PIN; used for INQUIRE NEEDPIN */
	#define MAXLEN_PIN 100

	/* Maximum allowed size of key data as used in inquiries. */
	#define MAXLEN_KEYDATA 4096

	/* Maximum allowed total data size for SETDATA. */
	#define MAXLEN_SETDATA 4096

	/* Maximum allowed size of certificate data as used in inquiries. */
	#define MAXLEN_CERTDATA 16384

	/* Maximum allowed size for "SETATTR --inquire". */
	#define MAXLEN_SETATTRDATA 16384


	#define set_error(e,t) assuan_set_error (ctx, gpg_error (e), (t))

	#define IS_LOCKED(c) (locked_session && locked_session != (c)->server_local)


	/* Data used to associate an Assuan context with local server data.
	This object describes the local properties of one session. */
	struct server_local_s
	{
	/* We keep a list of all active sessions with the anchor at
	SESSION_LIST (see below). This field is used for linking. */
	struct server_local_s *next_session;

	/* This object is usually assigned to a CTRL object (which is
	globally visible). While enumerating all sessions we sometimes
	need to access data of the CTRL object; thus we keep a
	backpointer here. */
	ctrl_t ctrl_backlink;

	/* The Assuan context used by this session/server. */
	assuan_context_t assuan_ctx;

	#ifdef HAVE_W32_SYSTEM
	void event_signal; / Or NULL if not used. */
	#else
	int event_signal; /* Or 0 if not used. */
	#endif

	/* True if the card has been removed and a reset is required to
	continue operation. */
	int card_removed;

	/* If set to true we will be terminate ourself at the end of the
	this session. */
	int stopme;

	};


	/* To keep track of all running sessions, we link all active server
	contexts and the anchor in this variable. */
	static struct server_local_s *session_list;

	/* If a session has been locked we store a link to its server object
	in this variable. */
	static struct server_local_s *locked_session;


	/* Convert the STRING into a newly allocated buffer while translating
	the hex numbers. Stops at the first invalid character. Blanks and
	colons are allowed to separate the hex digits. Returns NULL on
	error or a newly malloced buffer and its length in LENGTH. */
	static unsigned char *
	hex_to_buffer (const char string, size_t r_length)
	{
	unsigned char *buffer;
	const char *s;
	size_t n;

	buffer = xtrymalloc (strlen (string)+1);
	if (!buffer)
	return NULL;
	for (s=string, n=0; *s; s++)
	{
	if (spacep (s) \|\| *s == ':')
	continue;
	if (hexdigitp (s) && hexdigitp (s+1))
	{
	buffer[n++] = xtoi_2 (s);
	s++;
	}
	else
	break;
	}
	*r_length = n;
	return buffer;
	}



	/* Reset the card and free the application context. With SEND_RESET
	set to true actually send a RESET to the reader; this is the normal
	way of calling the function. */
	static void
	do_reset (ctrl_t ctrl, int send_reset)
	{
	app_t app = ctrl->app_ctx;

	if (app)
	app_reset (app, ctrl, IS_LOCKED (ctrl)? 0: send_reset);

	/* If we hold a lock, unlock now. */
	if (locked_session && ctrl->server_local == locked_session)
	{
	locked_session = NULL;
	log_info ("implicitly unlocking due to RESET\n");
	}
	}

	static gpg_error_t
	reset_notify (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);

	(void) line;

	do_reset (ctrl, 1);
	return 0;
	}


	static gpg_error_t
	option_handler (assuan_context_t ctx, const char key, const char value)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);

	if (!strcmp (key, "event-signal"))
	{
	/* A value of 0 is allowed to reset the event signal. */
	#ifdef HAVE_W32_SYSTEM
	if (!*value)
	return gpg_error (GPG_ERR_ASS_PARAMETER);
	#ifdef _WIN64
	ctrl->server_local->event_signal = (void *)strtoull (value, NULL, 16);
	#else
	ctrl->server_local->event_signal = (void *)strtoul (value, NULL, 16);
	#endif
	#else
	int i = *value? atoi (value) : -1;
	if (i < 0)
	return gpg_error (GPG_ERR_ASS_PARAMETER);
	ctrl->server_local->event_signal = i;
	#endif
	}

	return 0;
	}


	/* If the card has not yet been opened, do it. */
	static gpg_error_t
	open_card (ctrl_t ctrl)
	{
	/* If we ever got a card not present error code, return that. Only
	the SERIALNO command and a reset are able to clear from that
	state. */
	if (ctrl->server_local->card_removed)
	return gpg_error (GPG_ERR_CARD_REMOVED);

	if ( IS_LOCKED (ctrl) )
	return gpg_error (GPG_ERR_LOCKED);

	if (ctrl->app_ctx)
	return 0;

	return select_application (ctrl, NULL, &ctrl->app_ctx, 0, NULL, 0);
	}

	/* Explicitly open a card for a specific use of APPTYPE or SERIALNO. */
	static gpg_error_t
	open_card_with_request (ctrl_t ctrl, const char apptype, const char serialno)
	{
	gpg_error_t err;
	unsigned char *serialno_bin = NULL;
	size_t serialno_bin_len = 0;
	app_t app = ctrl->app_ctx;

	/* If we are already initialized for one specific application we
	need to check that the client didn't requested a specific
	application different from the one in use before we continue. */
	if (apptype && ctrl->app_ctx)
	return check_application_conflict (apptype, ctrl->app_ctx);

	/* Re-scan USB devices. Release APP, before the scan. */
	ctrl->app_ctx = NULL;
	release_application (app, 0);

	if (serialno)
	serialno_bin = hex_to_buffer (serialno, &serialno_bin_len);

	err = select_application (ctrl, apptype, &ctrl->app_ctx, 1,
	serialno_bin, serialno_bin_len);
	xfree (serialno_bin);

	return err;
	}


	static const char hlp_serialno[] =
	"SERIALNO [--demand=<serialno>] [<apptype>]\n"
	"\n"
	"Return the serial number of the card using a status response. This\n"
	"function should be used to check for the presence of a card.\n"
	"\n"
	"If --demand is given, an application on the card with SERIALNO is\n"
	"selected and an error is returned if no such card available.\n"
	"\n"
	"If APPTYPE is given, an application of that type is selected and an\n"
	"error is returned if the application is not supported or available.\n"
	"The default is to auto-select the application using a hardwired\n"
	"preference system. Note, that a future extension to this function\n"
	"may enable specifying a list and order of applications to try.\n"
	"\n"
	"This function is special in that it can be used to reset the card.\n"
	"Most other functions will return an error when a card change has\n"
	"been detected and the use of this function is therefore required.\n"
	"\n"
	"Background: We want to keep the client clear of handling card\n"
	"changes between operations; i.e. the client can assume that all\n"
	"operations are done on the same card unless he calls this function.";
	static gpg_error_t
	cmd_serialno (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	struct server_local_s *sl;
	int rc = 0;
	char *serial;
	const char *demand;

	if ( IS_LOCKED (ctrl) )
	return gpg_error (GPG_ERR_LOCKED);

	if ((demand = has_option_name (line, "--demand")))
	{
	if (*demand != '=')
	return set_error (GPG_ERR_ASS_PARAMETER, "missing value for option");
	line = (char *)++demand;
	for (; *line && !spacep (line); line++)
	;
	if (*line)
	*line++ = 0;
	}
	else
	demand = NULL;

	/* Clear the remove flag so that the open_card is able to reread it. */
	if (ctrl->server_local->card_removed)
	ctrl->server_local->card_removed = 0;

	if ((rc = open_card_with_request (ctrl, *line? line:NULL, demand)))
	{
	ctrl->server_local->card_removed = 1;
	return rc;
	}

	/* Success, clear the card_removed flag for all sessions. */
	for (sl=session_list; sl; sl = sl->next_session)
	{
	ctrl_t c = sl->ctrl_backlink;

	if (c != ctrl)
	c->server_local->card_removed = 0;
	}

	serial = app_get_serialno (ctrl->app_ctx);
	if (!serial)
	return gpg_error (GPG_ERR_INV_VALUE);

	rc = assuan_write_status (ctx, "SERIALNO", serial);
	xfree (serial);
	return rc;
	}


	static const char hlp_learn[] =
	"LEARN [--force] [--keypairinfo]\n"
	"\n"
	"Learn all useful information of the currently inserted card. When\n"
	"used without the force options, the command might do an INQUIRE\n"
	"like this:\n"
	"\n"
	" INQUIRE KNOWNCARDP <hexstring_with_serialNumber>\n"
	"\n"
	"The client should just send an \"END\" if the processing should go on\n"
	"or a \"CANCEL\" to force the function to terminate with a Cancel\n"
	"error message.\n"
	"\n"
	"With the option --keypairinfo only KEYPARIINFO status lines are\n"
	"returned.\n"
	"\n"
	"The response of this command is a list of status lines formatted as\n"
	"this:\n"
	"\n"
	" S APPTYPE <apptype>\n"
	"\n"
	"This returns the type of the application, currently the strings:\n"
	"\n"
	" P15 = PKCS-15 structure used\n"
	" DINSIG = DIN SIG\n"
	" OPENPGP = OpenPGP card\n"
	" PIV = PIV card\n"
	" NKS = NetKey card\n"
	"\n"
	"are implemented. These strings are aliases for the AID\n"
	"\n"
	" S KEYPAIRINFO <hexstring_with_keygrip> <hexstring_with_id>\n"
	"\n"
	"If there is no certificate yet stored on the card a single 'X' is\n"
	"returned as the keygrip. In addition to the keypair info, information\n"
	"about all certificates stored on the card is also returned:\n"
	"\n"
	" S CERTINFO <certtype> <hexstring_with_id>\n"
	"\n"
	"Where CERTTYPE is a number indicating the type of certificate:\n"
	" 0 := Unknown\n"
	" 100 := Regular X.509 cert\n"
	" 101 := Trusted X.509 cert\n"
	" 102 := Useful X.509 cert\n"
	" 110 := Root CA cert in a special format (e.g. DINSIG)\n"
	" 111 := Root CA cert as standard X509 cert.\n"
	"\n"
	"For certain cards, more information will be returned:\n"
	"\n"
	" S KEY-FPR <no> <hexstring>\n"
	"\n"
	"For OpenPGP cards this returns the stored fingerprints of the\n"
	"keys. This can be used check whether a key is available on the\n"
	"card. NO may be 1, 2 or 3.\n"
	"\n"
	" S CA-FPR <no> <hexstring>\n"
	"\n"
	"Similar to above, these are the fingerprints of keys assumed to be\n"
	"ultimately trusted.\n"
	"\n"
	" S DISP-NAME <name_of_card_holder>\n"
	"\n"
	"The name of the card holder as stored on the card; percent\n"
	"escaping takes place, spaces are encoded as '+'\n"
	"\n"
	" S PUBKEY-URL <url>\n"
	"\n"
	"The URL to be used for locating the entire public key.\n"
	" \n"
	"Note, that this function may even be used on a locked card.";
	static gpg_error_t
	cmd_learn (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc = 0;
	int only_keypairinfo = has_option (line, "--keypairinfo");

	if ((rc = open_card (ctrl)))
	return rc;

	/* Unless the force option is used we try a shortcut by identifying
	the card using a serial number and inquiring the client with
	that. The client may choose to cancel the operation if he already
	knows about this card */
	if (!only_keypairinfo)
	{
	const char *reader;
	char *serial;
	app_t app = ctrl->app_ctx;

	if (!app)
	return gpg_error (GPG_ERR_CARD_NOT_PRESENT);

	reader = apdu_get_reader_name (app->slot);
	if (!reader)
	return out_of_core ();
	send_status_direct (ctrl, "READER", reader);
	/* No need to free the string of READER. */

	serial = app_get_serialno (ctrl->app_ctx);
	if (!serial)
	return gpg_error (GPG_ERR_INV_VALUE);

	rc = assuan_write_status (ctx, "SERIALNO", serial);
	if (rc < 0)
	{
	xfree (serial);
	return out_of_core ();
	}

	if (!has_option (line, "--force"))
	{
	char *command;

	rc = gpgrt_asprintf (&command, "KNOWNCARDP %s", serial);
	if (rc < 0)
	{
	xfree (serial);
	return out_of_core ();
	}
	rc = assuan_inquire (ctx, command, NULL, NULL, 0);
	xfree (command);
	if (rc)
	{
	if (gpg_err_code (rc) != GPG_ERR_ASS_CANCELED)
	log_error ("inquire KNOWNCARDP failed: %s\n",
	gpg_strerror (rc));
	xfree (serial);
	return rc;
	}
	/* Not canceled, so we have to proceed. */
	}
	xfree (serial);
	}

	/* Let the application print out its collection of useful status
	information. */
	if (!rc)
	rc = app_write_learn_status (ctrl->app_ctx, ctrl, only_keypairinfo);

	return rc;
	}



	static const char hlp_readcert[] =
	"READCERT <hexified_certid>\|<keyid>\|<oid>\n"
	"\n"
	"Note, that this function may even be used on a locked card.";
	static gpg_error_t
	cmd_readcert (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc;
	unsigned char *cert;
	size_t ncert;

	if ((rc = open_card (ctrl)))
	return rc;

	line = xstrdup (line); /* Need a copy of the line. */
	rc = app_readcert (ctrl->app_ctx, ctrl, line, &cert, &ncert);
	if (rc)
	log_error ("app_readcert failed: %s\n", gpg_strerror (rc));
	xfree (line);
	line = NULL;
	if (!rc)
	{
	rc = assuan_send_data (ctx, cert, ncert);
	xfree (cert);
	if (rc)
	return rc;
	}

	return rc;
	}


	static const char hlp_readkey[] =
	"READKEY [--advanced] <keyid>\|<oid>\n"
	"\n"
	"Return the public key for the given cert or key ID as a standard\n"
	"S-expression.\n"
	"In --advanced mode it returns the S-expression in advanced format.\n"
	"\n"
	"Note that this function may even be used on a locked card.";
	static gpg_error_t
	cmd_readkey (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc;
	int advanced = 0;
	unsigned char *cert = NULL;
	size_t ncert, n;
	ksba_cert_t kc = NULL;
	ksba_sexp_t p = NULL;
	unsigned char *pk;
	size_t pklen;

	if ((rc = open_card (ctrl)))
	return rc;

	if (has_option (line, "--advanced"))
	advanced = 1;

	line = skip_options (line);

	line = xstrdup (line); /* Need a copy of the line. */
	/* If the application supports the READKEY function we use that.
	Otherwise we use the old way by extracting it from the
	certificate. */
	rc = app_readkey (ctrl->app_ctx, ctrl, advanced, line, &pk, &pklen);
	if (!rc)
	{ /* Yeah, got that key - send it back. */
	rc = assuan_send_data (ctx, pk, pklen);
	xfree (pk);
	xfree (line);
	line = NULL;
	goto leave;
	}

	if (gpg_err_code (rc) != GPG_ERR_UNSUPPORTED_OPERATION)
	log_error ("app_readkey failed: %s\n", gpg_strerror (rc));
	else
	{
	rc = app_readcert (ctrl->app_ctx, ctrl, line, &cert, &ncert);
	if (rc)
	log_error ("app_readcert failed: %s\n", gpg_strerror (rc));
	}
	xfree (line);
	line = NULL;
	if (rc)
	goto leave;

	rc = ksba_cert_new (&kc);
	if (rc)
	goto leave;

	rc = ksba_cert_init_from_mem (kc, cert, ncert);
	if (rc)
	{
	log_error ("failed to parse the certificate: %s\n", gpg_strerror (rc));
	goto leave;
	}

	p = ksba_cert_get_public_key (kc);
	if (!p)
	{
	rc = gpg_error (GPG_ERR_NO_PUBKEY);
	goto leave;
	}
	n = gcry_sexp_canon_len (p, 0, NULL, NULL);

	if (advanced)
	{
	gcry_sexp_t s_key;

	rc = gcry_sexp_new (&s_key, (void*)p, n, 0);
	if (rc)
	goto leave;

	pklen = gcry_sexp_sprint (s_key, GCRYSEXP_FMT_ADVANCED, NULL, 0);
	pk = xtrymalloc (pklen);
	if (!pk)
	{
	rc = gpg_error_from_syserror ();
	goto leave;
	}
	log_assert (pklen);

	gcry_sexp_sprint (s_key, GCRYSEXP_FMT_ADVANCED, pk, pklen);
	gcry_sexp_release (s_key);
	/* (One less to adjust for the trailing '\0') */
	rc = assuan_send_data (ctx, pk, pklen-1);
	xfree (pk);
	}
	else
	rc = assuan_send_data (ctx, p, n);

	leave:
	xfree (p);
	ksba_cert_release (kc);
	xfree (cert);
	return rc;
	}



	static const char hlp_setdata[] =
	"SETDATA [--append] <hexstring>\n"
	"\n"
	"The client should use this command to tell us the data he want to sign.\n"
	"With the option --append, the data is appended to the data set by a\n"
	"previous SETDATA command.";
	static gpg_error_t
	cmd_setdata (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int append;
	int n, i, off;
	char *p;
	unsigned char *buf;

	append = (ctrl->in_data.value && has_option (line, "--append"));

	line = skip_options (line);

	if (locked_session && locked_session != ctrl->server_local)
	return gpg_error (GPG_ERR_LOCKED);

	/* Parse the hexstring. */
	for (p=line,n=0; hexdigitp (p); p++, n++)
	;
	if (*p)
	return set_error (GPG_ERR_ASS_PARAMETER, "invalid hexstring");
	if (!n)
	return set_error (GPG_ERR_ASS_PARAMETER, "no data given");
	if ((n&1))
	return set_error (GPG_ERR_ASS_PARAMETER, "odd number of digits");
	n /= 2;
	if (append)
	{
	if (ctrl->in_data.valuelen + n > MAXLEN_SETDATA)
	return set_error (GPG_ERR_TOO_LARGE,
	"limit on total size of data reached");
	buf = xtrymalloc (ctrl->in_data.valuelen + n);
	}
	else
	buf = xtrymalloc (n);
	if (!buf)
	return out_of_core ();

	if (append)
	{
	memcpy (buf, ctrl->in_data.value, ctrl->in_data.valuelen);
	off = ctrl->in_data.valuelen;
	}
	else
	off = 0;
	for (p=line, i=0; i < n; p += 2, i++)
	buf[off+i] = xtoi_2 (p);

	xfree (ctrl->in_data.value);
	ctrl->in_data.value = buf;
	ctrl->in_data.valuelen = off+n;
	return 0;
	}



	static gpg_error_t
	pin_cb (void opaque, const char info, char **retstr)
	{
	assuan_context_t ctx = opaque;
	char *command;
	int rc;
	unsigned char *value;
	size_t valuelen;

	if (!retstr)
	{
	/* We prompt for pinpad entry. To make sure that the popup has
	been show we use an inquire and not just a status message.
	We ignore any value returned. */
	if (info)
	{
	log_debug ("prompting for pinpad entry '%s'\n", info);
	rc = gpgrt_asprintf (&command, "POPUPPINPADPROMPT %s", info);
	if (rc < 0)
	return gpg_error (gpg_err_code_from_errno (errno));
	rc = assuan_inquire (ctx, command, &value, &valuelen, MAXLEN_PIN);
	xfree (command);
	}
	else
	{
	log_debug ("dismiss pinpad entry prompt\n");
	rc = assuan_inquire (ctx, "DISMISSPINPADPROMPT",
	&value, &valuelen, MAXLEN_PIN);
	}
	if (!rc)
	xfree (value);
	return rc;
	}

	*retstr = NULL;
	log_debug ("asking for PIN '%s'\n", info);

	rc = gpgrt_asprintf (&command, "NEEDPIN %s", info);
	if (rc < 0)
	return gpg_error (gpg_err_code_from_errno (errno));

	/* Fixme: Write an inquire function which returns the result in
	secure memory and check all further handling of the PIN. */
	rc = assuan_inquire (ctx, command, &value, &valuelen, MAXLEN_PIN);
	xfree (command);
	if (rc)
	return rc;

	if (!valuelen \|\| value[valuelen-1])
	{
	/* We require that the returned value is an UTF-8 string */
	xfree (value);
	return gpg_error (GPG_ERR_INV_RESPONSE);
	}
	retstr = (char)value;
	return 0;
	}


	static const char hlp_pksign[] =
	"PKSIGN [--hash=[rmd160\|sha{1,224,256,384,512}\|md5]] <hexified_id>\n"
	"\n"
	"The --hash option is optional; the default is SHA1.";
	static gpg_error_t
	cmd_pksign (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc;
	unsigned char *outdata;
	size_t outdatalen;
	char *keyidstr;
	int hash_algo;

	if (has_option (line, "--hash=rmd160"))
	hash_algo = GCRY_MD_RMD160;
	else if (has_option (line, "--hash=sha1"))
	hash_algo = GCRY_MD_SHA1;
	else if (has_option (line, "--hash=sha224"))
	hash_algo = GCRY_MD_SHA224;
	else if (has_option (line, "--hash=sha256"))
	hash_algo = GCRY_MD_SHA256;
	else if (has_option (line, "--hash=sha384"))
	hash_algo = GCRY_MD_SHA384;
	else if (has_option (line, "--hash=sha512"))
	hash_algo = GCRY_MD_SHA512;
	else if (has_option (line, "--hash=md5"))
	hash_algo = GCRY_MD_MD5;
	else if (!strstr (line, "--"))
	hash_algo = GCRY_MD_SHA1;
	else
	return set_error (GPG_ERR_ASS_PARAMETER, "invalid hash algorithm");

	line = skip_options (line);

	if ((rc = open_card (ctrl)))
	return rc;

	/* We have to use a copy of the key ID because the function may use
	the pin_cb which in turn uses the assuan line buffer and thus
	overwriting the original line with the keyid */
	keyidstr = xtrystrdup (line);
	if (!keyidstr)
	return out_of_core ();

	rc = app_sign (ctrl->app_ctx, ctrl,
	keyidstr, hash_algo,
	pin_cb, ctx,
	ctrl->in_data.value, ctrl->in_data.valuelen,
	&outdata, &outdatalen);

	xfree (keyidstr);
	if (rc)
	{
	log_error ("app_sign failed: %s\n", gpg_strerror (rc));
	}
	else
	{
	rc = assuan_send_data (ctx, outdata, outdatalen);
	xfree (outdata);
	if (rc)
	return rc; /* that is already an assuan error code */
	}

	return rc;
	}


	static const char hlp_pkauth[] =
	"PKAUTH <hexified_id>";
	static gpg_error_t
	cmd_pkauth (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc;
	unsigned char *outdata;
	size_t outdatalen;
	char *keyidstr;

	if ((rc = open_card (ctrl)))
	return rc;

	if (!ctrl->app_ctx)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);

	/* We have to use a copy of the key ID because the function may use
	the pin_cb which in turn uses the assuan line buffer and thus
	overwriting the original line with the keyid */
	keyidstr = xtrystrdup (line);
	if (!keyidstr)
	return out_of_core ();

	rc = app_auth (ctrl->app_ctx, ctrl, keyidstr, pin_cb, ctx,
	ctrl->in_data.value, ctrl->in_data.valuelen,
	&outdata, &outdatalen);
	xfree (keyidstr);
	if (rc)
	{
	log_error ("app_auth failed: %s\n", gpg_strerror (rc));
	}
	else
	{
	rc = assuan_send_data (ctx, outdata, outdatalen);
	xfree (outdata);
	if (rc)
	return rc; /* that is already an assuan error code */
	}

	return rc;
	}


	static const char hlp_pkdecrypt[] =
	"PKDECRYPT <hexified_id>";
	static gpg_error_t
	cmd_pkdecrypt (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc;
	unsigned char *outdata;
	size_t outdatalen;
	char *keyidstr;
	unsigned int infoflags;

	if ((rc = open_card (ctrl)))
	return rc;

	keyidstr = xtrystrdup (line);
	if (!keyidstr)
	return out_of_core ();
	rc = app_decipher (ctrl->app_ctx, ctrl, keyidstr, pin_cb, ctx,
	ctrl->in_data.value, ctrl->in_data.valuelen,
	&outdata, &outdatalen, &infoflags);

	xfree (keyidstr);
	if (rc)
	{
	log_error ("app_decipher failed: %s\n", gpg_strerror (rc));
	}
	else
	{
	/* If the card driver told us that there is no padding, send a
	status line. If there is a padding it is assumed that the
	caller knows what padding is used. It would have been better
	to always send that information but for backward
	compatibility we can't do that. */
	if ((infoflags & APP_DECIPHER_INFO_NOPAD))
	send_status_direct (ctrl, "PADDING", "0");
	rc = assuan_send_data (ctx, outdata, outdatalen);
	xfree (outdata);
	if (rc)
	return rc; /* that is already an assuan error code */
	}

	return rc;
	}


	static const char hlp_getattr[] =
	"GETATTR <name>\n"
	"\n"
	"This command is used to retrieve data from a smartcard. The\n"
	"allowed names depend on the currently selected smartcard\n"
	"application. NAME must be percent and '+' escaped. The value is\n"
	"returned through status message, see the LEARN command for details.\n"
	"\n"
	"However, the current implementation assumes that Name is not escaped;\n"
	"this works as long as no one uses arbitrary escaping. \n"
	"\n"
	"Note, that this function may even be used on a locked card.";
	static gpg_error_t
	cmd_getattr (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc;
	const char *keyword;

	if ((rc = open_card (ctrl)))
	return rc;

	keyword = line;
	for (; *line && !spacep (line); line++)
	;
	if (*line)
	*line++ = 0;

	/* (We ignore any garbage for now.) */

	/* FIXME: Applications should not return sensitive data if the card
	is locked. */
	rc = app_getattr (ctrl->app_ctx, ctrl, keyword);

	return rc;
	}


	static const char hlp_setattr[] =
	"SETATTR [--inquire] <name> <value> \n"
	"\n"
	"This command is used to store data on a smartcard. The allowed\n"
	"names and values are depend on the currently selected smartcard\n"
	"application. NAME and VALUE must be percent and '+' escaped.\n"
	"\n"
	"However, the current implementation assumes that NAME is not\n"
	"escaped; this works as long as no one uses arbitrary escaping.\n"
	"\n"
	"If the option --inquire is used, VALUE shall not be given; instead\n"
	"an inquiry using the keyword \"VALUE\" is used to retrieve it. The\n"
	"value is in this case considered to be confidential and not logged.\n"
	"\n"
	"A PIN will be requested for most NAMEs. See the corresponding\n"
	"setattr function of the actually used application (app-*.c) for\n"
	"details.";
	static gpg_error_t
	cmd_setattr (assuan_context_t ctx, char *orig_line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	gpg_error_t err;
	char *keyword;
	int keywordlen;
	size_t nbytes;
	char line, linebuf;
	int opt_inquire;

	opt_inquire = has_option (orig_line, "--inquire");
	orig_line = skip_options (orig_line);

	if ((err = open_card (ctrl)))
	return err;

	/* We need to use a copy of LINE, because PIN_CB uses the same
	context and thus reuses the Assuan provided LINE. */
	line = linebuf = xtrystrdup (orig_line);
	if (!line)
	return out_of_core ();

	keyword = line;
	for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
	;
	if (*line)
	*line++ = 0;
	while (spacep (line))
	line++;
	if (opt_inquire)
	{
	unsigned char *value;

	assuan_begin_confidential (ctx);
	err = assuan_inquire (ctx, "VALUE", &value, &nbytes, MAXLEN_SETATTRDATA);
	assuan_end_confidential (ctx);
	if (!err)
	{
	err = app_setattr (ctrl->app_ctx, ctrl, keyword, pin_cb, ctx,
	value, nbytes);
	wipememory (value, nbytes);
	xfree (value);
	}

	}
	else
	{
	nbytes = percent_plus_unescape_inplace (line, 0);
	err = app_setattr (ctrl->app_ctx, ctrl, keyword, pin_cb, ctx,
	(const unsigned char*)line, nbytes);
	}

	xfree (linebuf);
	return err;
	}


	static const char hlp_writecert[] =
	"WRITECERT <hexified_certid>\n"
	"\n"
	"This command is used to store a certificate on a smartcard. The\n"
	"allowed certids depend on the currently selected smartcard\n"
	"application. The actual certifciate is requested using the inquiry\n"
	"\"CERTDATA\" and needs to be provided in its raw (e.g. DER) form.\n"
	"\n"
	"In almost all cases a PIN will be requested. See the related\n"
	"writecert function of the actually used application (app-*.c) for\n"
	"details.";
	static gpg_error_t
	cmd_writecert (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc;
	char *certid;
	unsigned char *certdata;
	size_t certdatalen;

	line = skip_options (line);

	if (!*line)
	return set_error (GPG_ERR_ASS_PARAMETER, "no certid given");
	certid = line;
	while (*line && !spacep (line))
	line++;
	*line = 0;

	if ((rc = open_card (ctrl)))
	return rc;

	if (!ctrl->app_ctx)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);

	certid = xtrystrdup (certid);
	if (!certid)
	return out_of_core ();

	/* Now get the actual keydata. */
	rc = assuan_inquire (ctx, "CERTDATA",
	&certdata, &certdatalen, MAXLEN_CERTDATA);
	if (rc)
	{
	xfree (certid);
	return rc;
	}

	/* Write the certificate to the card. */
	rc = app_writecert (ctrl->app_ctx, ctrl, certid,
	pin_cb, ctx, certdata, certdatalen);
	xfree (certid);
	xfree (certdata);

	return rc;
	}


	static const char hlp_writekey[] =
	"WRITEKEY [--force] <keyid> \n"
	"\n"
	"This command is used to store a secret key on a smartcard. The\n"
	"allowed keyids depend on the currently selected smartcard\n"
	"application. The actual keydata is requested using the inquiry\n"
	"\"KEYDATA\" and need to be provided without any protection. With\n"
	"--force set an existing key under this KEYID will get overwritten.\n"
	"The keydata is expected to be the usual canonical encoded\n"
	"S-expression.\n"
	"\n"
	"A PIN will be requested for most NAMEs. See the corresponding\n"
	"writekey function of the actually used application (app-*.c) for\n"
	"details.";
	static gpg_error_t
	cmd_writekey (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc;
	char *keyid;
	int force = has_option (line, "--force");
	unsigned char *keydata;
	size_t keydatalen;

	line = skip_options (line);

	if (!*line)
	return set_error (GPG_ERR_ASS_PARAMETER, "no keyid given");
	keyid = line;
	while (*line && !spacep (line))
	line++;
	*line = 0;

	if ((rc = open_card (ctrl)))
	return rc;

	if (!ctrl->app_ctx)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);

	keyid = xtrystrdup (keyid);
	if (!keyid)
	return out_of_core ();

	/* Now get the actual keydata. */
	assuan_begin_confidential (ctx);
	rc = assuan_inquire (ctx, "KEYDATA", &keydata, &keydatalen, MAXLEN_KEYDATA);
	assuan_end_confidential (ctx);
	if (rc)
	{
	xfree (keyid);
	return rc;
	}

	/* Write the key to the card. */
	rc = app_writekey (ctrl->app_ctx, ctrl, keyid, force? 1:0,
	pin_cb, ctx, keydata, keydatalen);
	xfree (keyid);
	xfree (keydata);

	return rc;
	}


	static const char hlp_genkey[] =
	"GENKEY [--force] [--timestamp=<isodate>] <no>\n"
	"\n"
	"Generate a key on-card identified by NO, which is application\n"
	"specific. Return values are application specific. For OpenPGP\n"
	"cards 3 status lines are returned:\n"
	"\n"
	" S KEY-FPR <hexstring>\n"
	" S KEY-CREATED-AT <seconds_since_epoch>\n"
	" S KEY-DATA [-\|p\|n] <hexdata>\n"
	"\n"
	" 'p' and 'n' are the names of the RSA parameters; '-' is used to\n"
	" indicate that HEXDATA is the first chunk of a parameter given\n"
	" by the next KEY-DATA.\n"
	"\n"
	"--force is required to overwrite an already existing key. The\n"
	"KEY-CREATED-AT is required for further processing because it is\n"
	"part of the hashed key material for the fingerprint.\n"
	"\n"
	"If --timestamp is given an OpenPGP key will be created using this\n"
	"value. The value needs to be in ISO Format; e.g.\n"
	"\"--timestamp=20030316T120000\" and after 1970-01-01 00:00:00.\n"
	"\n"
	"The public part of the key can also later be retrieved using the\n"
	"READKEY command.";
	static gpg_error_t
	cmd_genkey (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc;
	char *keyno;
	int force;
	const char *s;
	time_t timestamp;

	force = has_option (line, "--force");

	if ((s=has_option_name (line, "--timestamp")))
	{
	if (*s != '=')
	return set_error (GPG_ERR_ASS_PARAMETER, "missing value for option");
	timestamp = isotime2epoch (s+1);
	if (timestamp < 1)
	return set_error (GPG_ERR_ASS_PARAMETER, "invalid time value");
	}
	else
	timestamp = 0;


	line = skip_options (line);
	if (!*line)
	return set_error (GPG_ERR_ASS_PARAMETER, "no key number given");
	keyno = line;
	while (*line && !spacep (line))
	line++;
	*line = 0;

	if ((rc = open_card (ctrl)))
	return rc;

	if (!ctrl->app_ctx)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);

	keyno = xtrystrdup (keyno);
	if (!keyno)
	return out_of_core ();
	- rc = app_genkey (ctrl->app_ctx, ctrl, keyno, force? 1:0,
	+ rc = app_genkey (ctrl->app_ctx, ctrl, keyno, NULL,
	+ force? APP_GENKEY_FLAG_FORCE : 0,
	timestamp, pin_cb, ctx);
	xfree (keyno);

	return rc;
	}


	static const char hlp_random[] =
	"RANDOM <nbytes>\n"
	"\n"
	"Get NBYTES of random from the card and send them back as data.\n"
	"This usually involves EEPROM write on the card and thus excessive\n"
	"use of this command may destroy the card.\n"
	"\n"
	"Note, that this function may be even be used on a locked card.";
	static gpg_error_t
	cmd_random (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc;
	size_t nbytes;
	unsigned char *buffer;

	if (!*line)
	return set_error (GPG_ERR_ASS_PARAMETER,
	"number of requested bytes missing");
	nbytes = strtoul (line, NULL, 0);

	if ((rc = open_card (ctrl)))
	return rc;

	if (!ctrl->app_ctx)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);

	buffer = xtrymalloc (nbytes);
	if (!buffer)
	return out_of_core ();

	rc = app_get_challenge (ctrl->app_ctx, ctrl, nbytes, buffer);
	if (!rc)
	{
	rc = assuan_send_data (ctx, buffer, nbytes);
	xfree (buffer);
	return rc; /* that is already an assuan error code */
	}
	xfree (buffer);

	return rc;
	}



	static const char hlp_passwd[] =
	"PASSWD [--reset] [--nullpin] [--clear] <chvno>\n"
	"\n"
	"Change the PIN or, if --reset is given, reset the retry counter of\n"
	"the card holder verification vector CHVNO. The option --nullpin is\n"
	"used for TCOS cards to set the initial PIN. The option --clear clears\n"
	"the security status associated with the PIN so that the PIN needs to\n"
	"be presented again. The format of CHVNO depends on the card application.";
	static gpg_error_t
	cmd_passwd (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc;
	char *chvnostr;
	unsigned int flags = 0;

	if (has_option (line, "--reset"))
	flags \|= APP_CHANGE_FLAG_RESET;
	if (has_option (line, "--nullpin"))
	flags \|= APP_CHANGE_FLAG_NULLPIN;
	if (has_option (line, "--clear"))
	flags \|= APP_CHANGE_FLAG_CLEAR;

	line = skip_options (line);

	if (!*line)
	return set_error (GPG_ERR_ASS_PARAMETER, "no CHV number given");
	chvnostr = line;
	while (*line && !spacep (line))
	line++;
	*line = 0;

	/* Do not allow other flags aside of --clear. */
	if ((flags & APP_CHANGE_FLAG_CLEAR) && (flags & ~APP_CHANGE_FLAG_CLEAR))
	return set_error (GPG_ERR_UNSUPPORTED_OPERATION,
	"--clear used with other options");

	if ((rc = open_card (ctrl)))
	return rc;

	if (!ctrl->app_ctx)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);

	chvnostr = xtrystrdup (chvnostr);
	if (!chvnostr)
	return out_of_core ();
	rc = app_change_pin (ctrl->app_ctx, ctrl, chvnostr, flags, pin_cb, ctx);
	if (rc)
	log_error ("command passwd failed: %s\n", gpg_strerror (rc));
	xfree (chvnostr);

	return rc;
	}


	static const char hlp_checkpin[] =
	"CHECKPIN <idstr>\n"
	"\n"
	"Perform a VERIFY operation without doing anything else. This may\n"
	"be used to initialize a the PIN cache earlier to long lasting\n"
	"operations. Its use is highly application dependent.\n"
	"\n"
	"For OpenPGP:\n"
	"\n"
	" Perform a simple verify operation for CHV1 and CHV2, so that\n"
	" further operations won't ask for CHV2 and it is possible to do a\n"
	" cheap check on the PIN: If there is something wrong with the PIN\n"
	" entry system, only the regular CHV will get blocked and not the\n"
	" dangerous CHV3. IDSTR is the usual card's serial number in hex\n"
	" notation; an optional fingerprint part will get ignored. There\n"
	" is however a special mode if the IDSTR is sffixed with the\n"
	" literal string \"[CHV3]\": In this case the Admin PIN is checked\n"
	" if and only if the retry counter is still at 3.\n"
	"\n"
	"For Netkey:\n"
	"\n"
	" Any of the valid PIN Ids may be used. These are the strings:\n"
	"\n"
	" PW1.CH - Global password 1\n"
	" PW2.CH - Global password 2\n"
	" PW1.CH.SIG - SigG password 1\n"
	" PW2.CH.SIG - SigG password 2\n"
	"\n"
	" For a definitive list, see the implementation in app-nks.c.\n"
	" Note that we call a PW2.* PIN a \"PUK\" despite that since TCOS\n"
	" 3.0 they are technically alternative PINs used to mutally\n"
	" unblock each other.";
	static gpg_error_t
	cmd_checkpin (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc;
	char *idstr;

	if ((rc = open_card (ctrl)))
	return rc;

	if (!ctrl->app_ctx)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);

	/* We have to use a copy of the key ID because the function may use
	the pin_cb which in turn uses the assuan line buffer and thus
	overwriting the original line with the keyid. */
	idstr = xtrystrdup (line);
	if (!idstr)
	return out_of_core ();

	rc = app_check_pin (ctrl->app_ctx, ctrl, idstr, pin_cb, ctx);
	xfree (idstr);
	if (rc)
	log_error ("app_check_pin failed: %s\n", gpg_strerror (rc));

	return rc;
	}


	static const char hlp_lock[] =
	"LOCK [--wait]\n"
	"\n"
	"Grant exclusive card access to this session. Note that there is\n"
	"no lock counter used and a second lock from the same session will\n"
	"be ignored. A single unlock (or RESET) unlocks the session.\n"
	"Return GPG_ERR_LOCKED if another session has locked the reader.\n"
	"\n"
	"If the option --wait is given the command will wait until a\n"
	"lock has been released.";
	static gpg_error_t
	cmd_lock (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc = 0;

	retry:
	if (locked_session)
	{
	if (locked_session != ctrl->server_local)
	rc = gpg_error (GPG_ERR_LOCKED);
	}
	else
	locked_session = ctrl->server_local;

	#ifdef USE_NPTH
	if (rc && has_option (line, "--wait"))
	{
	rc = 0;
	npth_sleep (1); /* Better implement an event mechanism. However,
	for card operations this should be
	sufficient. */
	/* FIXME: Need to check that the connection is still alive.
	This can be done by issuing status messages. */
	goto retry;
	}
	#endif /USE_NPTH/

	if (rc)
	log_error ("cmd_lock failed: %s\n", gpg_strerror (rc));
	return rc;
	}


	static const char hlp_unlock[] =
	"UNLOCK\n"
	"\n"
	"Release exclusive card access.";
	static gpg_error_t
	cmd_unlock (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	int rc = 0;

	(void)line;

	if (locked_session)
	{
	if (locked_session != ctrl->server_local)
	rc = gpg_error (GPG_ERR_LOCKED);
	else
	locked_session = NULL;
	}
	else
	rc = gpg_error (GPG_ERR_NOT_LOCKED);

	if (rc)
	log_error ("cmd_unlock failed: %s\n", gpg_strerror (rc));
	return rc;
	}


	static const char hlp_getinfo[] =
	"GETINFO <what>\n"
	"\n"
	"Multi purpose command to return certain information. \n"
	"Supported values of WHAT are:\n"
	"\n"
	" version - Return the version of the program.\n"
	" pid - Return the process id of the server.\n"
	" socket_name - Return the name of the socket.\n"
	" connections - Return number of active connections.\n"
	" status - Return the status of the current reader (in the future,\n"
	" may also return the status of all readers). The status\n"
	" is a list of one-character flags. The following flags\n"
	" are currently defined:\n"
	" 'u' Usable card present.\n"
	" 'r' Card removed. A reset is necessary.\n"
	" These flags are exclusive.\n"
	" reader_list - Return a list of detected card readers. Does\n"
	" currently only work with the internal CCID driver.\n"
	" deny_admin - Returns OK if admin commands are not allowed or\n"
	" GPG_ERR_GENERAL if admin commands are allowed.\n"
	" app_list - Return a list of supported applications. One\n"
	" application per line, fields delimited by colons,\n"
	" first field is the name.\n"
	" card_list - Return a list of serial numbers of active cards,\n"
	" using a status response.";
	static gpg_error_t
	cmd_getinfo (assuan_context_t ctx, char *line)
	{
	int rc = 0;

	if (!strcmp (line, "version"))
	{
	const char *s = VERSION;
	rc = assuan_send_data (ctx, s, strlen (s));
	}
	else if (!strcmp (line, "pid"))
	{
	char numbuf[50];

	snprintf (numbuf, sizeof numbuf, "%lu", (unsigned long)getpid ());
	rc = assuan_send_data (ctx, numbuf, strlen (numbuf));
	}
	else if (!strcmp (line, "socket_name"))
	{
	const char *s = scd_get_socket_name ();

	if (s)
	rc = assuan_send_data (ctx, s, strlen (s));
	else
	rc = gpg_error (GPG_ERR_NO_DATA);
	}
	else if (!strcmp (line, "connections"))
	{
	char numbuf[20];

	snprintf (numbuf, sizeof numbuf, "%d", get_active_connection_count ());
	rc = assuan_send_data (ctx, numbuf, strlen (numbuf));
	}
	else if (!strcmp (line, "status"))
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	char flag;

	if (open_card (ctrl))
	flag = 'r';
	else
	flag = 'u';

	rc = assuan_send_data (ctx, &flag, 1);
	}
	else if (!strcmp (line, "reader_list"))
	{
	#ifdef HAVE_LIBUSB
	char *s = ccid_get_reader_list ();
	#else
	char *s = NULL;
	#endif

	if (s)
	rc = assuan_send_data (ctx, s, strlen (s));
	else
	rc = gpg_error (GPG_ERR_NO_DATA);
	xfree (s);
	}
	else if (!strcmp (line, "deny_admin"))
	rc = opt.allow_admin? gpg_error (GPG_ERR_GENERAL) : 0;
	else if (!strcmp (line, "app_list"))
	{
	char *s = get_supported_applications ();
	if (s)
	rc = assuan_send_data (ctx, s, strlen (s));
	else
	rc = 0;
	xfree (s);
	}
	else if (!strcmp (line, "card_list"))
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);

	app_send_card_list (ctrl);
	}
	else
	rc = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT");
	return rc;
	}


	static const char hlp_restart[] =
	"RESTART\n"
	"\n"
	"Restart the current connection; this is a kind of warm reset. It\n"
	"deletes the context used by this connection but does not send a\n"
	"RESET to the card. Thus the card itself won't get reset. \n"
	"\n"
	"This is used by gpg-agent to reuse a primary pipe connection and\n"
	"may be used by clients to backup from a conflict in the serial\n"
	"command; i.e. to select another application.";
	static gpg_error_t
	cmd_restart (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	app_t app = ctrl->app_ctx;

	(void)line;

	if (app)
	{
	ctrl->app_ctx = NULL;
	release_application (app, 0);
	}
	if (locked_session && ctrl->server_local == locked_session)
	{
	locked_session = NULL;
	log_info ("implicitly unlocking due to RESTART\n");
	}
	return 0;
	}


	static const char hlp_disconnect[] =
	"DISCONNECT\n"
	"\n"
	"Disconnect the card if the backend supports a disconnect operation.";
	static gpg_error_t
	cmd_disconnect (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);

	(void)line;

	if (!ctrl->app_ctx)
	return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);

	apdu_disconnect (ctrl->app_ctx->slot);
	return 0;
	}



	static const char hlp_apdu[] =
	"APDU [--[dump-]atr] [--more] [--exlen[=N]] [hexstring]\n"
	"\n"
	"Send an APDU to the current reader. This command bypasses the high\n"
	"level functions and sends the data directly to the card. HEXSTRING\n"
	"is expected to be a proper APDU. If HEXSTRING is not given no\n"
	"commands are set to the card but the command will implictly check\n"
	"whether the card is ready for use. \n"
	"\n"
	"Using the option \"--atr\" returns the ATR of the card as a status\n"
	"message before any data like this:\n"
	" S CARD-ATR 3BFA1300FF813180450031C173C00100009000B1\n"
	"\n"
	"Using the option --more handles the card status word MORE_DATA\n"
	"(61xx) and concatenates all responses to one block.\n"
	"\n"
	"Using the option \"--exlen\" the returned APDU may use extended\n"
	"length up to N bytes. If N is not given a default value is used\n"
	"(currently 4096).";
	static gpg_error_t
	cmd_apdu (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);
	app_t app;
	int rc;
	unsigned char *apdu;
	size_t apdulen;
	int with_atr;
	int handle_more;
	const char *s;
	size_t exlen;

	if (has_option (line, "--dump-atr"))
	with_atr = 2;
	else
	with_atr = has_option (line, "--atr");
	handle_more = has_option (line, "--more");

	if ((s=has_option_name (line, "--exlen")))
	{
	if (*s == '=')
	exlen = strtoul (s+1, NULL, 0);
	else
	exlen = 4096;
	}
	else
	exlen = 0;

	line = skip_options (line);

	if ((rc = open_card (ctrl)))
	return rc;

	app = ctrl->app_ctx;
	if (!app)
	return gpg_error (GPG_ERR_CARD_NOT_PRESENT);

	if (with_atr)
	{
	unsigned char *atr;
	size_t atrlen;
	char hexbuf[400];

	atr = apdu_get_atr (app->slot, &atrlen);
	if (!atr \|\| atrlen > sizeof hexbuf - 2 )
	{
	rc = gpg_error (GPG_ERR_INV_CARD);
	goto leave;
	}
	if (with_atr == 2)
	{
	char string, p, *pend;

	string = atr_dump (atr, atrlen);
	if (string)
	{
	for (rc=0, p=string; !rc && (pend = strchr (p, '\n')); p = pend+1)
	{
	rc = assuan_send_data (ctx, p, pend - p + 1);
	if (!rc)
	rc = assuan_send_data (ctx, NULL, 0);
	}
	if (!rc && *p)
	rc = assuan_send_data (ctx, p, strlen (p));
	es_free (string);
	if (rc)
	goto leave;
	}
	}
	else
	{
	bin2hex (atr, atrlen, hexbuf);
	send_status_info (ctrl, "CARD-ATR", hexbuf, strlen (hexbuf), NULL, 0);
	}
	xfree (atr);
	}

	apdu = hex_to_buffer (line, &apdulen);
	if (!apdu)
	{
	rc = gpg_error_from_syserror ();
	goto leave;
	}
	if (apdulen)
	{
	unsigned char *result = NULL;
	size_t resultlen;

	rc = apdu_send_direct (app->slot, exlen,
	apdu, apdulen, handle_more,
	NULL, &result, &resultlen);
	if (rc)
	log_error ("apdu_send_direct failed: %s\n", gpg_strerror (rc));
	else
	{
	rc = assuan_send_data (ctx, result, resultlen);
	xfree (result);
	}
	}
	xfree (apdu);

	leave:
	return rc;
	}


	static const char hlp_killscd[] =
	"KILLSCD\n"
	"\n"
	"Commit suicide.";
	static gpg_error_t
	cmd_killscd (assuan_context_t ctx, char *line)
	{
	ctrl_t ctrl = assuan_get_pointer (ctx);

	(void)line;

	ctrl->server_local->stopme = 1;
	assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
	return 0;
	}



	/* Tell the assuan library about our commands */
	static int
	register_commands (assuan_context_t ctx)
	{
	static struct {
	const char *name;
	assuan_handler_t handler;
	const char * const help;
	} table[] = {
	{ "SERIALNO", cmd_serialno, hlp_serialno },
	{ "LEARN", cmd_learn, hlp_learn },
	{ "READCERT", cmd_readcert, hlp_readcert },
	{ "READKEY", cmd_readkey, hlp_readkey },
	{ "SETDATA", cmd_setdata, hlp_setdata },
	{ "PKSIGN", cmd_pksign, hlp_pksign },
	{ "PKAUTH", cmd_pkauth, hlp_pkauth },
	{ "PKDECRYPT", cmd_pkdecrypt,hlp_pkdecrypt },
	{ "INPUT", NULL },
	{ "OUTPUT", NULL },
	{ "GETATTR", cmd_getattr, hlp_getattr },
	{ "SETATTR", cmd_setattr, hlp_setattr },
	{ "WRITECERT", cmd_writecert,hlp_writecert },
	{ "WRITEKEY", cmd_writekey, hlp_writekey },
	{ "GENKEY", cmd_genkey, hlp_genkey },
	{ "RANDOM", cmd_random, hlp_random },
	{ "PASSWD", cmd_passwd, hlp_passwd },
	{ "CHECKPIN", cmd_checkpin, hlp_checkpin },
	{ "LOCK", cmd_lock, hlp_lock },
	{ "UNLOCK", cmd_unlock, hlp_unlock },
	{ "GETINFO", cmd_getinfo, hlp_getinfo },
	{ "RESTART", cmd_restart, hlp_restart },
	{ "DISCONNECT", cmd_disconnect,hlp_disconnect },
	{ "APDU", cmd_apdu, hlp_apdu },
	{ "KILLSCD", cmd_killscd, hlp_killscd },
	{ NULL }
	};
	int i, rc;

	for (i=0; table[i].name; i++)
	{
	rc = assuan_register_command (ctx, table[i].name, table[i].handler,
	table[i].help);
	if (rc)
	return rc;
	}
	assuan_set_hello_line (ctx, "GNU Privacy Guard's Smartcard server ready");

	assuan_register_reset_notify (ctx, reset_notify);
	assuan_register_option_handler (ctx, option_handler);
	return 0;
	}


	/* Startup the server. If FD is given as -1 this is simple pipe
	server, otherwise it is a regular server. Returns true if there
	are no more active asessions. */
	int
	scd_command_handler (ctrl_t ctrl, int fd)
	{
	int rc;
	assuan_context_t ctx = NULL;
	int stopme;

	rc = assuan_new (&ctx);
	if (rc)
	{
	log_error ("failed to allocate assuan context: %s\n",
	gpg_strerror (rc));
	scd_exit (2);
	}

	if (fd == -1)
	{
	assuan_fd_t filedes[2];

	filedes[0] = assuan_fdopen (0);
	filedes[1] = assuan_fdopen (1);
	rc = assuan_init_pipe_server (ctx, filedes);
	}
	else
	{
	rc = assuan_init_socket_server (ctx, INT2FD(fd),
	ASSUAN_SOCKET_SERVER_ACCEPTED);
	}
	if (rc)
	{
	log_error ("failed to initialize the server: %s\n",
	gpg_strerror(rc));
	scd_exit (2);
	}
	rc = register_commands (ctx);
	if (rc)
	{
	log_error ("failed to register commands with Assuan: %s\n",
	gpg_strerror(rc));
	scd_exit (2);
	}
	assuan_set_pointer (ctx, ctrl);

	/* Allocate and initialize the server object. Put it into the list
	of active sessions. */
	ctrl->server_local = xcalloc (1, sizeof *ctrl->server_local);
	ctrl->server_local->next_session = session_list;
	session_list = ctrl->server_local;
	ctrl->server_local->ctrl_backlink = ctrl;
	ctrl->server_local->assuan_ctx = ctx;

	/* Command processing loop. */
	for (;;)
	{
	rc = assuan_accept (ctx);
	if (rc == -1)
	{
	break;
	}
	else if (rc)
	{
	log_info ("Assuan accept problem: %s\n", gpg_strerror (rc));
	break;
	}

	rc = assuan_process (ctx);
	if (rc)
	{
	log_info ("Assuan processing failed: %s\n", gpg_strerror (rc));
	continue;
	}
	}

	/* Cleanup. We don't send an explicit reset to the card. */
	do_reset (ctrl, 0);

	/* Release the server object. */
	if (session_list == ctrl->server_local)
	session_list = ctrl->server_local->next_session;
	else
	{
	struct server_local_s *sl;

	for (sl=session_list; sl->next_session; sl = sl->next_session)
	if (sl->next_session == ctrl->server_local)
	break;
	if (!sl->next_session)
	BUG ();
	sl->next_session = ctrl->server_local->next_session;
	}
	stopme = ctrl->server_local->stopme;
	xfree (ctrl->server_local);
	ctrl->server_local = NULL;

	/* Release the Assuan context. */
	assuan_release (ctx);

	if (stopme)
	scd_exit (0);

	/* If there are no more sessions return true. */
	return !session_list;
	}


	/* Send a line with status information via assuan and escape all given
	buffers. The variable elements are pairs of (char *, size_t),
	terminated with a (NULL, 0). */
	void
	send_status_info (ctrl_t ctrl, const char *keyword, ...)
	{
	va_list arg_ptr;
	const unsigned char *value;
	size_t valuelen;
	char buf[950], *p;
	size_t n;
	assuan_context_t ctx = ctrl->server_local->assuan_ctx;

	va_start (arg_ptr, keyword);

	p = buf;
	n = 0;
	while ( (value = va_arg (arg_ptr, const unsigned char *))
	&& n < DIM (buf)-2 )
	{
	valuelen = va_arg (arg_ptr, size_t);
	if (!valuelen)
	continue; /* empty buffer */
	if (n)
	{
	*p++ = ' ';
	n++;
	}
	for ( ; valuelen && n < DIM (buf)-2; n++, valuelen--, value++)
	{
	if (value == '+' \|\| value == '\"' \|\| *value == '%'
	\|\| *value < ' ')
	{
	sprintf (p, "%%%02X", *value);
	p += 3;
	n += 2;
	}
	else if (*value == ' ')
	*p++ = '+';
	else
	p++ = value;
	}
	}
	*p = 0;
	assuan_write_status (ctx, keyword, buf);

	va_end (arg_ptr);
	}


	/* Send a ready formatted status line via assuan. */
	void
	send_status_direct (ctrl_t ctrl, const char keyword, const char args)
	{
	assuan_context_t ctx = ctrl->server_local->assuan_ctx;

	if (strchr (args, '\n'))
	log_error ("error: LF detected in status line - not sending\n");
	else
	assuan_write_status (ctx, keyword, args);
	}


	/* This status functions expects a printf style format string. No
	* filtering of the data is done instead the orintf formatted data is
	* send using assuan_send_status. */
	gpg_error_t
	send_status_printf (ctrl_t ctrl, const char keyword, const char format, ...)
	{
	gpg_error_t err;
	va_list arg_ptr;
	assuan_context_t ctx;

	if (!ctrl \|\| !ctrl->server_local \|\| !(ctx = ctrl->server_local->assuan_ctx))
	return 0;

	va_start (arg_ptr, format);
	err = vprint_assuan_status (ctx, keyword, format, arg_ptr);
	va_end (arg_ptr);
	return err;
	}


	void
	popup_prompt (void *opaque, int on)
	{
	ctrl_t ctrl = opaque;

	if (ctrl)
	{
	assuan_context_t ctx = ctrl->server_local->assuan_ctx;

	if (ctx)
	{
	const char *cmd;
	gpg_error_t err;
	unsigned char *value;
	size_t valuelen;

	if (on)
	cmd = "POPUPPINPADPROMPT --ack";
	else
	cmd = "DISMISSPINPADPROMPT";
	err = assuan_inquire (ctx, cmd, &value, &valuelen, 100);
	if (!err)
	xfree (value);
	}
	}
	}


	/* Helper to send the clients a status change notification. */
	void
	send_client_notifications (app_t app, int removal)
	{
	struct {
	pid_t pid;
	#ifdef HAVE_W32_SYSTEM
	HANDLE handle;
	#else
	int signo;
	#endif
	} killed[50];
	int killidx = 0;
	int kidx;
	struct server_local_s *sl;

	for (sl=session_list; sl; sl = sl->next_session)
	if (sl->ctrl_backlink && sl->ctrl_backlink->app_ctx == app)
	{
	pid_t pid;
	#ifdef HAVE_W32_SYSTEM
	HANDLE handle;
	#else
	int signo;
	#endif

	if (removal)
	{
	sl->ctrl_backlink->app_ctx = NULL;
	sl->card_removed = 1;
	release_application (app, 1);
	}

	if (!sl->event_signal \|\| !sl->assuan_ctx)
	continue;

	pid = assuan_get_pid (sl->assuan_ctx);

	#ifdef HAVE_W32_SYSTEM
	handle = sl->event_signal;
	for (kidx=0; kidx < killidx; kidx++)
	if (killed[kidx].pid == pid
	&& killed[kidx].handle == handle)
	break;
	if (kidx < killidx)
	log_info ("event %p (%p) already triggered for client %d\n",
	sl->event_signal, handle, (int)pid);
	else
	{
	log_info ("triggering event %p (%p) for client %d\n",
	sl->event_signal, handle, (int)pid);
	if (!SetEvent (handle))
	log_error ("SetEvent(%p) failed: %s\n",
	sl->event_signal, w32_strerror (-1));
	if (killidx < DIM (killed))
	{
	killed[killidx].pid = pid;
	killed[killidx].handle = handle;
	killidx++;
	}
	}
	#else /!HAVE_W32_SYSTEM/
	signo = sl->event_signal;

	if (pid != (pid_t)(-1) && pid && signo > 0)
	{
	for (kidx=0; kidx < killidx; kidx++)
	if (killed[kidx].pid == pid
	&& killed[kidx].signo == signo)
	break;
	if (kidx < killidx)
	log_info ("signal %d already sent to client %d\n",
	signo, (int)pid);
	else
	{
	log_info ("sending signal %d to client %d\n",
	signo, (int)pid);
	kill (pid, signo);
	if (killidx < DIM (killed))
	{
	killed[killidx].pid = pid;
	killed[killidx].signo = signo;
	killidx++;
	}
	}
	}
	#endif /!HAVE_W32_SYSTEM/
	}
	}
	diff --git a/scd/iso7816.c b/scd/iso7816.c
	index 69009c43e..758de5b48 100644
	--- a/scd/iso7816.c
	+++ b/scd/iso7816.c
	@@ -1,940 +1,940 @@
	/* iso7816.c - ISO 7816 commands
	* Copyright (C) 2003, 2004, 2008, 2009 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 3 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, see <https://www.gnu.org/licenses/>.
	*/

	#include <config.h>
	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>

	#if defined(GNUPG_SCD_MAIN_HEADER)
	#include GNUPG_SCD_MAIN_HEADER
	#elif GNUPG_MAJOR_VERSION == 1
	/* This is used with GnuPG version < 1.9. The code has been source
	copied from the current GnuPG >= 1.9 and is maintained over
	there. */
	#include "options.h"
	#include "errors.h"
	#include "memory.h"
	#include "../common/util.h"
	#include "../common/i18n.h"
	#else /* GNUPG_MAJOR_VERSION != 1 */
	#include "scdaemon.h"
	#endif /* GNUPG_MAJOR_VERSION != 1 */

	#include "iso7816.h"
	#include "apdu.h"


	#define CMD_SELECT_FILE 0xA4
	#define CMD_VERIFY ISO7816_VERIFY
	#define CMD_CHANGE_REFERENCE_DATA ISO7816_CHANGE_REFERENCE_DATA
	#define CMD_RESET_RETRY_COUNTER ISO7816_RESET_RETRY_COUNTER
	#define CMD_GET_DATA 0xCA
	#define CMD_PUT_DATA 0xDA
	#define CMD_MSE 0x22
	#define CMD_PSO 0x2A
	#define CMD_GENERAL_AUTHENTICATE 0x87
	#define CMD_INTERNAL_AUTHENTICATE 0x88
	#define CMD_GENERATE_KEYPAIR 0x47
	#define CMD_GET_CHALLENGE 0x84
	#define CMD_READ_BINARY 0xB0
	#define CMD_READ_RECORD 0xB2

	static gpg_error_t
	map_sw (int sw)
	{
	gpg_err_code_t ec;

	switch (sw)
	{
	case SW_EEPROM_FAILURE: ec = GPG_ERR_HARDWARE; break;
	case SW_TERM_STATE: ec = GPG_ERR_OBJ_TERM_STATE; break;
	case SW_WRONG_LENGTH: ec = GPG_ERR_INV_VALUE; break;
	case SW_SM_NOT_SUP: ec = GPG_ERR_NOT_SUPPORTED; break;
	case SW_CC_NOT_SUP: ec = GPG_ERR_NOT_SUPPORTED; break;
	case SW_CHV_WRONG: ec = GPG_ERR_BAD_PIN; break;
	case SW_CHV_BLOCKED: ec = GPG_ERR_PIN_BLOCKED; break;
	case SW_USE_CONDITIONS: ec = GPG_ERR_USE_CONDITIONS; break;
	case SW_NOT_SUPPORTED: ec = GPG_ERR_NOT_SUPPORTED; break;
	case SW_BAD_PARAMETER: ec = GPG_ERR_INV_VALUE; break;
	case SW_FILE_NOT_FOUND: ec = GPG_ERR_ENOENT; break;
	case SW_RECORD_NOT_FOUND:ec= GPG_ERR_NOT_FOUND; break;
	case SW_REF_NOT_FOUND: ec = GPG_ERR_NO_OBJ; break;
	case SW_BAD_P0_P1: ec = GPG_ERR_INV_VALUE; break;
	case SW_EXACT_LENGTH: ec = GPG_ERR_INV_VALUE; break;
	case SW_INS_NOT_SUP: ec = GPG_ERR_CARD; break;
	case SW_CLA_NOT_SUP: ec = GPG_ERR_CARD; break;
	case SW_SUCCESS: ec = 0; break;

	case SW_HOST_OUT_OF_CORE: ec = GPG_ERR_ENOMEM; break;
	case SW_HOST_INV_VALUE: ec = GPG_ERR_INV_VALUE; break;
	case SW_HOST_INCOMPLETE_CARD_RESPONSE: ec = GPG_ERR_CARD; break;
	case SW_HOST_NOT_SUPPORTED: ec = GPG_ERR_NOT_SUPPORTED; break;
	case SW_HOST_LOCKING_FAILED: ec = GPG_ERR_BUG; break;
	case SW_HOST_BUSY: ec = GPG_ERR_EBUSY; break;
	case SW_HOST_NO_CARD: ec = GPG_ERR_CARD_NOT_PRESENT; break;
	case SW_HOST_CARD_INACTIVE: ec = GPG_ERR_CARD_RESET; break;
	case SW_HOST_CARD_IO_ERROR: ec = GPG_ERR_EIO; break;
	case SW_HOST_GENERAL_ERROR: ec = GPG_ERR_GENERAL; break;
	case SW_HOST_NO_READER: ec = GPG_ERR_ENODEV; break;
	case SW_HOST_ABORTED: ec = GPG_ERR_INV_RESPONSE; break;
	case SW_HOST_NO_PINPAD: ec = GPG_ERR_NOT_SUPPORTED; break;
	case SW_HOST_CANCELLED: ec = GPG_ERR_CANCELED; break;

	default:
	if ((sw & 0x010000))
	ec = GPG_ERR_GENERAL; /* Should not happen. */
	else if ((sw & 0xff00) == SW_MORE_DATA)
	ec = 0; /* This should actually never been seen here. */
	else
	ec = GPG_ERR_CARD;
	}
	return gpg_error (ec);
	}

	/* Map a status word from the APDU layer to a gpg-error code. */
	gpg_error_t
	iso7816_map_sw (int sw)
	{
	/* All APDU functions should return 0x9000 on success but for
	historical reasons of the implementation some return 0 to
	indicate success. We allow for that here. */
	return sw? map_sw (sw) : 0;
	}


	/* This function is specialized version of the SELECT FILE command.
	SLOT is the card and reader as created for example by
	apdu_open_reader (), AID is a buffer of size AIDLEN holding the
	requested application ID. The function can't be used to enumerate
	AIDs and won't return the AID on success. The return value is 0
	for okay or a GPG error code. Note that ISO error codes are
	internally mapped. Bit 0 of FLAGS should be set if the card does
	not understand P2=0xC0. */
	gpg_error_t
	iso7816_select_application (int slot, const char *aid, size_t aidlen,
	unsigned int flags)
	{
	int sw;
	sw = apdu_send_simple (slot, 0, 0x00, CMD_SELECT_FILE, 4,
	(flags&1)? 0 :0x0c, aidlen, aid);
	return map_sw (sw);
	}


	/* This is the same as iso7816_select_application but may return data
	* at RESULT,RESULTLEN). */
	gpg_error_t
	iso7816_select_application_ext (int slot, const char *aid, size_t aidlen,
	unsigned int flags,
	unsigned char *result, size_t resultlen)
	{
	int sw;
	sw = apdu_send (slot, 0, 0x00, CMD_SELECT_FILE, 4,
	(flags&1)? 0:0x0c, aidlen, aid,
	result, resultlen);
	return map_sw (sw);
	}


	gpg_error_t
	iso7816_select_file (int slot, int tag, int is_dir)
	{
	int sw, p0, p1;
	unsigned char tagbuf[2];

	tagbuf[0] = (tag >> 8) & 0xff;
	tagbuf[1] = tag & 0xff;

	p0 = (tag == 0x3F00)? 0: is_dir? 1:2;
	p1 = 0x0c; /* No FC return. */
	sw = apdu_send_simple (slot, 0, 0x00, CMD_SELECT_FILE,
	p0, p1, 2, (char*)tagbuf );
	return map_sw (sw);
	}


	/* Do a select file command with a direct path. */
	gpg_error_t
	iso7816_select_path (int slot, const unsigned short *path, size_t pathlen)
	{
	int sw, p0, p1;
	unsigned char buffer[100];
	int buflen;

	if (pathlen/2 >= sizeof buffer)
	return gpg_error (GPG_ERR_TOO_LARGE);

	for (buflen = 0; pathlen; pathlen--, path++)
	{
	buffer[buflen++] = (*path >> 8);
	buffer[buflen++] = *path;
	}

	p0 = 0x08;
	p1 = 0x0c; /* No FC return. */
	sw = apdu_send_simple (slot, 0, 0x00, CMD_SELECT_FILE,
	p0, p1, buflen, (char*)buffer );
	return map_sw (sw);
	}


	/* This is a private command currently only working for TCOS cards. */
	gpg_error_t
	iso7816_list_directory (int slot, int list_dirs,
	unsigned char *result, size_t resultlen)
	{
	int sw;

	if (!result \|\| !resultlen)
	return gpg_error (GPG_ERR_INV_VALUE);
	*result = NULL;
	*resultlen = 0;

	sw = apdu_send (slot, 0, 0x80, 0xAA, list_dirs? 1:2, 0, -1, NULL,
	result, resultlen);
	if (sw != SW_SUCCESS)
	{
	/* Make sure that pending buffers are released. */
	xfree (*result);
	*result = NULL;
	*resultlen = 0;
	}
	return map_sw (sw);
	}


	/* This function sends an already formatted APDU to the card. With
	HANDLE_MORE set to true a MORE DATA status will be handled
	internally. The return value is a gpg error code (i.e. a mapped
	status word). This is basically the same as apdu_send_direct but
	it maps the status word and does not return it in the result
	buffer. However, it R_SW is not NULL the status word is stored
	R_SW for closer inspection. */
	gpg_error_t
	iso7816_apdu_direct (int slot, const void *apdudata, size_t apdudatalen,
	int handle_more, unsigned int *r_sw,
	unsigned char *result, size_t resultlen)
	{
	int sw, sw2;

	if (result)
	{
	*result = NULL;
	*resultlen = 0;
	}

	sw = apdu_send_direct (slot, 0, apdudata, apdudatalen, handle_more,
	&sw2, result, resultlen);
	if (!sw)
	{
	if (!result)
	sw = sw2;
	else if (*resultlen < 2)
	sw = SW_HOST_GENERAL_ERROR;
	else
	{
	sw = ((result)[resultlen-2] << 8) \| (result)[resultlen-1];
	(*resultlen)--;
	(*resultlen)--;
	}
	}
	if (sw != SW_SUCCESS && result)
	{
	/* Make sure that pending buffers are released. */
	xfree (*result);
	*result = NULL;
	*resultlen = 0;
	}
	if (r_sw)
	*r_sw = sw;
	return map_sw (sw);
	}


	/* Check whether the reader supports the ISO command code COMMAND on
	the pinpad. Returns 0 on success. */
	gpg_error_t
	iso7816_check_pinpad (int slot, int command, pininfo_t *pininfo)
	{
	int sw;

	sw = apdu_check_pinpad (slot, command, pininfo);
	return iso7816_map_sw (sw);
	}


	/* Perform a VERIFY command on SLOT using the card holder verification
	vector CHVNO. With PININFO non-NULL the pinpad of the reader will
	be used. Returns 0 on success. */
	gpg_error_t
	iso7816_verify_kp (int slot, int chvno, pininfo_t *pininfo)
	{
	int sw;

	sw = apdu_pinpad_verify (slot, 0x00, CMD_VERIFY, 0, chvno, pininfo);
	return map_sw (sw);
	}

	/* Perform a VERIFY command on SLOT using the card holder verification
	vector CHVNO with a CHV of length CHVLEN. Returns 0 on success. */
	gpg_error_t
	iso7816_verify (int slot, int chvno, const char *chv, size_t chvlen)
	{
	int sw;

	sw = apdu_send_simple (slot, 0, 0x00, CMD_VERIFY, 0, chvno, chvlen, chv);
	return map_sw (sw);
	}

	/* Perform a CHANGE_REFERENCE_DATA command on SLOT for the card holder
	verification vector CHVNO. With PININFO non-NULL the pinpad of the
	reader will be used. If IS_EXCHANGE is 0, a "change reference
	data" is done, otherwise an "exchange reference data". */
	gpg_error_t
	iso7816_change_reference_data_kp (int slot, int chvno, int is_exchange,
	pininfo_t *pininfo)
	{
	int sw;

	sw = apdu_pinpad_modify (slot, 0x00, CMD_CHANGE_REFERENCE_DATA,
	is_exchange ? 1 : 0, chvno, pininfo);
	return map_sw (sw);
	}

	/* Perform a CHANGE_REFERENCE_DATA command on SLOT for the card holder
	verification vector CHVNO. If the OLDCHV is NULL (and OLDCHVLEN
	0), a "change reference data" is done, otherwise an "exchange
	reference data". The new reference data is expected in NEWCHV of
	length NEWCHVLEN. */
	gpg_error_t
	iso7816_change_reference_data (int slot, int chvno,
	const char *oldchv, size_t oldchvlen,
	const char *newchv, size_t newchvlen)
	{
	int sw;
	char *buf;

	if ((!oldchv && oldchvlen)
	\|\| (oldchv && !oldchvlen)
	\|\| !newchv \|\| !newchvlen )
	return gpg_error (GPG_ERR_INV_VALUE);

	buf = xtrymalloc (oldchvlen + newchvlen);
	if (!buf)
	return gpg_error (gpg_err_code_from_errno (errno));
	if (oldchvlen)
	memcpy (buf, oldchv, oldchvlen);
	memcpy (buf+oldchvlen, newchv, newchvlen);

	sw = apdu_send_simple (slot, 0, 0x00, CMD_CHANGE_REFERENCE_DATA,
	oldchvlen? 0 : 1, chvno, oldchvlen+newchvlen, buf);
	wipememory (buf, oldchvlen+newchvlen);
	xfree (buf);
	return map_sw (sw);

	}


	gpg_error_t
	iso7816_reset_retry_counter_with_rc (int slot, int chvno,
	const char *data, size_t datalen)
	{
	int sw;

	if (!data \|\| !datalen )
	return gpg_error (GPG_ERR_INV_VALUE);

	sw = apdu_send_simple (slot, 0, 0x00, CMD_RESET_RETRY_COUNTER,
	0, chvno, datalen, data);
	return map_sw (sw);
	}


	gpg_error_t
	iso7816_reset_retry_counter (int slot, int chvno,
	const char *newchv, size_t newchvlen)
	{
	int sw;

	sw = apdu_send_simple (slot, 0, 0x00, CMD_RESET_RETRY_COUNTER,
	2, chvno, newchvlen, newchv);
	return map_sw (sw);
	}



	/* Perform a GET DATA command requesting TAG and storing the result in
	a newly allocated buffer at the address passed by RESULT. Return
	the length of this data at the address of RESULTLEN. */
	gpg_error_t
	iso7816_get_data (int slot, int extended_mode, int tag,
	unsigned char *result, size_t resultlen)
	{
	int sw;
	int le;

	if (!result \|\| !resultlen)
	return gpg_error (GPG_ERR_INV_VALUE);
	*result = NULL;
	*resultlen = 0;

	if (extended_mode > 0 && extended_mode < 256)
	le = 65534; /* Not 65535 in case it is used as some special flag. */
	else if (extended_mode > 0)
	le = extended_mode;
	else
	le = 256;

	sw = apdu_send_le (slot, extended_mode, 0x00, CMD_GET_DATA,
	((tag >> 8) & 0xff), (tag & 0xff), -1, NULL, le,
	result, resultlen);
	if (sw != SW_SUCCESS)
	{
	/* Make sure that pending buffers are released. */
	xfree (*result);
	*result = NULL;
	*resultlen = 0;
	return map_sw (sw);
	}

	return 0;
	}


	/* Perform a GET DATA command requesting TAG and storing the result in
	* a newly allocated buffer at the address passed by RESULT. Return
	* the length of this data at the address of RESULTLEN. This variant
	* is needed for long (3 octet) tags. */
	gpg_error_t
	iso7816_get_data_odd (int slot, int extended_mode, unsigned int tag,
	unsigned char *result, size_t resultlen)
	{
	int sw;
	int le;
	int datalen;
	unsigned char data[5];

	if (!result \|\| !resultlen)
	return gpg_error (GPG_ERR_INV_VALUE);
	*result = NULL;
	*resultlen = 0;

	if (extended_mode > 0 && extended_mode < 256)
	le = 65534; /* Not 65535 in case it is used as some special flag. */
	else if (extended_mode > 0)
	le = extended_mode;
	else
	le = 256;

	data[0] = 0x5c;
	if (tag <= 0xff)
	{
	data[1] = 1;
	data[2] = tag;
	datalen = 3;
	}
	else if (tag <= 0xffff)
	{
	data[1] = 2;
	data[2] = (tag >> 8);
	data[3] = tag;
	datalen = 4;
	}
	else
	{
	data[1] = 3;
	data[2] = (tag >> 16);
	data[3] = (tag >> 8);
	data[4] = tag;
	datalen = 5;
	}

	sw = apdu_send_le (slot, extended_mode, 0x00, CMD_GET_DATA + 1,
	0x3f, 0xff, datalen, data, le,
	result, resultlen);
	if (sw != SW_SUCCESS)
	{
	/* Make sure that pending buffers are released. */
	xfree (*result);
	*result = NULL;
	*resultlen = 0;
	return map_sw (sw);
	}

	return 0;
	}


	/* Perform a PUT DATA command on card in SLOT. Write DATA of length
	DATALEN to TAG. EXTENDED_MODE controls whether extended length
	headers or command chaining is used instead of single length
	bytes. */
	gpg_error_t
	iso7816_put_data (int slot, int extended_mode, int tag,
	const void *data, size_t datalen)
	{
	int sw;

	sw = apdu_send_simple (slot, extended_mode, 0x00, CMD_PUT_DATA,
	((tag >> 8) & 0xff), (tag & 0xff),
	datalen, (const char*)data);
	return map_sw (sw);
	}

	/* Same as iso7816_put_data but uses an odd instruction byte. */
	gpg_error_t
	iso7816_put_data_odd (int slot, int extended_mode, int tag,
	const void *data, size_t datalen)
	{
	int sw;

	sw = apdu_send_simple (slot, extended_mode, 0x00, CMD_PUT_DATA+1,
	((tag >> 8) & 0xff), (tag & 0xff),
	datalen, (const char*)data);
	return map_sw (sw);
	}

	/* Manage Security Environment. This is a weird operation and there
	is no easy abstraction for it. Furthermore, some card seem to have
	a different interpretation of 7816-8 and thus we resort to let the
	caller decide what to do. */
	gpg_error_t
	iso7816_manage_security_env (int slot, int p1, int p2,
	const unsigned char *data, size_t datalen)
	{
	int sw;

	if (p1 < 0 \|\| p1 > 255 \|\| p2 < 0 \|\| p2 > 255 )
	return gpg_error (GPG_ERR_INV_VALUE);

	sw = apdu_send_simple (slot, 0, 0x00, CMD_MSE, p1, p2,
	data? datalen : -1, (const char*)data);
	return map_sw (sw);
	}


	/* Perform the security operation COMPUTE DIGITAL SIGANTURE. On
	success 0 is returned and the data is available in a newly
	allocated buffer stored at RESULT with its length stored at
	RESULTLEN. For LE see do_generate_keypair. */
	gpg_error_t
	iso7816_compute_ds (int slot, int extended_mode,
	const unsigned char *data, size_t datalen, int le,
	unsigned char *result, size_t resultlen)
	{
	int sw;

	if (!data \|\| !datalen \|\| !result \|\| !resultlen)
	return gpg_error (GPG_ERR_INV_VALUE);
	*result = NULL;
	*resultlen = 0;

	if (!extended_mode)
	le = 256; /* Ignore provided Le and use what apdu_send uses. */
	else if (le >= 0 && le < 256)
	le = 256;

	sw = apdu_send_le (slot, extended_mode,
	0x00, CMD_PSO, 0x9E, 0x9A,
	datalen, (const char*)data,
	le,
	result, resultlen);
	if (sw != SW_SUCCESS)
	{
	/* Make sure that pending buffers are released. */
	xfree (*result);
	*result = NULL;
	*resultlen = 0;
	return map_sw (sw);
	}

	return 0;
	}


	/* Perform the security operation DECIPHER. PADIND is the padding
	indicator to be used. It should be 0 if no padding is required, a
	value of -1 suppresses the padding byte. On success 0 is returned
	and the plaintext is available in a newly allocated buffer stored
	at RESULT with its length stored at RESULTLEN. For LE see
	do_generate_keypair. */
	gpg_error_t
	iso7816_decipher (int slot, int extended_mode,
	const unsigned char *data, size_t datalen, int le,
	int padind, unsigned char *result, size_t resultlen)
	{
	int sw;
	unsigned char *buf;

	if (!data \|\| !datalen \|\| !result \|\| !resultlen)
	return gpg_error (GPG_ERR_INV_VALUE);
	*result = NULL;
	*resultlen = 0;

	if (!extended_mode)
	le = 256; /* Ignore provided Le and use what apdu_send uses. */
	else if (le >= 0 && le < 256)
	le = 256;

	if (padind >= 0)
	{
	/* We need to prepend the padding indicator. */
	buf = xtrymalloc (datalen + 1);
	if (!buf)
	return gpg_error (gpg_err_code_from_errno (errno));

	buf = padind; / Padding indicator. */
	memcpy (buf+1, data, datalen);
	sw = apdu_send_le (slot, extended_mode,
	0x00, CMD_PSO, 0x80, 0x86,
	datalen+1, (char*)buf, le,
	result, resultlen);
	xfree (buf);
	}
	else
	{
	sw = apdu_send_le (slot, extended_mode,
	0x00, CMD_PSO, 0x80, 0x86,
	datalen, (const char *)data, le,
	result, resultlen);
	}
	if (sw != SW_SUCCESS)
	{
	/* Make sure that pending buffers are released. */
	xfree (*result);
	*result = NULL;
	*resultlen = 0;
	return map_sw (sw);
	}

	return 0;
	}


	/* For LE see do_generate_keypair. */
	gpg_error_t
	iso7816_internal_authenticate (int slot, int extended_mode,
	const unsigned char *data, size_t datalen,
	int le,
	unsigned char *result, size_t resultlen)
	{
	int sw;

	if (!data \|\| !datalen \|\| !result \|\| !resultlen)
	return gpg_error (GPG_ERR_INV_VALUE);
	*result = NULL;
	*resultlen = 0;

	if (!extended_mode)
	le = 256; /* Ignore provided Le and use what apdu_send uses. */
	else if (le >= 0 && le < 256)
	le = 256;

	sw = apdu_send_le (slot, extended_mode,
	0x00, CMD_INTERNAL_AUTHENTICATE, 0, 0,
	datalen, (const char*)data,
	le,
	result, resultlen);
	if (sw != SW_SUCCESS)
	{
	/* Make sure that pending buffers are released. */
	xfree (*result);
	*result = NULL;
	*resultlen = 0;
	return map_sw (sw);
	}

	return 0;
	}


	/* For LE see do_generate_keypair. */
	gpg_error_t
	iso7816_general_authenticate (int slot, int extended_mode,
	int algoref, int keyref,
	const unsigned char *data, size_t datalen,
	int le,
	unsigned char *result, size_t resultlen)
	{
	int sw;

	if (!data \|\| !datalen \|\| !result \|\| !resultlen)
	return gpg_error (GPG_ERR_INV_VALUE);
	*result = NULL;
	*resultlen = 0;

	if (!extended_mode)
	le = 256; /* Ignore provided Le and use what apdu_send uses. */
	else if (le >= 0 && le < 256)
	le = 256;

	sw = apdu_send_le (slot, extended_mode,
	0x00, CMD_GENERAL_AUTHENTICATE, algoref, keyref,
	datalen, (const char*)data,
	le,
	result, resultlen);
	if (sw != SW_SUCCESS)
	{
	/* Make sure that pending buffers are released. */
	xfree (*result);
	*result = NULL;
	*resultlen = 0;
	return map_sw (sw);
	}

	return 0;
	}


	/* LE is the expected return length. This is usually 0 except if
	extended length mode is used and more than 256 byte will be
	returned. In that case a value of -1 uses a large default
	(e.g. 4096 bytes), a value larger 256 used that value. */
	static gpg_error_t
	-do_generate_keypair (int slot, int extended_mode, int read_only,
	+do_generate_keypair (int slot, int extended_mode, int p1, int p2,
	const char *data, size_t datalen, int le,
	unsigned char *result, size_t resultlen)
	{
	int sw;

	if (!data \|\| !datalen \|\| !result \|\| !resultlen)
	return gpg_error (GPG_ERR_INV_VALUE);
	*result = NULL;
	*resultlen = 0;

	sw = apdu_send_le (slot, extended_mode,
	- 0x00, CMD_GENERATE_KEYPAIR, read_only? 0x81:0x80, 0,
	+ 0x00, CMD_GENERATE_KEYPAIR, p1, p2,
	datalen, data,
	le >= 0 && le < 256? 256:le,
	result, resultlen);
	if (sw != SW_SUCCESS)
	{
	/* Make sure that pending buffers are released. */
	xfree (*result);
	*result = NULL;
	*resultlen = 0;
	return map_sw (sw);
	}

	return 0;
	}


	gpg_error_t
	-iso7816_generate_keypair (int slot, int extended_mode,
	+iso7816_generate_keypair (int slot, int extended_mode, int p1, int p2,
	const char *data, size_t datalen,
	int le,
	unsigned char *result, size_t resultlen)
	{
	- return do_generate_keypair (slot, extended_mode, 0,
	+ return do_generate_keypair (slot, extended_mode, p1, p2,
	data, datalen, le, result, resultlen);
	}


	gpg_error_t
	iso7816_read_public_key (int slot, int extended_mode,
	const char *data, size_t datalen,
	int le,
	unsigned char *result, size_t resultlen)
	{
	- return do_generate_keypair (slot, extended_mode, 1,
	+ return do_generate_keypair (slot, extended_mode, 0x81, 0,
	data, datalen, le, result, resultlen);
	}



	gpg_error_t
	iso7816_get_challenge (int slot, int length, unsigned char *buffer)
	{
	int sw;
	unsigned char *result;
	size_t resultlen, n;

	if (!buffer \|\| length < 1)
	return gpg_error (GPG_ERR_INV_VALUE);

	do
	{
	result = NULL;
	n = length > 254? 254 : length;
	sw = apdu_send_le (slot, 0,
	0x00, CMD_GET_CHALLENGE, 0, 0, -1, NULL, n,
	&result, &resultlen);
	if (sw != SW_SUCCESS)
	{
	/* Make sure that pending buffers are released. */
	xfree (result);
	return map_sw (sw);
	}
	if (resultlen > n)
	resultlen = n;
	memcpy (buffer, result, resultlen);
	buffer += resultlen;
	length -= resultlen;
	xfree (result);
	}
	while (length > 0);

	return 0;
	}

	/* Perform a READ BINARY command requesting a maximum of NMAX bytes
	from OFFSET. With NMAX = 0 the entire file is read. The result is
	stored in a newly allocated buffer at the address passed by RESULT.
	Returns the length of this data at the address of RESULTLEN. */
	gpg_error_t
	iso7816_read_binary (int slot, size_t offset, size_t nmax,
	unsigned char *result, size_t resultlen)
	{
	int sw;
	unsigned char *buffer;
	size_t bufferlen;
	int read_all = !nmax;
	size_t n;

	if (!result \|\| !resultlen)
	return gpg_error (GPG_ERR_INV_VALUE);
	*result = NULL;
	*resultlen = 0;

	/* We can only encode 15 bits in p0,p1 to indicate an offset. Thus
	we check for this limit. */
	if (offset > 32767)
	return gpg_error (GPG_ERR_INV_VALUE);

	do
	{
	buffer = NULL;
	bufferlen = 0;
	n = read_all? 0 : nmax;
	sw = apdu_send_le (slot, 0, 0x00, CMD_READ_BINARY,
	((offset>>8) & 0xff), (offset & 0xff) , -1, NULL,
	n, &buffer, &bufferlen);
	if ( SW_EXACT_LENGTH_P(sw) )
	{
	n = (sw & 0x00ff);
	sw = apdu_send_le (slot, 0, 0x00, CMD_READ_BINARY,
	((offset>>8) & 0xff), (offset & 0xff) , -1, NULL,
	n, &buffer, &bufferlen);
	}

	if (*result && sw == SW_BAD_P0_P1)
	{
	/* Bad Parameter means that the offset is outside of the
	EF. When reading all data we take this as an indication
	for EOF. */
	break;
	}

	if (sw != SW_SUCCESS && sw != SW_EOF_REACHED)
	{
	/* Make sure that pending buffers are released. */
	xfree (buffer);
	xfree (*result);
	*result = NULL;
	*resultlen = 0;
	return map_sw (sw);
	}
	if (result) / Need to extend the buffer. */
	{
	unsigned char p = xtryrealloc (result, *resultlen + bufferlen);
	if (!p)
	{
	gpg_error_t err = gpg_error_from_syserror ();
	xfree (buffer);
	xfree (*result);
	*result = NULL;
	*resultlen = 0;
	return err;
	}
	*result = p;
	memcpy (result + resultlen, buffer, bufferlen);
	*resultlen += bufferlen;
	xfree (buffer);
	buffer = NULL;
	}
	else /* Transfer the buffer into our result. */
	{
	*result = buffer;
	*resultlen = bufferlen;
	}
	offset += bufferlen;
	if (offset > 32767)
	break; /* We simply truncate the result for too large
	files. */
	if (nmax > bufferlen)
	nmax -= bufferlen;
	else
	nmax = 0;
	}
	while ((read_all && sw != SW_EOF_REACHED) \|\| (!read_all && nmax));

	return 0;
	}

	/* Perform a READ RECORD command. RECNO gives the record number to
	read with 0 indicating the current record. RECCOUNT must be 1 (not
	all cards support reading of more than one record). SHORT_EF
	should be 0 to read the current EF or contain a short EF. The
	result is stored in a newly allocated buffer at the address passed
	by RESULT. Returns the length of this data at the address of
	RESULTLEN. */
	gpg_error_t
	iso7816_read_record (int slot, int recno, int reccount, int short_ef,
	unsigned char *result, size_t resultlen)
	{
	int sw;
	unsigned char *buffer;
	size_t bufferlen;

	if (!result \|\| !resultlen)
	return gpg_error (GPG_ERR_INV_VALUE);
	*result = NULL;
	*resultlen = 0;

	/* We can only encode 15 bits in p0,p1 to indicate an offset. Thus
	we check for this limit. */
	if (recno < 0 \|\| recno > 255 \|\| reccount != 1
	\|\| short_ef < 0 \|\| short_ef > 254 )
	return gpg_error (GPG_ERR_INV_VALUE);

	buffer = NULL;
	bufferlen = 0;
	sw = apdu_send_le (slot, 0, 0x00, CMD_READ_RECORD,
	recno,
	short_ef? short_ef : 0x04,
	-1, NULL,
	0, &buffer, &bufferlen);

	if (sw != SW_SUCCESS && sw != SW_EOF_REACHED)
	{
	/* Make sure that pending buffers are released. */
	xfree (buffer);
	xfree (*result);
	*result = NULL;
	*resultlen = 0;
	return map_sw (sw);
	}
	*result = buffer;
	*resultlen = bufferlen;

	return 0;
	}
	diff --git a/scd/iso7816.h b/scd/iso7816.h
	index 4a366e6eb..df5d25fe8 100644
	--- a/scd/iso7816.h
	+++ b/scd/iso7816.h
	@@ -1,131 +1,133 @@
	/* iso7816.h - ISO 7816 commands
	* 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 3 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, see <https://www.gnu.org/licenses/>.
	*/

	#ifndef ISO7816_H
	#define ISO7816_H

	#if GNUPG_MAJOR_VERSION == 1
	#include "cardglue.h"
	#endif

	/* Command codes used by iso7816_check_pinpad. */
	#define ISO7816_VERIFY 0x20
	#define ISO7816_CHANGE_REFERENCE_DATA 0x24
	#define ISO7816_RESET_RETRY_COUNTER 0x2C


	/* Information to be passed to pinpad equipped readers. See
	ccid-driver.c for details. */
	struct pininfo_s
	{
	int fixedlen; /*
	* -1: Variable length input is not supported,
	* no information of fixed length yet.
	* 0: Use variable length input.
	* >0: Fixed length of PIN.
	*/
	int minlen;
	int maxlen;
	};
	typedef struct pininfo_s pininfo_t;


	gpg_error_t iso7816_map_sw (int sw);

	gpg_error_t iso7816_select_application (int slot,
	const char *aid, size_t aidlen,
	unsigned int flags);
	gpg_error_t iso7816_select_application_ext (int slot,
	const char *aid, size_t aidlen,
	unsigned int flags,
	unsigned char **result,
	size_t *resultlen);
	gpg_error_t iso7816_select_file (int slot, int tag, int is_dir);
	gpg_error_t iso7816_select_path (int slot,
	const unsigned short *path, size_t pathlen);
	gpg_error_t iso7816_list_directory (int slot, int list_dirs,
	unsigned char *result, size_t resultlen);
	gpg_error_t iso7816_apdu_direct (int slot,
	const void *apdudata, size_t apdudatalen,
	int handle_more, unsigned int *r_sw,
	unsigned char *result, size_t resultlen);
	gpg_error_t iso7816_check_pinpad (int slot, int command,
	pininfo_t *pininfo);
	gpg_error_t iso7816_verify (int slot,
	int chvno, const char *chv, size_t chvlen);
	gpg_error_t iso7816_verify_kp (int slot, int chvno, pininfo_t *pininfo);
	gpg_error_t iso7816_change_reference_data (int slot, int chvno,
	const char *oldchv, size_t oldchvlen,
	const char *newchv, size_t newchvlen);
	gpg_error_t iso7816_change_reference_data_kp (int slot, int chvno,
	int is_exchange,
	pininfo_t *pininfo);
	gpg_error_t iso7816_reset_retry_counter (int slot, int chvno,
	const char *newchv, size_t newchvlen);
	gpg_error_t iso7816_reset_retry_counter_with_rc (int slot, int chvno,
	const char *data,
	size_t datalen);
	gpg_error_t iso7816_get_data (int slot, int extended_mode, int tag,
	unsigned char *result, size_t resultlen);
	gpg_error_t iso7816_get_data_odd (int slot, int extended_mode, unsigned int tag,
	unsigned char *result, size_t resultlen);
	gpg_error_t iso7816_put_data (int slot, int extended_mode, int tag,
	const void *data, size_t datalen);
	gpg_error_t iso7816_put_data_odd (int slot, int extended_mode, int tag,
	const void *data, size_t datalen);
	gpg_error_t iso7816_manage_security_env (int slot, int p1, int p2,
	const unsigned char *data,
	size_t datalen);
	gpg_error_t iso7816_compute_ds (int slot, int extended_mode,
	const unsigned char *data, size_t datalen,
	int le,
	unsigned char *result, size_t resultlen);
	gpg_error_t iso7816_decipher (int slot, int extended_mode,
	const unsigned char *data, size_t datalen,
	int le, int padind,
	unsigned char *result, size_t resultlen);
	gpg_error_t iso7816_internal_authenticate (int slot, int extended_mode,
	const unsigned char *data, size_t datalen,
	int le,
	unsigned char *result, size_t resultlen);
	gpg_error_t iso7816_general_authenticate (int slot, int extended_mode,
	int algoref, int keyref,
	const unsigned char *data,
	size_t datalen,
	int le,
	unsigned char **result,
	size_t *resultlen);
	gpg_error_t iso7816_generate_keypair (int slot, int extended_mode,
	- const char *data, size_t datalen,
	- int le,
	- unsigned char *result, size_t resultlen);
	+ int p1, int p2,
	+ const char *data, size_t datalen,
	+ int le,
	+ unsigned char **result,
	+ size_t *resultlen);
	gpg_error_t iso7816_read_public_key (int slot, int extended_mode,
	const char *data, size_t datalen,
	int le,
	unsigned char *result, size_t resultlen);
	gpg_error_t iso7816_get_challenge (int slot,
	int length, unsigned char *buffer);

	gpg_error_t iso7816_read_binary (int slot, size_t offset, size_t nmax,
	unsigned char *result, size_t resultlen);
	gpg_error_t iso7816_read_record (int slot, int recno, int reccount,
	int short_ef,
	unsigned char *result, size_t resultlen);

	#endif /ISO7816_H/

File Metadata

Mime Type: text/x-diff
Expires: Mon, Dec 8, 4:12 AM (1 d, 15 h)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: 1a/45/480bb677a3aeb7b1660ec417d9d8

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions