Dag-Erling Smørgrav
85f19ec0ec
Merge upstream 2c21b75a7be6ebdcbceaebb43157c48dbb36f3d8:
...
| scp: add -T to usage();
|
| OpenBSD-Commit-ID: a7ae14d9436c64e1bd05022329187ea3a0ce1899
2019-02-05 08:10:36 +00:00
Dag-Erling Smørgrav
e329cc28ba
Merge upstream 391ffc4b9d31fa1f4ad566499fef9176ff8a07dc:
...
| 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
2019-02-05 08:07:56 +00:00
Ed Maste
0a5cc6b21c
openssh: cherry-pick OpenSSL 1.1.1 compatibility
...
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
2018-10-03 16:11:13 +00:00
Dag-Erling Smørgrav
d46065df2d
Vendor import of OpenSSH 7.8p1.
2018-08-28 10:47:58 +00:00
Dag-Erling Smørgrav
3d0e42005d
Import upstream commit cfb1d9b, which fixes tunnel forwarding.
2018-05-16 13:59:58 +00:00
Dag-Erling Smørgrav
c8a2bf1462
Vendor import of OpenSSH 7.7p1.
2018-05-06 12:27:04 +00:00
Dag-Erling Smørgrav
20adc8f2a9
Vendor import of OpenSSH 7.6p1.
2018-05-06 12:24:45 +00:00
Dag-Erling Smørgrav
343d577115
Vendor import of OpenSSH 7.5p1.
2017-08-03 10:10:20 +00:00
Dag-Erling Smørgrav
19ca85510b
Vendor import of OpenSSH 7.4p1.
2017-01-31 12:33:47 +00:00
Dag-Erling Smørgrav
ab4ec008e7
Vendor import of OpenSSH 7.3p1.
2017-01-31 12:29:48 +00:00
Xin LI
8f8c559269
Apply upstream fix for CVE-2016-10009 and CVE-2016-10010:
...
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
2017-01-11 05:42:06 +00:00
Xin LI
642a1c3843
Apply upstream fix for CVE-2016-8858:
...
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
2016-11-02 06:43:20 +00:00
Dag-Erling Smørgrav
b5a1df4a77
Vendor import of OpenSSH 7.2p2.
2016-03-10 20:12:09 +00:00
Dag-Erling Smørgrav
ff4b04e0d6
Vendor import of OpenSSH 7.2p1.
2016-03-10 20:10:25 +00:00
Dag-Erling Smørgrav
4cb2962809
Vendor import of OpenSSH 7.1p2.
2016-01-19 10:10:58 +00:00
Dag-Erling Smørgrav
a7a7e85cd3
Vendor import of OpenSSH 7.1p1.
2015-08-26 09:27:05 +00:00
Dag-Erling Smørgrav
d994eeedda
Vendor import of OpenSSH 7.0p1
2015-08-26 09:25:17 +00:00
Dag-Erling Smørgrav
b5a1b3a82d
Vendor import of OpenSSH 6.9p1.
2015-07-02 13:18:50 +00:00
Dag-Erling Smørgrav
c1e0861503
Vendor import of OpenSSH 6.8p1.
2015-07-02 13:15:34 +00:00
Dag-Erling Smørgrav
c0bbca73c6
Vendor import of OpenSSH 6.7p1.
2015-01-05 16:09:55 +00:00
Dag-Erling Smørgrav
12459a528f
Apply upstream patch for EC calculation bug that breaks EC key exchange
...
about one out of 512 times.
2014-04-20 11:17:44 +00:00
Dag-Erling Smørgrav
0c79dacc8a
Vendor import of OpenSSH 6.6p1.
2014-03-22 15:23:38 +00:00
Dag-Erling Smørgrav
02d4c2ac3d
Vendor import of OpenSSH 6.5p1.
2014-01-30 10:56:49 +00:00
Xin LI
ff96c0c81d
Vendor import of OpenSSH 6.4p1.
...
Approved by: des
2013-11-11 09:13:37 +00:00
Dag-Erling Smørgrav
0dddc34c88
Vendor import of OpenSSH 6.3p1
2013-09-18 17:27:38 +00:00
Dag-Erling Smørgrav
caafb97d9e
Apply upstream revision 1.151 (fix relative symlinks)
2013-08-13 09:04:20 +00:00
Dag-Erling Smørgrav
c3605b8bd9
Vendor import of OpenSSH 6.2p2.
2013-05-17 08:55:26 +00:00
Dag-Erling Smørgrav
7ae06c6504
The previous commit missed part of the patch. Re-apply.
2013-04-24 11:53:46 +00:00
Dag-Erling Smørgrav
f74399985c
Apply a patch from OpenSSH bugzilla #2057 to silence "received disconnect"
...
errors in the common case (i.e. client intentionally disconnected).
2013-04-14 12:55:39 +00:00
Dag-Erling Smørgrav
3355dd89e5
Pull in a patchset from upstream to silence spurious "no such identity
...
file" warnings.
2013-04-02 08:41:38 +00:00
Dag-Erling Smørgrav
9b81c12876
Vendor import of OpenSSH 6.2p1.
2013-03-22 11:19:48 +00:00
Dag-Erling Smørgrav
925f1fb7e4
Vendor import of OpenSSH 6.1p1.
2012-08-29 15:55:54 +00:00
Dag-Erling Smørgrav
2e97a36905
Vendor import of OpenSSH 6.0p1.
2012-08-29 15:46:01 +00:00
Xin LI
4bc11fc94e
Merge from upstream:
...
- 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
2012-06-25 18:54:02 +00:00
Dag-Erling Smørgrav
3a979c3502
Forgot to remove dead files.
2011-09-28 13:21:12 +00:00
Dag-Erling Smørgrav
1e26c29b77
Vendor import of OpenSSH 5.9p1
2011-09-28 08:14:41 +00:00
Dag-Erling Smørgrav
c00cf9e642
More autoprops damage, compounded by the fact that some source files, for
...
some reason, had the x bit set in the tarball.
2011-09-28 08:13:01 +00:00
Dag-Erling Smørgrav
faa476b90b
Revert autoprops damage.
2011-09-28 07:46:28 +00:00
Dag-Erling Smørgrav
9dfebb6def
Merge from upstream: #include <netinet/ip.h> before checking for macros
...
that it defines.
2011-05-05 08:04:31 +00:00
Dag-Erling Smørgrav
673b8ab1d6
djm released a new 5.8p2 tarball with the correct version number.
2011-05-05 07:59:12 +00:00
Dag-Erling Smørgrav
b615e9314d
Vendor import of OpenSSH 5.8p2
2011-05-03 11:22:37 +00:00
Dag-Erling Smørgrav
adde052b01
Vendor import of OpenSSH 5.8p1
2011-02-17 11:49:48 +00:00
Dag-Erling Smørgrav
9f6de2d748
Vendor import of OpenSSH 5.7p1
2011-02-17 11:47:40 +00:00
Dag-Erling Smørgrav
3a927e69c3
Vendor import of OpenSSH 5.6p1
2010-11-08 10:45:44 +00:00
Dag-Erling Smørgrav
f276912e6f
Vendor import of OpenSSH 5.5p1
2010-04-28 08:37:00 +00:00
Dag-Erling Smørgrav
5fe13e2e9b
Forgot to remove dead files
2010-03-08 11:24:19 +00:00
Dag-Erling Smørgrav
6d4f2dd11a
Vendor import of OpenSSH 5.4p1
2010-03-08 11:19:52 +00:00
Dag-Erling Smørgrav
e5e752b5a7
Vendor import of OpenSSH 5.3p1
2009-10-01 15:19:37 +00:00
Dag-Erling Smørgrav
9ab1052dcd
Vendor import of OpenSSH 5.2p1
2009-02-24 18:49:27 +00:00
Dag-Erling Smørgrav
23371b1d95
svn:eol-style is missing from these files
2009-02-24 18:48:10 +00:00