diff options
author | Werner Koch <[email protected]> | 2013-08-08 19:22:38 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2013-08-08 19:22:38 +0000 |
commit | 50c98c7ed6b542857ee2f902eca36cda37407737 (patch) | |
tree | 42659bb6299c4701252a44282c7265f64bafa432 /agent/agent.h | |
parent | gpg: No need to create a trustdb when encrypting with --always-trust. (diff) | |
download | gnupg-50c98c7ed6b542857ee2f902eca36cda37407737.tar.gz gnupg-50c98c7ed6b542857ee2f902eca36cda37407737.zip |
agent: Extend cmd KEYINFO to return data from sshcontrol.
* agent/command-ssh.c (struct control_file_s): Rename to
ssh_control_file_s.
(ssh_open_control_file, ssh_close_control_file)
(ssh_read_control_file, ssh_search_control_file): New.
(control_file_t): Rename and move to ...
* agent/agent.h (ssh_control_file_t): here.
* agent/command.c (do_one_keyinfo): Add args is_ssh, ttl, disabled,
and confirm. Rename unknown keytype indicator from '-' to 'X'. Extend
output.
(cmd_keyinfo): Add options --ssh-list and --with-ssh.
--
This extension allows the development of frontends to manage the
sshcontrol file.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'agent/agent.h')
-rw-r--r-- | agent/agent.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/agent/agent.h b/agent/agent.h index 7445061ac..885e7fe75 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -157,6 +157,10 @@ struct /* Forward reference for local definitions in command.c. */ struct server_local_s; +/* Declaration of objects from command-ssh.c. */ +struct ssh_control_file_s; +typedef struct ssh_control_file_s *ssh_control_file_t; + /* Forward reference for local definitions in call-scd.c. */ struct scd_local_s; @@ -290,6 +294,16 @@ gpg_error_t pinentry_loopback(ctrl_t, const char *keyword, size_t max_length); /*-- command-ssh.c --*/ +ssh_control_file_t ssh_open_control_file (void); +void ssh_close_control_file (ssh_control_file_t cf); +gpg_error_t ssh_read_control_file (ssh_control_file_t cf, + char *r_hexgrip, int *r_disabled, + int *r_ttl, int *r_confirm); +gpg_error_t ssh_search_control_file (ssh_control_file_t cf, + const char *hexgrip, + int *r_disabled, + int *r_ttl, int *r_confirm); + void start_command_handler_ssh (ctrl_t, gnupg_fd_t); /*-- findkey.c --*/ |