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>
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 3fe7510b261098e3937ab5417935916a46e6727b Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schneider <asn@cryptomilk.org>
|
|
Date: Fri, 19 Oct 2018 11:40:44 +0200
|
|
Subject: [PATCH 4/8] messages: Check that the requested service is
|
|
'ssh-connection'
|
|
|
|
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
|
|
(cherry picked from commit 9c200d3ef4f62d724d3bae2563b81c38cc31e215)
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
---
|
|
src/messages.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
--- a/src/messages.c
|
|
+++ b/src/messages.c
|
|
@@ -649,6 +649,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_
|
|
ssh_message msg = NULL;
|
|
char *service = NULL;
|
|
char *method = NULL;
|
|
+ int cmp;
|
|
int rc;
|
|
|
|
(void)user;
|
|
@@ -675,6 +676,13 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_
|
|
service, method,
|
|
msg->auth_request.username);
|
|
|
|
+ cmp = strcmp(service, "ssh-connection");
|
|
+ if (cmp != 0) {
|
|
+ SSH_LOG(SSH_LOG_WARNING,
|
|
+ "Invalid service request: %s",
|
|
+ service);
|
|
+ goto end;
|
|
+ }
|
|
|
|
if (strcmp(method, "none") == 0) {
|
|
msg->auth_request.method = SSH_AUTH_METHOD_NONE;
|