diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2016-10-20 06:30:47 +0200 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2016-10-20 06:30:47 +0200 |
| commit | 980c037bedb968ddf155dd334c0a70b918a17759 (patch) | |
| tree | 9edc34bfa918ba081506f9e6d0596963f2d465b7 /g10/call-agent.h | |
| parent | agent: Add --card option for READKEY. (diff) | |
| download | gnupg2-980c037bedb968ddf155dd334c0a70b918a17759.tar.xz gnupg2-980c037bedb968ddf155dd334c0a70b918a17759.zip | |
g10: smartcard keygen change.
* g10/call-agent.c (scd_genkey_cb_append_savedbytes): Remove.
(scd_genkey_cb): Only handle KEY-CREATED-AT and PROGRESS.
(agent_scd_genkey): Remove INFO argument. CREATETIME is now in/out
argument.
(agent_readkey): Use READKEY --card instead of SCD READKEY.
* g10/keygen.c (gen_card_key): Use READKEY --card command of the agent
to retrieve public key information from card and let the agent make
a file for private key with shadow info.
--
This change removes gpg's KEY-DATA handling for SCD GENKEY. Information
with KEY-DATA is simply not used. Instead, it is read by READKEY --card
command of gpg-agent. This can consolidate public key handling in a
single method by READKEY.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'g10/call-agent.h')
| -rw-r--r-- | g10/call-agent.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/g10/call-agent.h b/g10/call-agent.h index d85a6fd5d..032c345e5 100644 --- a/g10/call-agent.h +++ b/g10/call-agent.h @@ -68,13 +68,6 @@ struct agent_card_info_s unsigned int status_indicator; }; -struct agent_card_genkey_s { - char fprvalid; - char fpr[20]; - u32 created_at; - gcry_mpi_t n; - gcry_mpi_t e; -}; /* Release the card info structure. */ @@ -107,8 +100,7 @@ int agent_scd_writekey (int keyno, const char *serialno, const unsigned char *keydata, size_t keydatalen); /* Send a GENKEY command to the SCdaemon. */ -int agent_scd_genkey (struct agent_card_genkey_s *info, int keyno, int force, - const char *serialno, u32 createtime); +int agent_scd_genkey (int keyno, int force, u32 *createtime); /* Send a READKEY command to the SCdaemon. */ int agent_scd_readcert (const char *certidstr, |