shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 02:38:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

options: Allow listing all identity files

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Pavol Žáčik <pzacik@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jakub Jelen
2026-02-02 19:29:03 +01:00
parent b4f6d8b800
commit 39d931f7e5
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/libssh/libssh.h
View File

@@ -432,6 +432,7 @@ enum ssh_options_e {
SSH_OPTIONS_ADDRESS_FAMILY, SSH_OPTIONS_ADDRESS_FAMILY,
SSH_OPTIONS_GSSAPI_KEY_EXCHANGE, SSH_OPTIONS_GSSAPI_KEY_EXCHANGE,
SSH_OPTIONS_GSSAPI_KEY_EXCHANGE_ALGS, SSH_OPTIONS_GSSAPI_KEY_EXCHANGE_ALGS,
SSH_OPTIONS_NEXT_IDENTITY,
}; };
enum { enum {

1
include/libssh/session.h
View File

@@ -246,6 +246,7 @@ struct ssh_session_struct {
struct { struct {
struct ssh_list *identity; struct ssh_list *identity;
struct ssh_list *identity_non_exp; struct ssh_list *identity_non_exp;
struct ssh_iterator *identity_it;
struct ssh_list *certificate; struct ssh_list *certificate;
struct ssh_list *certificate_non_exp; struct ssh_list *certificate_non_exp;
struct ssh_list *proxy_jumps; struct ssh_list *proxy_jumps;

35
src/options.c
View File

@@ -1561,7 +1561,16 @@ int ssh_options_get_port(ssh_session session, unsigned int* port_target) {
* - SSH_OPTIONS_IDENTITY: * - SSH_OPTIONS_IDENTITY:
* Get the first identity file name (const char *).\n * Get the first identity file name (const char *).\n
* \n * \n
* By default id_rsa, id_ecdsa and id_ed25519 files are used. * By default `id_rsa`, `id_ecdsa`, `id_ed25519`, `id_ecdsa_sk`
* and `id_ed25519_sk` (when SK support is built in) files are
* used.
*
* - SSH_OPTIONS_NEXT_IDENTITY:
* Get the next identity file name (const char *).\n
* \n
* Repeat calls to get all key paths. SSH_EOF is returned when
* the end of list is reached. Another call will start another
* iteration over the same list.
* *
* - SSH_OPTIONS_PROXYCOMMAND: * - SSH_OPTIONS_PROXYCOMMAND:
* Get the proxycommand necessary to log into the * Get the proxycommand necessary to log into the
@@ -1657,6 +1666,30 @@ int ssh_options_get(ssh_session session, enum ssh_options_e type, char** value)
break; break;
} }
case SSH_OPTIONS_NEXT_IDENTITY: {
if (session->opts.identity_it != NULL) {
/* Move to the next item */
session->opts.identity_it = session->opts.identity_it->next;
if (session->opts.identity_it == NULL) {
*value = NULL;
return SSH_EOF;
}
} else {
/* Get iterator from opts */
struct ssh_iterator *it = NULL;
it = ssh_list_get_iterator(session->opts.identity);
if (it == NULL) {
it = ssh_list_get_iterator(session->opts.identity_non_exp);
}
if (it == NULL) {
return SSH_ERROR;
}
session->opts.identity_it = it;
}
src = ssh_iterator_value(char *, session->opts.identity_it);
break;
}
case SSH_OPTIONS_PROXYCOMMAND: case SSH_OPTIONS_PROXYCOMMAND:
src = session->opts.ProxyCommand; src = session->opts.ProxyCommand;
break; break;