72096874d0
Bump from 0.7.5 to 0.7.6. Upstream changelog: Fixed CVE-2018-10933 Added support for OpenSSL 1.1 Added SHA256 support for ssh_get_publickey_hash() Fixed config parsing Fixed random memory corruption when importing pubkeys Backported upstream patches since 0.7.6 to fix interactive authentication issues amongst other things: 9d5cf209 libcrypto: Fix memory leak in evp_final() 10397321 gssapi: Set correct state after sending GSSAPI_RESPONSE (select mechanism OID) 7ad80ba1 server: Fix compile error acb0e4f4 examples: Explicitly track auth state in samplesshd-kbdint 3fe7510b messages: Check that the requested service is 'ssh-connection' 734e3ce6 server: Set correct state after sending INFO_REQUEST (Kbd Interactive) e4c6d591 packet: Add missing break in ssh_packet_incoming_filter() f81ca616 misc: Add strndup implementation if not provides by the OS Refresh patches. Remove local backport for OpenSSL 1.1 support as is now in release Remove PKG_INSTALL & CMAKE vars that are defaulted anyway Add PKG_CPE_ID:=cpe:/a:libssh:libssh for CVE tracking Remove BROKEN tag as is no longer broken Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
24 lines
783 B
Diff
24 lines
783 B
Diff
From 734e3ce6747a5ed120b93a1ff253b3fde5f20024 Mon Sep 17 00:00:00 2001
|
|
From: Meng Tan <mtan@wallix.com>
|
|
Date: Wed, 17 Oct 2018 14:50:08 +0200
|
|
Subject: [PATCH 3/8] server: Set correct state after sending INFO_REQUEST (Kbd
|
|
Interactive)
|
|
|
|
Signed-off-by: Meng Tan <mtan@wallix.com>
|
|
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
|
|
(cherry picked from commit 4ea46eecce9f4e676150fe27fec34e1570b70ace)
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
---
|
|
src/server.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/src/server.c
|
|
+++ b/src/server.c
|
|
@@ -976,6 +976,7 @@ int ssh_message_auth_interactive_request
|
|
msg->session->kbdint->prompts = NULL;
|
|
msg->session->kbdint->echo = NULL;
|
|
}
|
|
+ msg->session->auth.state = SSH_AUTH_STATE_INFO;
|
|
|
|
return rc;
|
|
}
|