From 72fdb4867eb1c9027ac9ebf055b578e48c34d5c8 Mon Sep 17 00:00:00 2001 From: Yanis Kurganov Date: Tue, 11 Apr 2017 09:49:55 +0200 Subject: session: Add SSH1 support in ssh_send_ignore() Signed-off-by: Yanis Kurganov Reviewed-by: Andreas Schneider --- src/session.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/session.c b/src/session.c index 31bb2a79..1ef8717a 100644 --- a/src/session.c +++ b/src/session.c @@ -31,6 +31,9 @@ #include "libssh/crypto.h" #include "libssh/server.h" #include "libssh/socket.h" +#ifdef WITH_SSH1 +#include "libssh/ssh1.h" +#endif /* WITH_SSH1 */ #include "libssh/ssh2.h" #include "libssh/agent.h" #include "libssh/packet.h" @@ -830,13 +833,17 @@ void ssh_socket_exception_callback(int code, int errno_code, void *user){ * @return SSH_OK on success, SSH_ERROR otherwise. */ int ssh_send_ignore (ssh_session session, const char *data) { +#ifdef WITH_SSH1 + const int type = session->version == 1 ? SSH_MSG_IGNORE : SSH2_MSG_IGNORE; +#else /* WITH_SSH1 */ + const int type = SSH2_MSG_IGNORE; +#endif /* WITH_SSH1 */ int rc; if (ssh_socket_is_open(session->socket)) { - rc = ssh_buffer_pack(session->out_buffer, "bs", - SSH2_MSG_IGNORE, + type, data); if (rc != SSH_OK){ ssh_set_error_oom(session); -- cgit v1.2.3