summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/ssh.c
Commit message (Collapse)AuthorAgeFilesLines
* MFH (r296633): upgrade to 7.2p2 (fixes xauth command injection bug)des2016-03-121-42/+106
| | | | | | | | MFH (r296634): re-add aes-cbc to server-side default cipher list MFH (r296651, r296657): fix gcc build of pam_ssh PR: 207679 Security: CVE-2016-3115
* MFH (r265214, r294333, r294407, r294467): misc prop fixesdes2016-02-071-107/+296
| | | | | | | | | | | | | | | | MFH (r285975, r287143): register mergeinfo for security fixes MFH (r294497, r294498, r295139): internal documentation MFH (r294328): upgrade to openssh 6.7p1, re-add libwrap MFH (r294332): upgrade to openssh 6.8p1 MFH (r294367): update pam_ssh for api changes MFH (r294909): switch usedns back on MFH (r294336): upgrade to openssh 6.9p1 MFH (r294495): re-enable dsa keys MFH (r294464): upgrade to openssh 7.0p1 MFH (r294496): upgrade to openssh 7.1p2 Approved by: re (gjb) Relnotes: yes
* MFH (r291198, r291260, r291261, r291375, r294325, r294335, r294563)des2016-01-241-55/+3
| | | | Remove the HPN and None cipher patches.
* MFH (r263234, r263691, r266465, r290671, r290672, r290673, r290674,des2016-01-241-1/+0
| | | | | | r294320, r294322, r294324, r294330, r294469, r294494, r294466) Reduce diffs to head in preparation for removing HPN and None.
* MFC r285642vangyzen2015-07-211-0/+17
| | | | | | | | | | | | | | | | ssh: canonicize the host name before looking it up in the host file Re-apply r99054 by des in 2002. This was accidentally dropped by the update to OpenSSH 6.5p1 (r261320). This change is actually taken from r387082 of ports/security/openssh-portable/files/patch-ssh.c Differential Revision: https://reviews.freebsd.org/D3103 PR: 198043 Approved by: re (gjb), kib (mentor) Sponsored by: Dell Inc. Relnotes: yes
* MFH (r263712): upgrade openssh to 6.6p1des2014-04-121-62/+118
| | | | MFH (r264308): restore p level in debugging output
* MFH (r261320): upgrade openssh to 6.5p1des2014-02-271-89/+229
| | | | MFH (r261340): enable sandboxing by default
* Upgrade to 6.3p1.des2013-09-211-32/+65
|\ | | | | | | Approved by: re (gjb)
* | Merge updated "no such identity file" patch.des2013-04-241-5/+8
| | | | | | | | PR: bin/178060
* | Merge upstream patch to silence spurious "no such identity file" warnings.des2013-04-021-7/+2
| |
* | Upgrade OpenSSH to 6.1p1.des2012-09-031-65/+91
| |
* | OpenSSH: allow VersionAddendum to be used againrea2012-05-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this, setting VersionAddendum will be a no-op: one will always have BASE_VERSION + " " + VERSION_HPN for VersionAddendum set in the config and a bare BASE_VERSION + VERSION_HPN when there is no VersionAddendum is set. HPN patch requires both parties to have the "hpn" inside their advertized versions, so we add VERSION_HPN to the VERSION_BASE if HPN is enabled and omitting it if HPN is disabled. VersionAddendum now uses the following logics: * unset (default value): append " " and VERSION_ADDENDUM; * VersionAddendum is set and isn't empty: append " " and VersionAddendum; * VersionAddendum is set and empty: don't append anything. Approved by: des Reviewed by: bz MFC after: 3 days
* | Polish diff against upstream.ed2012-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | - Revert unneeded whitespace changes. - Revert modifications to loginrec.c, as the upstream version already does the right thing. - Fix indentation and whitespace of local changes. Approved by: des MFC after: 1 month
* | Upgrade to OpenSSH 5.9p1.des2011-10-051-47/+78
|\ \ | |/ | | | | MFC after: 3 months
* | Add support for dynamically adjusted buffers to allow the full use ofbrooks2011-08-031-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the bandwidth of long fat pipes (i.e. 100Mbps+ trans-oceanic or trans-continental links). Bandwidth-delay products up to 64MB are supported. Also add support (not compiled by default) for the None cypher. The None cypher can only be enabled on non-interactive sessions (those without a pty where -T was not used) and must be enabled in both the client and server configuration files and on the client command line. Additionally, the None cypher will only be activated after authentication is complete. To enable the None cypher you must add -DNONE_CIPHER_ENABLED to CFLAGS via the make command line or in /etc/make.conf. This code is a style(9) compliant version of these features extracted from the patches published at: http://www.psc.edu/networking/projects/hpn-ssh/ Merging this patch has been a collaboration between me and Bjoern. Reviewed by: bz Approved by: re (kib), des (maintainer)
* | Upgrade to OpenSSH 5.8p2.des2011-05-041-27/+66
|\ \ | |/
* | Upgrade to OpenSSH 5.6p1.des2010-11-111-39/+160
|\ \ | |/
* | Upgrade to OpenSSH 5.4p1.des2010-03-091-32/+142
|\ \ | |/ | | | | MFC after: 1 month
* | Upgrade to OpenSSH 5.3p1.des2009-10-011-9/+12
|\ \ | |/
* | Upgrade to OpenSSH 5.2p1.des2009-05-221-31/+27
|\ \ | |/ | | | | MFC after: 3 months
* | Upgrade to OpenSSH 5.1p1.des2008-08-011-385/+189
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * Properly flatten openssh/dist.des2008-07-221-1484/+0
| |
| * Revert part of 180714 - the intent was to flatten dist, not to nuke it.des2008-07-221-0/+1484
| |
| * Flatten the OpenSSH vendor tree for 3.x and newer.des2008-07-221-1484/+0
| |
| * Vendor import of OpenSSH 4.5p1.des2006-11-101-1/+1
| |
| * Vendor import of OpenSSH 4.4p1.des2006-09-301-44/+101
| |
| * Vendor import of OpenSSH 4.3p1.des2006-03-221-23/+66
| |
| * Vendor import of OpenSSH 4.2p1.des2005-09-031-140/+92
| |
| * Vendor import of OpenSSH 4.1p1.des2005-06-051-5/+7
| |
| * Vendor import of OpenSSH 4.0p1.des2005-06-051-63/+133
| |
| * Vendor import of OpenSSH 3.9p1.des2004-10-281-72/+243
| |
| * Vendor import of OpenSSH 3.8.1p1.des2004-04-201-51/+10
| |
| * Vendor import of OpenSSH 3.8p1.des2004-02-261-34/+77
| |
| * Vendor import of OpenSSH 3.7.1p2.des2004-01-071-54/+36
| |
| * Vendor import of OpenSSH-portable 3.6.1p1.des2003-04-231-8/+11
| |
| * Vendor import of OpenSSH-portable 3.5p1.des2002-10-291-21/+39
| |
| * Vendor import of OpenSSH 3.3p1.des2002-06-271-0/+24
| |
| * Vendor import of OpenSSH 3.3.des2002-06-231-136/+80
| |
| * Vendor import of OpenSSH 3.1des2002-03-181-169/+272
| |
| * Say "hi" to the latest in the OpenSSH series, version 2.9!green2001-05-041-212/+311
| | | | | | | | Happy birthday to: rwatson
| * Import of OpenSSH 2.3.0 (virgin OpenBSD source release).green2000-12-051-22/+24
| |
| * Initial import of OpenSSH post-2.2.0 snapshot dated 2000-09-09kris2000-09-101-33/+71
| |
| * Import vendor patches: the first is written bykris2000-06-031-2/+7
| | | | | | | | | | | | | | | | | | | | Brian Feldman <green@FreeBSD.org> * Remove the gratuitous dependency on OpenSSL 0.9.5a (preparation for MFC) * Disable agent forwarding by default in the client (security risk) Submitted by: green Obtained from: OpenBSD
| * Initial import of OpenSSH v2.1.kris2000-05-151-101/+267
| |
| * Virgin import of OpenSSH sources dated 2000/03/25kris2000-03-261-7/+7
| |
* | Resolve conflicts.des2006-11-101-1/+1
| |
* | Merge conflicts.des2006-09-301-45/+102
| | | | | | | | MFC after: 1 week
* | Merge conflicts.des2006-03-221-23/+66
| |
* | Resolve conflicts.des2005-09-031-140/+92
| |
* | Resolve conflicts.des2005-06-051-64/+136
| |
OpenPOWER on IntegriCloud