aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Vendor import of OpenSSH 8.0p1.vendor/openssh/8.0p1Ed Maste2020-02-14178-9903/+11288
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=357933 svn path=/vendor-crypto/openssh/8.0p1/; revision=357934; tag=vendor/openssh/8.0p1
* Apply commit 3d896c15 from openssh-portable:Ed Maste2019-03-271-12/+270
| | | | | | | | | | | | | | | | | upstream: when checking that filenames sent by the server side match what the client requested, be prepared to handle shell-style brace alternations, e.g. "{foo,bar}". "looks good to me" millert@ + in snaps for the last week courtesy deraadt@ OpenBSD-Commit-ID: 3b1ce7639b0b25b2248e3a30f561a548f6815f3e Discussed with: des Notes: svn path=/vendor-crypto/openssh/dist/; revision=345574
* Re-apply scp filename matching fix.Dag-Erling Smørgrav2019-02-052-11/+42
| | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=343776
* Vendor import of OpenSSH 7.9p1.vendor/openssh/7.9p1Dag-Erling Smørgrav2019-02-0587-1912/+4695
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=343774 svn path=/vendor-crypto/openssh/7.9p1/; revision=343775; tag=vendor/openssh/7.9p1
* Merge upstream 2c21b75a7be6ebdcbceaebb43157c48dbb36f3d8:Dag-Erling Smørgrav2019-02-051-2/+2
| | | | | | | | | | scp: add -T to usage(); | | OpenBSD-Commit-ID: a7ae14d9436c64e1bd05022329187ea3a0ce1899 Notes: svn path=/vendor-crypto/openssh/dist/; revision=343767
* Merge upstream 391ffc4b9d31fa1f4ad566499fef9176ff8a07dc:Dag-Erling Smørgrav2019-02-052-10/+41
| | | | | | | | | | | | | | | | | | | | remote->local directory copies satisfy the wildcard specified by the user. | | This checking provides some protection against a malicious server | sending unexpected filenames, but it comes at a risk of rejecting wanted | files due to differences between client and server wildcard expansion rules. | | For this reason, this also adds a new -T flag to disable the check. | | reported by Harry Sintonen | fix approach suggested by markus@; | has been in snaps for ~1wk courtesy deraadt@ | | OpenBSD-Commit-ID: 00f44b50d2be8e321973f3c6d014260f8f7a8eda Notes: svn path=/vendor-crypto/openssh/dist/; revision=343766
* openssh: cherry-pick OpenSSL 1.1.1 compatibilityEd Maste2018-10-0331-526/+1646
| | | | | | | | | | | | | | | | Upstream commits: 482d23bcac upstream: hold our collective noses and use the openssl-1.1.x 48f54b9d12 adapt -portable to OpenSSL 1.1x API 86e0a9f3d2 upstream: use only openssl-1.1.x API here too a3fd8074e2 upstream: missed a bit of openssl-1.0.x API in this unittest cce8cbe0ed Fix openssl-1.1 fallout for --without-openssl. Trivial conflicts in sshkey.c and test_sshkey.c were resolved. Discussed with: des Notes: svn path=/vendor-crypto/openssh/dist/; revision=339155
* Vendor import of OpenSSH 7.8p1.vendor/openssh/7.8p1Dag-Erling Smørgrav2018-08-28202-7299/+8272
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=338344 svn path=/vendor-crypto/openssh/7.8p1/; revision=338345; tag=vendor/openssh/7.8p1
* Import upstream commit cfb1d9b, which fixes tunnel forwarding.Dag-Erling Smørgrav2018-05-161-2/+2
| | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=333676
* Vendor import of OpenSSH 7.7p1.vendor/openssh/7.7p1Dag-Erling Smørgrav2018-05-06233-7908/+14907
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=333298 svn path=/vendor-crypto/openssh/7.7p1/; revision=333299; tag=vendor/openssh/7.7p1
* Vendor import of OpenSSH 7.6p1.vendor/openssh/7.6p1Dag-Erling Smørgrav2018-05-06238-14612/+10526
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=333296 svn path=/vendor-crypto/openssh/7.6p1/; revision=333297; tag=vendor/openssh/7.6p1
* Vendor import of OpenSSH 7.5p1.vendor/openssh/7.5p1Dag-Erling Smørgrav2017-08-0372-2616/+2471
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=321987 svn path=/vendor-crypto/openssh/7.5p1/; revision=321988; tag=vendor/openssh/7.5p1
* Vendor import of OpenSSH 7.4p1.vendor/openssh/7.4p1Dag-Erling Smørgrav2017-01-31200-31743/+13229
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=313012 svn path=/vendor-crypto/openssh/7.4p1/; revision=313013; tag=vendor/openssh/7.4p1
* Vendor import of OpenSSH 7.3p1.vendor/openssh/7.3p1Dag-Erling Smørgrav2017-01-31168-3279/+6364
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=313010 svn path=/vendor-crypto/openssh/7.3p1/; revision=313011; tag=vendor/openssh/7.3p1
* Apply upstream fix for CVE-2016-10009 and CVE-2016-10010:Xin LI2017-01-113-10/+50
| | | | | | | | | | | | | | | add a whitelist of paths from which ssh-agent will load (via ssh-pkcs11-helper) a PKCS#11 module; ok markus@ disable Unix-domain socket forwarding when privsep is disabled (Note that this is a backport of upstream fixes, and this commit is mainly to ease future imports). Obtained from: OpenBSD Notes: svn path=/vendor-crypto/openssh/dist/; revision=311913
* Apply upstream fix for CVE-2016-8858:Xin LI2016-11-021-0/+1
| | | | | | | | | | | | Unregister the KEXINIT handler after message has been received. Otherwise an unauthenticated peer can repeat the KEXINIT and cause allocation of up to 128MB -- until the connection is closed. Reported by shilei-c at 360.cn Obtained from: OpenBSD Notes: svn path=/vendor-crypto/openssh/dist/; revision=308196
* Vendor import of OpenSSH 7.2p2.vendor/openssh/7.2p2Dag-Erling Smørgrav2016-03-106-22/+48
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=296621 svn path=/vendor-crypto/openssh/7.2p2/; revision=296622; tag=vendor/openssh/7.2p2
* Vendor import of OpenSSH 7.2p1.vendor/openssh/7.2p1Dag-Erling Smørgrav2016-03-10154-3654/+6545
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=296619 svn path=/vendor-crypto/openssh/7.2p1/; revision=296620; tag=vendor/openssh/7.2p1
* Vendor import of OpenSSH 7.1p2.vendor/openssh/7.1p2Dag-Erling Smørgrav2016-01-1914-1634/+119
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=294315 svn path=/vendor-crypto/openssh/7.1p2/; revision=294316; tag=vendor/openssh/7.1p2
* Vendor import of OpenSSH 7.1p1.vendor/openssh/7.1p1Dag-Erling Smørgrav2015-08-2624-185/+191
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=287158 svn path=/vendor-crypto/openssh/7.1p1/; revision=287159; tag=vendor/openssh/7.1p1
* Vendor import of OpenSSH 7.0p1vendor/openssh/7.0p1Dag-Erling Smørgrav2015-08-26158-1646/+2436
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=287156 svn path=/vendor-crypto/openssh/7.0p1/; revision=287157; tag=vendor/openssh/7.0p1
* Vendor import of OpenSSH 6.9p1.vendor/openssh/6.9p1Dag-Erling Smørgrav2015-07-02115-2541/+4127
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=285033 svn path=/vendor-crypto/openssh/6.9p1/; revision=285034; tag=vendor/openssh/6.9p1
* Vendor import of OpenSSH 6.8p1.vendor/openssh/6.8p1Dag-Erling Smørgrav2015-07-02328-19755/+52319
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=285031 svn path=/vendor-crypto/openssh/6.8p1/; revision=285032; tag=vendor/openssh/6.8p1
* Vendor import of OpenSSH 6.7p1.vendor/openssh/6.7p1Dag-Erling Smørgrav2015-01-05283-7127/+17296
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=276707 svn path=/vendor-crypto/openssh/6.7p1/; revision=276708; tag=vendor/openssh/6.7p1
* Apply upstream patch for EC calculation bug that breaks EC key exchangeDag-Erling Smørgrav2014-04-206-3/+28
| | | | | | | about one out of 512 times. Notes: svn path=/vendor-crypto/openssh/dist/; revision=264690
* Vendor import of OpenSSH 6.6p1.vendor/openssh/6.6p1Dag-Erling Smørgrav2014-03-22120-3124/+1510
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=263635 svn path=/vendor-crypto/openssh/6.6p1/; revision=263636; tag=vendor/openssh/6.6p1
* Vendor import of OpenSSH 6.5p1.vendor/openssh/6.5p1Dag-Erling Smørgrav2014-01-30202-4405/+13381
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=261287 svn path=/vendor-crypto/openssh/6.5p1/; revision=261288; tag=vendor/openssh/6.5p1
* Vendor import of OpenSSH 6.4p1.vendor/openssh/6.4p1Xin LI2013-11-1122-49/+65
| | | | | | | | Approved by: des Notes: svn path=/vendor-crypto/openssh/dist/; revision=257952 svn path=/vendor-crypto/openssh/6.4p1/; revision=257953; tag=vendor/openssh/6.4p1
* Vendor import of OpenSSH 6.3p1vendor/openssh/6.3p1Dag-Erling Smørgrav2013-09-18221-3170/+5464
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=255670 svn path=/vendor-crypto/openssh/6.3p1/; revision=255671; tag=vendor/openssh/6.3p1
* Apply upstream revision 1.151 (fix relative symlinks)Dag-Erling Smørgrav2013-08-131-1/+2
| | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=254277
* Vendor import of OpenSSH 6.2p2.vendor/openssh/6.2p2Dag-Erling Smørgrav2013-05-1712-30/+78
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=250737 svn path=/vendor-crypto/openssh/6.2p2/; revision=250738; tag=vendor/openssh/6.2p2
* The previous commit missed part of the patch. Re-apply.Dag-Erling Smørgrav2013-04-243-34/+29
| | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=249838
* Apply a patch from OpenSSH bugzilla #2057 to silence "received disconnect"Dag-Erling Smørgrav2013-04-141-1/+5
| | | | | | | errors in the common case (i.e. client intentionally disconnected). Notes: svn path=/vendor-crypto/openssh/dist/; revision=249474
* Pull in a patchset from upstream to silence spurious "no such identityDag-Erling Smørgrav2013-04-024-14/+29
| | | | | | | file" warnings. Notes: svn path=/vendor-crypto/openssh/dist/; revision=249005
* Vendor import of OpenSSH 6.2p1.vendor/openssh/6.2p1Dag-Erling Smørgrav2013-03-22125-1624/+7092
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=248613 svn path=/vendor-crypto/openssh/6.2p1/; revision=248614; tag=vendor/openssh/6.2p1
* Vendor import of OpenSSH 6.1p1.vendor/openssh/6.1p1Dag-Erling Smørgrav2012-08-2979-627/+1629
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=239849 svn path=/vendor-crypto/openssh/6.1p1/; revision=239851; tag=vendor/openssh/6.1p1
* Vendor import of OpenSSH 6.0p1.vendor/openssh/6.0p1Dag-Erling Smørgrav2012-08-2995-796/+2824
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=239844 svn path=/vendor-crypto/openssh/6.0p1/; revision=239847; tag=vendor/openssh/6.0p1
* Merge from upstream:Xin LI2012-06-252-6/+9
| | | | | | | | | | | | - djm@cvs.openbsd.org 2012/04/11 13:34:17 [ssh-keyscan.1 ssh-keyscan.c] now that sshd defaults to offering ECDSA keys, ssh-keyscan should also look for them by default; bz#1971 Approved by: des Notes: svn path=/vendor-crypto/openssh/dist/; revision=237567
* Forgot to remove dead files.Dag-Erling Smørgrav2011-09-285-1247/+0
| | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=225833
* Vendor import of OpenSSH 5.9p1vendor/openssh/5.9p1Dag-Erling Smørgrav2011-09-28113-23571/+10836
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=225825 svn path=/vendor-crypto/openssh/5.9p1/; revision=225826; tag=vendor/openssh/5.9p1
* More autoprops damage, compounded by the fact that some source files, forDag-Erling Smørgrav2011-09-282-0/+0
| | | | | | | some reason, had the x bit set in the tarball. Notes: svn path=/vendor-crypto/openssh/dist/; revision=225824
* Revert autoprops damage.Dag-Erling Smørgrav2011-09-281-1/+1
| | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=225823
* Merge from upstream: #include <netinet/ip.h> before checking for macrosDag-Erling Smørgrav2011-05-051-3/+3
| | | | | | | that it defines. Notes: svn path=/vendor-crypto/openssh/dist/; revision=221486
* djm released a new 5.8p2 tarball with the correct version number.vendor/openssh/5.8p2Dag-Erling Smørgrav2011-05-052-1/+2
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=221484 svn path=/vendor-crypto/openssh/5.8p2/; revision=221485; tag=vendor/openssh/5.8p2
* Vendor import of OpenSSH 5.8p2Dag-Erling Smørgrav2011-05-039-249/+422
| | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=221377
* Vendor import of OpenSSH 5.8p1vendor/openssh/5.8p1Dag-Erling Smørgrav2011-02-1729-49/+101
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=218769 svn path=/vendor-crypto/openssh/5.8p1/; revision=218770; tag=vendor/openssh/5.8p1
* Vendor import of OpenSSH 5.7p1vendor/openssh/5.7p1Dag-Erling Smørgrav2011-02-17156-4467/+7314
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=218767 svn path=/vendor-crypto/openssh/5.7p1/; revision=218768; tag=vendor/openssh/5.7p1
* Vendor import of OpenSSH 5.6p1vendor/openssh/5.6p1Dag-Erling Smørgrav2010-11-0899-2283/+4871
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=214979 svn path=/vendor-crypto/openssh/5.6p1/; revision=214980; tag=vendor/openssh/5.6p1
* Vendor import of OpenSSH 5.5p1vendor/openssh/5.5p1Dag-Erling Smørgrav2010-04-2846-247/+555
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=207311 svn path=/vendor-crypto/openssh/5.5p1/; revision=207312; tag=vendor/openssh/5.5p1
* Forgot to remove dead filesvendor/openssh/5.4p1Dag-Erling Smørgrav2010-03-088-1445/+0
| | | | | Notes: svn path=/vendor-crypto/openssh/dist/; revision=204863 svn path=/vendor-crypto/openssh/5.4p1/; revision=204864; tag=vendor/openssh/5.4p1