diff options
| author | NIIBE Yutaka <[email protected]> | 2018-11-15 03:19:02 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-11-15 03:31:11 +0000 |
| commit | a5542a4a702c2210facf58a98bc8d3d16089b6ab (patch) | |
| tree | 8f982554c7e8724253fd15dcba28238eb62a82e5 /g10/call-agent.h | |
| parent | Merge branch 'seckey-sync-work' into master (diff) | |
| download | gnupg-a5542a4a702c2210facf58a98bc8d3d16089b6ab.tar.gz gnupg-a5542a4a702c2210facf58a98bc8d3d16089b6ab.zip | |
card: Display if KDF is enabled or not.
* g10/call-agent.h (kdf_do_enabled): New field.
* g10/call-agent.c (learn_status_cb): Set kdf_do_enabled if available.
* g10/card-util.c (current_card_status): Inform the availability.
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'g10/call-agent.h')
| -rw-r--r-- | g10/call-agent.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/g10/call-agent.h b/g10/call-agent.h index 1055b5ef9..1d232f7be 100644 --- a/g10/call-agent.h +++ b/g10/call-agent.h @@ -72,6 +72,7 @@ struct agent_card_info_s unsigned int bt:1; /* Button for confirmation available. */ } extcap; unsigned int status_indicator; + int kdf_do_enabled; /* Card has a KDF object */ }; @@ -193,14 +194,14 @@ gpg_error_t agent_keywrap_key (ctrl_t ctrl, int forexport, gpg_error_t agent_import_key (ctrl_t ctrl, const char *desc, char **cache_nonce_addr, const void *key, size_t keylen, int unattended, int force, - u32 *keyid, u32 *mainkeyid, int pubkey_algo); + u32 *keyid, u32 *mainkeyid, int pubkey_algo); /* Receive a key from the agent. */ gpg_error_t agent_export_key (ctrl_t ctrl, const char *keygrip, const char *desc, int openpgp_protected, char **cache_nonce_addr, unsigned char **r_result, size_t *r_resultlen, - u32 *keyid, u32 *mainkeyid, int pubkey_algo); + u32 *keyid, u32 *mainkeyid, int pubkey_algo); /* Delete a key from the agent. */ gpg_error_t agent_delete_key (ctrl_t ctrl, const char *hexkeygrip, |