From d3e081ba44bad2af176f4dbc17e2402e70bdc462 Mon Sep 17 00:00:00 2001 From: Alan Dunn Date: Tue, 21 Jan 2014 08:19:31 -0600 Subject: [PATCH] Import keys during ssh_bind_accept_fd Signed-off-by: Alan Dunn Reviewed-by: Andreas Schneider --- src/bind.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/bind.c b/src/bind.c index e06cb7e3..5234e5b4 100644 --- a/src/bind.c +++ b/src/bind.c @@ -382,7 +382,7 @@ void ssh_bind_free(ssh_bind sshbind){ } int ssh_bind_accept_fd(ssh_bind sshbind, ssh_session session, socket_t fd){ - int i; + int i, rc; if (session == NULL){ ssh_set_error(sshbind, SSH_FATAL,"session is null"); @@ -424,6 +424,16 @@ int ssh_bind_accept_fd(ssh_bind sshbind, ssh_session session, socket_t fd){ ssh_socket_set_fd(session->socket, fd); ssh_socket_get_poll_handle_out(session->socket); + /* We must try to import any keys that could be imported in case + * we are not using ssh_bind_listen (which is the other place + * where keys can be imported) on this ssh_bind and are instead + * only using ssh_bind_accept_fd to manage sockets ourselves. + */ + rc = ssh_bind_import_keys(sshbind); + if (rc != SSH_OK) { + return SSH_ERROR; + } + #ifdef HAVE_ECC if (sshbind->ecdsa) { session->srv.ecdsa_key = ssh_key_dup(sshbind->ecdsa);