Dag-Erling Smørgrav
190cef3d52
Upgrade to OpenSSH 7.8p1.
...
Approved by: re (kib@)
2018-09-10 16:20:12 +00:00
Dag-Erling Smørgrav
47dd1d1b61
Upgrade to OpenSSH 7.7p1.
2018-05-11 13:22:43 +00:00
Dag-Erling Smørgrav
4f52dfbb8d
Upgrade to OpenSSH 7.6p1. This will be followed shortly by 7.7p1.
...
This completely removes client-side support for the SSH 1 protocol,
which was already disabled in 12 but is still enabled in 11. For that
reason, we will not be able to merge 7.6p1 or newer back to 11.
2018-05-08 23:13:11 +00:00
Dag-Erling Smørgrav
d93a896ef9
Upgrade to OpenSSH 7.5p1.
2017-08-04 12:57:24 +00:00
Dag-Erling Smørgrav
ca86bcf253
Upgrade to OpenSSH 7.4p1.
2017-03-06 01:37:05 +00:00
Dag-Erling Smørgrav
076ad2f836
Upgrade to OpenSSH 7.3p1.
2017-03-02 00:11:32 +00:00
Xin LI
9ea45e75fa
MFV r311913:
...
Fix multiple OpenSSH vulnerabilities.
Submitted by: des
Approved by: so
2017-01-11 05:49:39 +00:00
Dag-Erling Smørgrav
acc1a9ef83
Upgrade to OpenSSH 7.2p2.
2016-03-11 00:15:29 +00:00
Dag-Erling Smørgrav
eccfee6ebc
Upgrade to OpenSSH 7.0p1.
2016-01-20 22:57:10 +00:00
Dag-Erling Smørgrav
557f75e54a
Upgrade to OpenSSH 6.9p1.
2016-01-19 18:55:44 +00:00
Dag-Erling Smørgrav
bc5531debe
Upgrade to OpenSSH 6.8p1.
2016-01-19 18:28:23 +00:00
Dag-Erling Smørgrav
a0ee8cc636
Upgrade to OpenSSH 6.7p1, retaining libwrap support (which has been removed
...
upstream) and a number of security fixes which we had already backported.
MFC after: 1 week
2016-01-19 16:18:26 +00:00
Dag-Erling Smørgrav
5bec830e40
Remove /* $FreeBSD$ */ from files that already have __RCSID("$FreeBSD$").
2015-11-11 13:26:47 +00:00
Dag-Erling Smørgrav
b83788ff87
Upgrade to OpenSSH 6.6p1.
2014-03-25 11:05:34 +00:00
Dag-Erling Smørgrav
cf783db152
Add a pre-merge script which reverts mechanical changes such as added
...
$FreeBSD$ tags and man page dates.
Add a post-merge script which reapplies these changes.
Run both scripts to normalize the existing code base. As a result, many
files which should have had $FreeBSD$ tags but didn't now have them.
Partly rewrite the upgrade instructions and remove the now outdated
list of tricks.
2014-03-24 19:15:13 +00:00
Dag-Erling Smørgrav
f7167e0ea0
Upgrade to OpenSSH 6.5p1.
2014-01-31 13:12:02 +00:00
Dag-Erling Smørgrav
e4a9863fb7
Upgrade to 6.3p1.
...
Approved by: re (gjb)
2013-09-21 21:36:09 +00:00
Dag-Erling Smørgrav
fceeafce68
Add a -x option that causes ssh-agent(1) to exit when all clients have
...
disconnected.
MFC after: 1 week
2011-10-07 13:10:16 +00:00
Dag-Erling Smørgrav
e146993e33
Upgrade to OpenSSH 5.9p1.
...
MFC after: 3 months
2011-10-05 22:08:17 +00:00
Dag-Erling Smørgrav
4a421b6336
Upgrade to OpenSSH 5.8p2.
2011-05-04 07:34:44 +00:00
Dag-Erling Smørgrav
e2f6069c09
Upgrade to OpenSSH 5.6p1.
2010-11-11 11:46:19 +00:00
Dag-Erling Smørgrav
b15c83408c
Upgrade to OpenSSH 5.4p1.
...
MFC after: 1 month
2010-03-09 19:16:43 +00:00
Dag-Erling Smørgrav
7aee6ffee0
Upgrade to OpenSSH 5.3p1.
2009-10-01 17:12:52 +00:00
Dag-Erling Smørgrav
d4af9e693f
Upgrade to OpenSSH 5.1p1.
...
I have worked hard to reduce diffs against the vendor branch. One
notable change in that respect is that we no longer prefer DSA over
RSA - the reasons for doing so went away years ago. This may cause
some surprises, as ssh will warn about unknown host keys even for
hosts whose keys haven't changed.
MFC after: 6 weeks
2008-08-01 02:48:36 +00:00
Dag-Erling Smørgrav
e3ae3b098d
Properly flatten openssh/dist.
2008-07-22 19:01:18 +00:00
Dag-Erling Smørgrav
62efe23a82
Resolve conflicts.
2006-11-10 16:52:41 +00:00
Dag-Erling Smørgrav
92eb0aa103
Vendor import of OpenSSH 4.5p1.
2006-11-10 16:39:21 +00:00
Dag-Erling Smørgrav
333ee03933
Merge conflicts.
...
MFC after: 1 week
2006-09-30 13:38:06 +00:00
Dag-Erling Smørgrav
761efaa70c
Vendor import of OpenSSH 4.4p1.
2006-09-30 13:29:51 +00:00
Dag-Erling Smørgrav
b74df5b26f
Merge conflicts.
2006-03-22 20:41:37 +00:00
Dag-Erling Smørgrav
021d409f5b
Vendor import of OpenSSH 4.3p1.
2006-03-22 19:46:12 +00:00
Dag-Erling Smørgrav
aa49c9264c
Resolve conflicts.
2005-06-05 15:46:09 +00:00
Dag-Erling Smørgrav
5e8dbd04ef
Vendor import of OpenSSH 4.0p1.
2005-06-05 15:40:50 +00:00
Dag-Erling Smørgrav
21e764df0c
Resolve conflicts
2004-10-28 16:11:31 +00:00
Dag-Erling Smørgrav
d74d50a84b
Vendor import of OpenSSH 3.9p1.
2004-10-28 16:03:53 +00:00
Dag-Erling Smørgrav
5962c0e9a3
Resolve conflicts.
2004-04-20 09:46:41 +00:00
Dag-Erling Smørgrav
52028650db
Vendor import of OpenSSH 3.8.1p1.
2004-04-20 09:35:04 +00:00
Dag-Erling Smørgrav
1ec0d75429
Resolve conflicts.
2004-02-26 10:52:33 +00:00
Dag-Erling Smørgrav
efcad6b72f
Vendor import of OpenSSH 3.8p1.
2004-02-26 10:38:49 +00:00
Dag-Erling Smørgrav
cf2b5f3b6d
Resolve conflicts and remove obsolete files.
...
Sponsored by: registrar.no
2004-01-07 11:16:27 +00:00
Dag-Erling Smørgrav
d95e11bf7e
Vendor import of OpenSSH 3.7.1p2.
2004-01-07 11:10:17 +00:00
Jacques Vidrine
b69cd7f2b0
Correct more cases of allocation size bookkeeping being updated before
...
calling functions which can potentially fail and cause cleanups to be
invoked.
Submitted by: Solar Designer <solar@openwall.com>
2003-09-17 14:36:14 +00:00
Dag-Erling Smørgrav
e73e9afa91
Resolve conflicts.
2003-04-23 17:13:13 +00:00
Dag-Erling Smørgrav
d0c8c0bcc2
Vendor import of OpenSSH-portable 3.6.1p1.
2003-04-23 16:53:02 +00:00
Dag-Erling Smørgrav
1e731869b2
Set the ruid to the euid at startup as a workaround for a bug in pam_ssh.
...
MFC after: 3 days
2003-02-07 15:48:27 +00:00
Dag-Erling Smørgrav
f388f5ef26
Resolve conflicts.
2002-10-29 10:16:02 +00:00
Dag-Erling Smørgrav
4b17dab0ba
Vendor import of OpenSSH-portable 3.5p1.
2002-10-29 09:43:00 +00:00
Dag-Erling Smørgrav
a82e551f0f
Resolve conflicts.
...
Sponsored by: DARPA, NAI Labs
2002-06-29 11:48:59 +00:00
Dag-Erling Smørgrav
ee21a45f81
Vendor import of OpenSSH 3.4p1.
2002-06-29 11:34:13 +00:00
Dag-Erling Smørgrav
989dd127e4
Forcibly revert to mainline.
2002-06-27 22:42:11 +00:00