Upload tarball, with ssh1 connections

This commit is contained in:
Denis Silakov 2016-11-27 16:07:03 +03:00
parent fcb0d6c05b
commit f589ab4c09
4 changed files with 58 additions and 2 deletions

View file

@ -1,5 +1,7 @@
sources: sources:
openssh-4.4p1-watchdog.patch.tgz: e4a13018c494faf7ed06fd74dad720a8a8ac9089 openssh-4.4p1-watchdog.patch.tgz: e4a13018c494faf7ed06fd74dad720a8a8ac9089
ssh-avahi-integration: eb610087f9edc8949d0aec1f769c2b900942c26c
openssh-7.2p2.tar.gz: 70e35d7d6386fe08abbd823b3a12a3ca44ac6d38 openssh-7.2p2.tar.gz: 70e35d7d6386fe08abbd823b3a12a3ca44ac6d38
openssh-7.2p2.tar.gz.asc: a3edbe10d257529d44568c38aff886db9ed27c87 openssh-7.2p2.tar.gz.asc: a3edbe10d257529d44568c38aff886db9ed27c87
openssh-7.3p1.tar.gz: bfade84283fcba885e2084343ab19a08c7d123a5
openssh-7.3p1.tar.gz.asc: 44475bea3bb66942c8991495d723d0bfc693a497
ssh-avahi-integration: eb610087f9edc8949d0aec1f769c2b900942c26c

14
openssh-7.2p2.tar.gz.asc Normal file
View file

@ -0,0 +1,14 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQGsBAABCgAGBQJW4HGiAAoJENPl9Wttkg0w8uUMfRnuvFkcQWBAHy+idRJoL/9W
aPis5PRMJW9ENNLUI2eiSNAhcIsAXKZXv3W2S/tuVrztwYv2+ckrlnaOg2GiMc9N
l66ZFpoZBNNPqImG88rgl28idkvGlYMwaKoE+YihPdB9BvPvHzZUEKdPtf/HsvI/
2vVTKYg2dbIb7M9h8RIXGvSW8UoGd+6pSbjnJaLHsxVsnBXk8ZYqUgq9PT+slS4d
/yp9OdZr99JcQqIFEpWs9WG93JxBbRBUif6OdymV3JAGJxfrpA0a0EPbiCNedxkY
TB+XZ53ydKx0s9Gv3k2wFfpT4VOIXvlrcPgYyTs7SVbigvT6TomNyK3TUfMQemN6
rTP4qt4b74cXne7zfcmr/Axmr3+xg1LybJn4L1IIH7TWAjj5dhPHJwqLRw3owaFB
Y8I+5ViCHGNCsBiil8oBOgdg09BITriL76Xs9WEY7+hC+FP/A286ggPDi+De3GPK
L7nB1FZgfo3gCGGJVVAH1i8P/ZZEedJHo/AXAYlNax7g6ZDkfmzt1KaVNhtoNvI=
=yfYj
-----END PGP SIGNATURE-----

38
openssh-7.3p1-ssh1.patch Normal file
View file

@ -0,0 +1,38 @@
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: 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)
--
cgit v0.12

View file

@ -24,7 +24,7 @@
Summary: OpenSSH free Secure Shell (SSH) implementation Summary: OpenSSH free Secure Shell (SSH) implementation
Name: openssh Name: openssh
Version: 7.3p1 Version: 7.3p1
Release: 1 Release: 2
License: BSD License: BSD
Group: Networking/Remote access Group: Networking/Remote access
Url: http://www.openssh.com/ Url: http://www.openssh.com/
@ -74,6 +74,8 @@ Patch22: openssh-7.3p1-entropy.patch
Patch23: openssh-7.3p1-expose-pam.patch Patch23: openssh-7.3p1-expose-pam.patch
Patch24: openssh-7.3p1-log-in-chroot.patch Patch24: openssh-7.3p1-log-in-chroot.patch
Patch25: openssh-7.3p1-show-more-fingerprints.patch Patch25: openssh-7.3p1-show-more-fingerprints.patch
# https://anongit.mindrot.org/openssh.git/patch/?id=e600348a7afd6325cc5cd783cb424065cbc20434
Patch26: openssh-7.3p1-ssh1.patch
BuildRequires: groff-base BuildRequires: groff-base
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: tcp_wrappers-devel BuildRequires: tcp_wrappers-devel