openssh: update to 7.4p1
This commit is contained in:
@@ -1,38 +0,0 @@
|
||||
From e600348a7afd6325cc5cd783cb424065cbc20434 Mon Sep 17 00:00:00 2001
|
||||
From: "dtucker@openbsd.org" <dtucker@openbsd.org>
|
||||
Date: Wed, 3 Aug 2016 04:23:55 +0000
|
||||
Subject: [PATCH] upstream commit
|
||||
|
||||
Fix bug introduced in rev 1.467 which causes
|
||||
"buffer_get_bignum_ret: incomplete message" errors when built with WITH_SSH1
|
||||
and run such that no Protocol 1 ephemeral host key is generated (eg "Protocol
|
||||
2", no SSH1 host key supplied). Reported by rainer.laatsch at t-online.de,
|
||||
ok deraadt@
|
||||
|
||||
Upstream-ID: aa6b132da5c325523aed7989cc5a320497c919dc
|
||||
---
|
||||
sshd.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sshd.c b/sshd.c
|
||||
index 799c771..9fc829a 100644
|
||||
--- a/sshd.c
|
||||
+++ b/sshd.c
|
||||
@@ -1,4 +1,4 @@
|
||||
-/* $OpenBSD: sshd.c,v 1.470 2016/05/24 04:43:45 dtucker Exp $ */
|
||||
+/* $OpenBSD: sshd.c,v 1.471 2016/08/03 04:23:55 dtucker Exp $ */
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||
@@ -1071,7 +1071,7 @@ send_rexec_state(int fd, struct sshbuf *conf)
|
||||
fatal("%s: buffer error: %s", __func__, ssh_err(r));
|
||||
} else
|
||||
#endif
|
||||
- if ((r = sshbuf_put_u32(m, 1)) != 0)
|
||||
+ if ((r = sshbuf_put_u32(m, 0)) != 0)
|
||||
fatal("%s: buffer error: %s", __func__, ssh_err(r));
|
||||
|
||||
#if defined(WITH_OPENSSL) && !defined(OPENSSL_PRNG_ONLY)
|
||||
--
|
||||
2.8.3
|
||||
|
||||
Reference in New Issue
Block a user