lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-05-16 08:04:30 +03:00
Code

server: Split ssh_bind_accept and create ssh_handle_key_exchange.

Browse Source 
Signed-off-by: Andreas Schneider <asn@cynapses.org>
This commit is contained in:
milo 2010-08-10 00:14:03 +02:00 committed by Andreas Schneider
parent 136f4d3b0d
commit 855b73de87
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/samplesshd.c
View File

@ -205,6 +205,10 @@ int main(int argc, char **argv){
printf("error accepting a connection : %s\n",ssh_get_error(sshbind)); printf("error accepting a connection : %s\n",ssh_get_error(sshbind));
return 1; return 1;
} }
if (ssh_bind_accept(session)) {
printf("ssh_bind_accept: %s\n", ssh_get_error(session));
return 1;
}
do { do {
message=ssh_message_get(session); message=ssh_message_get(session);
if(!message) if(!message)

11
include/libssh/server.h
View File

@ -120,10 +120,19 @@ LIBSSH_API void ssh_bind_fd_toaccept(ssh_bind ssh_bind_o);
* @param ssh_bind_o The ssh server bind to accept a connection. * @param ssh_bind_o The ssh server bind to accept a connection.
* @param session A preallocated ssh session * @param session A preallocated ssh session
* @see ssh_new * @see ssh_new
* @return A newly allocated ssh session, NULL on error. * @return SSH_OK when a connection is established
*/ */
LIBSSH_API int ssh_bind_accept(ssh_bind ssh_bind_o, ssh_session session); LIBSSH_API int ssh_bind_accept(ssh_bind ssh_bind_o, ssh_session session);
/**
* @brief Handles the key exchange and set up encryption
*
* @param session A connected ssh session
* @see ssh_bind_accept
* @return SSH_OK if the key exchange was successful
*/
LIBSSH_API int ssh_handle_key_exchange(ssh_session session);
/** /**
* @brief Free a ssh servers bind. * @brief Free a ssh servers bind.
* *

4
libssh/legacy.c
View File

@ -233,7 +233,5 @@ char *string_to_char(ssh_string str){
} }
int ssh_accept(ssh_session session) { int ssh_accept(ssh_session session) {
(void) session; return ssh_handle_key_exchange(session);
return SSH_OK;
} }

9
libssh/server.c
View File

@ -666,7 +666,7 @@ int ssh_bind_accept(ssh_bind sshbind, ssh_session session) {
ssh_private_key dsa = NULL; ssh_private_key dsa = NULL;
ssh_private_key rsa = NULL; ssh_private_key rsa = NULL;
socket_t fd = SSH_INVALID_SOCKET; socket_t fd = SSH_INVALID_SOCKET;
int i, rc; int i;
if (sshbind->bindfd == SSH_INVALID_SOCKET) { if (sshbind->bindfd == SSH_INVALID_SOCKET) {
ssh_set_error(sshbind, SSH_FATAL, ssh_set_error(sshbind, SSH_FATAL,
@ -747,6 +747,13 @@ int ssh_bind_accept(ssh_bind sshbind, ssh_session session) {
session->dsa_key = dsa; session->dsa_key = dsa;
session->rsa_key = rsa; session->rsa_key = rsa;
return SSH_OK;
}
/* Do the banner and key exchange */
int ssh_handle_key_exchange(ssh_session session) {
int rc;
rc = ssh_send_banner(session, 1); rc = ssh_send_banner(session, 1);
if (rc < 0) { if (rc < 0) {
return SSH_ERROR; return SSH_ERROR;