aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYanis Kurganov <ykurganov@ptsecurity.com>2017-04-11 09:49:55 +0200
committerAndreas Schneider <asn@cryptomilk.org>2017-04-11 17:40:30 +0200
commit72fdb4867eb1c9027ac9ebf055b578e48c34d5c8 (patch)
tree47bcfd28e76d896bb9bab974c1f07afdc079650f /src
parent9dc650b7fbaef422e2a148322563106f3fbacb7a (diff)
downloadlibssh-72fdb4867eb1c9027ac9ebf055b578e48c34d5c8.tar.gz
libssh-72fdb4867eb1c9027ac9ebf055b578e48c34d5c8.tar.xz
libssh-72fdb4867eb1c9027ac9ebf055b578e48c34d5c8.zip
session: Add SSH1 support in ssh_send_ignore()
Signed-off-by: Yanis Kurganov <ykurganov@ptsecurity.com> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'src')
-rw-r--r--src/session.c11
1 files 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);