mirror of git://git.gnupg.org/gnupg.git
scd: Make app_genkey and supporting ISO function more flexible.
* scd/app.c (app_genkey): Add arg keytype. * scd/app-common.h (struct app_ctx_s): Fitto for the genkey member. * scd/command.c (cmd_genkey): Adjust for change. * scd/iso7816.c (do_generate_keypair): Replace arg read_only by new args p1 and p2. (iso7816_read_public_key): Adjust for this. (iso7816_generate_keypair): Add new args p1 and p2. * scd/app-openpgp.c (do_genkey): Adjust for changes. -- The OpenPGP card creates keys according to parameters read from a data object. Other cards we are about to implement require a direct specification of the requested keytype. This patch implements the required changes. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch
parent
c26af8ac26
commit
9a9cb0257a
|
|
@ -106,8 +106,8 @@ struct app_ctx_s {
|
|||
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,
|
||||
|
|
@ -178,8 +178,8 @@ gpg_error_t app_writekey (app_t app, ctrl_t ctrl,
|
|||
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,
|
||||
|
|
|
|||
|
|
@ -4086,8 +4086,8 @@ do_writekey (app_t app, ctrl_t ctrl,
|
|||
|
||||
/* 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)
|
||||
{
|
||||
|
|
@ -4103,6 +4103,8 @@ do_genkey (app_t app, ctrl_t ctrl, const char *keynostr, unsigned int flags,
|
|||
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);
|
||||
|
||||
|
|
@ -4151,7 +4153,7 @@ do_genkey (app_t app, ctrl_t ctrl, const char *keynostr, unsigned int flags,
|
|||
|
||||
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);
|
||||
|
|
|
|||
|
|
@ -939,8 +939,8 @@ app_writekey (app_t app, ctrl_t ctrl,
|
|||
|
||||
/* 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)
|
||||
{
|
||||
|
|
@ -955,7 +955,7 @@ app_genkey (app_t app, ctrl_t ctrl, const char *keynostr, unsigned int flags,
|
|||
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)
|
||||
|
|
|
|||
|
|
@ -1190,7 +1190,8 @@ cmd_genkey (assuan_context_t ctx, char *line)
|
|||
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);
|
||||
|
||||
|
|
|
|||
|
|
@ -709,7 +709,7 @@ iso7816_general_authenticate (int slot, int extended_mode,
|
|||
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)
|
||||
{
|
||||
|
|
@ -721,7 +721,7 @@ do_generate_keypair (int slot, int extended_mode, int read_only,
|
|||
*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);
|
||||
|
|
@ -739,12 +739,12 @@ do_generate_keypair (int slot, int extended_mode, int read_only,
|
|||
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
@ -755,7 +755,7 @@ iso7816_read_public_key (int slot, int extended_mode,
|
|||
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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -112,9 +112,11 @@ gpg_error_t iso7816_general_authenticate (int slot, int extended_mode,
|
|||
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,
|
||||
|
|
|
|||
Loading…
Reference in New Issue