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
818 B
Diff
24 lines
818 B
Diff
From 103973215443f6e02e010114a3f7ac19eb6f3c8c Mon Sep 17 00:00:00 2001
|
|
From: Meng Tan <mtan@wallix.com>
|
|
Date: Thu, 25 Oct 2018 17:06:06 +0200
|
|
Subject: [PATCH 7/8] gssapi: Set correct state after sending GSSAPI_RESPONSE
|
|
(select mechanism OID)
|
|
|
|
Signed-off-by: Meng Tan <mtan@wallix.com>
|
|
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
|
|
(cherry picked from commit bce8d567053232debd6ec490af5a7d27e1160f39)
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
---
|
|
src/gssapi.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/src/gssapi.c
|
|
+++ b/src/gssapi.c
|
|
@@ -120,6 +120,7 @@ static int ssh_gssapi_send_response(ssh_
|
|
ssh_set_error_oom(session);
|
|
return SSH_ERROR;
|
|
}
|
|
+ session->auth_state = SSH_AUTH_STATE_GSSAPI_TOKEN;
|
|
|
|
packet_send(session);
|
|
SSH_LOG(SSH_LOG_PACKET,
|