diff options
| author | Werner Koch <[email protected]> | 2005-05-21 14:04:32 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2005-05-21 14:04:32 +0000 |
| commit | be2aa37dbf0da2c953143c328a1aed4bf210cc87 (patch) | |
| tree | c4b207b7cd1bfca613d0e52a4ddd6c9b41d3c8e0 /g10/app-common.h | |
| parent | (ccid_transceive): Arghhh. The seqno is another (diff) | |
| download | gnupg-be2aa37dbf0da2c953143c328a1aed4bf210cc87.tar.gz gnupg-be2aa37dbf0da2c953143c328a1aed4bf210cc87.zip | |
* cardglue.c (send_status_info): Make CTRL optional.
(agent_scd_writekey, inq_writekey_parms): New.
(agent_openpgp_storekey): Removed.
* cardglue.h: Add a few more error code mappings.
* keygen.c (copy_mpi): Removed.
(save_unprotected_key_to_card): Changed to use agent_scd_writekey.
* app-common.h, app-openpgp.c, tlv.c, tlv.h: Updated from newer
version in gnupg 1.9 CVS.
Diffstat (limited to 'g10/app-common.h')
| -rw-r--r-- | g10/app-common.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/g10/app-common.h b/g10/app-common.h index f1058dda1..c2c302395 100644 --- a/g10/app-common.h +++ b/g10/app-common.h @@ -86,6 +86,11 @@ struct app_ctx_s { void *pincb_arg, const void *indata, size_t indatalen, unsigned char **outdata, size_t *outdatalen); + gpg_error_t (*writekey) (app_t app, ctrl_t ctrl, + const char *certid, 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, gpg_error_t (*pincb)(void*, const char *, char **), @@ -148,6 +153,11 @@ gpg_error_t app_decipher (app_t app, const char *keyidstr, void *pincb_arg, const void *indata, size_t indatalen, unsigned char **outdata, size_t *outdatalen ); +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, gpg_error_t (*pincb)(void*, const char *, char **), |