]> git.ipfire.org Git - thirdparty/openssh-portable.git/log
thirdparty/openssh-portable.git
7 years agoupstream commit
djm@openbsd.org [Tue, 23 Jan 2018 05:01:15 +0000 (05:01 +0000)] 
upstream commit

avoid modifying pw->pw_passwd; let endpwent() clean up
for us, but keep a scrubbed copy; bz2777, ok dtucker@

OpenBSD-Commit-ID: 715afc0f59c6b82c4929a73279199ed241ce0752

7 years agoupstream commit
naddy@openbsd.org [Sat, 13 Jan 2018 00:24:09 +0000 (00:24 +0000)] 
upstream commit

clarify authorship; prodded by and ok markus@

OpenBSD-Commit-ID: e1938eee58c89b064befdabe232835fa83bb378c

7 years agoupstream commit
markus@openbsd.org [Mon, 8 Jan 2018 15:37:21 +0000 (15:37 +0000)] 
upstream commit

group shared source files (e.g. SRCS_KEX) and allow
compilation w/o OPENSSL ok djm@

OpenBSD-Commit-ID: fa728823ba21c4b45212750e1d3a4b2086fd1a62

7 years agoupstream commit
markus@openbsd.org [Mon, 8 Jan 2018 15:21:49 +0000 (15:21 +0000)] 
upstream commit

move subprocess() so scp/sftp do not need uidswap.o; ok
djm@

OpenBSD-Commit-ID: 6601b8360388542c2e5fef0f4085f8e54750bea8

7 years agoupstream commit
markus@openbsd.org [Mon, 8 Jan 2018 15:18:46 +0000 (15:18 +0000)] 
upstream commit

switch ssh-pkcs11-helper to new API; ok djm@

OpenBSD-Commit-ID: e0c0ed2a568e25b1d2024f3e630f3fea837c2a42

7 years agoupstream commit
markus@openbsd.org [Mon, 8 Jan 2018 15:15:36 +0000 (15:15 +0000)] 
upstream commit

split client/server kex; only ssh-keygen needs
uuencode.o; only scp/sftp use progressmeter.o; ok djm@

OpenBSD-Commit-ID: f2c9feb26963615c4fece921906cf72e248b61ee

7 years agoupstream commit
markus@openbsd.org [Mon, 8 Jan 2018 15:15:17 +0000 (15:15 +0000)] 
upstream commit

only ssh-keygen needs uuencode.o; only scp/sftp use
progressmeter.o

OpenBSD-Commit-ID: a337e886a49f96701ccbc4832bed086a68abfa85

7 years agoupstream commit
markus@openbsd.org [Mon, 8 Jan 2018 15:14:44 +0000 (15:14 +0000)] 
upstream commit

uuencode.h is not used

OpenBSD-Commit-ID: 238eb4659f3c119904326b9e94a5e507a912796c

7 years agounbreak fuzz harness
Damien Miller [Wed, 3 Jan 2018 08:50:43 +0000 (19:50 +1100)] 
unbreak fuzz harness

7 years agoupstream commit
djm@openbsd.org [Thu, 21 Dec 2017 05:46:35 +0000 (05:46 +0000)] 
upstream commit

another libssh casualty

OpenBSD-Regress-ID: 839b970560246de23e7c50215095fb527a5a83ec

7 years agoupstream commit
djm@openbsd.org [Thu, 21 Dec 2017 03:01:49 +0000 (03:01 +0000)] 
upstream commit

missed one (unbreak after ssh/lib removal)

OpenBSD-Regress-ID: cfdd132143131769e2d2455e7892b5d55854c322

7 years agoupstream commit
djm@openbsd.org [Thu, 21 Dec 2017 00:41:22 +0000 (00:41 +0000)] 
upstream commit

unbreak unit tests after removal of src/usr.bin/ssh/lib

OpenBSD-Regress-ID: 3a79760494147b20761cbd2bd5c20e86c63dc8f9

7 years agoupstream commit
djm@openbsd.org [Thu, 21 Dec 2017 00:00:28 +0000 (00:00 +0000)] 
upstream commit

revert stricter key type / signature type checking in
userauth path; too much software generates inconsistent messages, so we need
a better plan.

OpenBSD-Commit-ID: 4a44ddc991c803c4ecc8f1ad40e0ab4d22e1c519

7 years agoupstream commit
djm@openbsd.org [Tue, 19 Dec 2017 00:49:30 +0000 (00:49 +0000)] 
upstream commit

explicitly test all key types and their certificate
counterparts

refactor a little

OpenBSD-Regress-ID: e9ecd5580821b9ef8b7106919c6980d8e45ca8c4

7 years agoupstream commit
dtucker@openbsd.org [Mon, 11 Dec 2017 11:41:56 +0000 (11:41 +0000)] 
upstream commit

use cmp in a loop instead of diff -N to compare
directories. The former works on more platforms for Portable.

OpenBSD-Regress-ID: c3aa72807f9c488e8829a26ae50fe5bcc5b57099

7 years agoremove blocks.c from Makefile
Damien Miller [Tue, 19 Dec 2017 05:17:59 +0000 (16:17 +1100)] 
remove blocks.c from Makefile

7 years agoupstream commit
djm@openbsd.org [Tue, 19 Dec 2017 00:24:34 +0000 (00:24 +0000)] 
upstream commit

include signature type and CA key (if applicable) in some
debug messages

OpenBSD-Commit-ID: b71615cc20e78cec7105bb6e940c03ce9ae414a5

7 years agoupstream commit
djm@openbsd.org [Mon, 18 Dec 2017 23:16:23 +0000 (23:16 +0000)] 
upstream commit

unbreak hostkey rotation; attempting to sign with a
desired signature algorithm of kex->hostkey_alg is incorrect when the key
type isn't capable of making those signatures. ok markus@

OpenBSD-Commit-ID: 35ae46864e1f5859831ec0d115ee5ea50953a906

7 years agoupstream commit
djm@openbsd.org [Mon, 18 Dec 2017 23:14:34 +0000 (23:14 +0000)] 
upstream commit

log mismatched RSA signature types; ok markus@

OpenBSD-Commit-ID: 381bddfcc1e297a42292222f3bcb5ac2b7ea2418

7 years agoupstream commit
djm@openbsd.org [Mon, 18 Dec 2017 23:13:42 +0000 (23:13 +0000)] 
upstream commit

pass kex->hostkey_alg and kex->hostkey_nid from pre-auth
to post-auth unpriviledged child processes; ok markus@

OpenBSD-Commit-ID: 4a35bc7af0a5f8a232d1361f79f4ebc376137302

7 years agoupstream commit
millert@openbsd.org [Mon, 18 Dec 2017 17:28:54 +0000 (17:28 +0000)] 
upstream commit

Add helper function for uri handing in scp where a
missing path simply means ".".  Also fix exit code and add warnings when an
invalid uri is encountered.  OK otto@

OpenBSD-Commit-ID: 47dcf872380586dabf7fcc6e7baf5f8ad508ae1a

7 years agoupstream commit
djm@openbsd.org [Mon, 18 Dec 2017 02:25:15 +0000 (02:25 +0000)] 
upstream commit

pass negotiated signing algorithm though to
sshkey_verify() and check that the negotiated algorithm matches the type in
the signature (only matters for RSA SHA1/SHA2 sigs). ok markus@

OpenBSD-Commit-ID: 735fb15bf4adc060d3bee9d047a4bcaaa81b1af9

7 years agoupstream commit
djm@openbsd.org [Mon, 18 Dec 2017 02:22:29 +0000 (02:22 +0000)] 
upstream commit

sshkey_sigtype() function to return the type of a
signature; ok markus@

OpenBSD-Commit-ID: d3772b065ad6eed97285589bfb544befed9032e8

7 years agoupstream commit
naddy@openbsd.org [Thu, 14 Dec 2017 21:07:39 +0000 (21:07 +0000)] 
upstream commit

Replace ED25519's private SHA-512 implementation with a
call to the regular digest code.  This speeds up compilation considerably. ok
markus@

OpenBSD-Commit-ID: fcce8c3bcfe7389462a28228f63c823e80ade41c

7 years agoupstream commit
naddy@openbsd.org [Tue, 12 Dec 2017 15:06:12 +0000 (15:06 +0000)] 
upstream commit

Create a persistent umac128.c source file: #define the
output size and the name of the entry points for UMAC-128 before including
umac.c. Idea from FreeBSD. ok dtucker@

OpenBSD-Commit-ID: 463cfacfa07cb8060a4d4961e63dca307bf3f4b1

7 years agoUpdate .depend with empty config.h
Darren Tucker [Mon, 11 Dec 2017 05:23:28 +0000 (16:23 +1100)] 
Update .depend with empty config.h

7 years agoEnsure config.h is always in dependencies.
Darren Tucker [Mon, 11 Dec 2017 05:21:55 +0000 (16:21 +1100)] 
Ensure config.h is always in dependencies.

Put an empty config.h into the dependency list to ensure that it's
always listed and consistent.

7 years agoupstream commit
deraadt@openbsd.org [Sun, 10 Dec 2017 19:37:57 +0000 (19:37 +0000)] 
upstream commit

ssh/lib hasn't worked towards our code-sharing goals for
a quit while, perhaps it is too verbose?  Change each */Makefile to
specifying exactly what sources that program requires, compiling it seperate.
 Maybe we'll iterate by sorting those into seperatable chunks, splitting up
files which contain common code + server/client specific code, or whatnot.
But this isn't one step, or we'd have done it a long time ago.. ok dtucker
markus djm

OpenBSD-Commit-ID: 5317f294d63a876bfc861e19773b1575f96f027d

7 years agoupstream commit
dtucker@openbsd.org [Sun, 10 Dec 2017 05:55:29 +0000 (05:55 +0000)] 
upstream commit

Put remote client info back into the ClientAlive
connection termination message.  Based in part on diff from  lars.nooden at
gmail, ok djm

OpenBSD-Commit-ID: 80a0f619a29bbf2f32eb5297a69978a0e05d0ee0

7 years agoupstream commit
deraadt@openbsd.org [Fri, 8 Dec 2017 03:45:52 +0000 (03:45 +0000)] 
upstream commit

time_t printing needs %lld and (long long) casts ok djm

OpenBSD-Commit-ID: 4a93bc2b0d42a39b8f8de8bb74d07ad2e5e83ef7

7 years agoupstream commit
djm@openbsd.org [Fri, 8 Dec 2017 02:14:33 +0000 (02:14 +0000)] 
upstream commit

fix ordering in previous to ensure errno isn't clobbered
before logging.

OpenBSD-Commit-ID: e260bc1e145a9690dcb0d5aa9460c7b96a0c8ab2

7 years agoupstream commit
djm@openbsd.org [Fri, 8 Dec 2017 02:13:02 +0000 (02:13 +0000)] 
upstream commit

for some reason unix_listener() logged most errors twice
with each message containing only some of the useful information; merge these

OpenBSD-Commit-ID: 1978a7594a9470c0dddcd719586066311b7c9a4a

7 years agoAdd autogenerated dependency info to Makefile.
Darren Tucker [Mon, 11 Dec 2017 03:38:33 +0000 (14:38 +1100)] 
Add autogenerated dependency info to Makefile.

Adds a .depend file containing dependency information generated by
makedepend, which is appended to the generated Makefile by configure.

You can regen the file with "make -f Makefile.in depend" if necessary,
but we'll be looking at some way to automatically keep this up to date.

"no objection" djm@

7 years agoFix pasto in ldns handling.
Darren Tucker [Mon, 11 Dec 2017 02:42:51 +0000 (13:42 +1100)] 
Fix pasto in ldns handling.

When ldns-config is not found, configure would check the wrong variable.
ok djm@

7 years agoPortable switched to git so s/CVS/git/.
Darren Tucker [Fri, 8 Dec 2017 23:12:23 +0000 (10:12 +1100)] 
Portable switched to git so s/CVS/git/.

7 years agoRemove now-used check for perl.
Darren Tucker [Fri, 8 Dec 2017 21:06:00 +0000 (08:06 +1100)] 
Remove now-used check for perl.

7 years agoupstream commit
djm@openbsd.org [Wed, 6 Dec 2017 05:06:21 +0000 (05:06 +0000)] 
upstream commit

don't accept junk after "yes" or "no" responses to
hostkey prompts. bz#2803 reported by Maksim Derbasov; ok dtucker@

OpenBSD-Commit-ID: e1b159fb2253be973ce25eb7a7be26e6f967717c

7 years agoupstream commit
dtucker@openbsd.org [Tue, 5 Dec 2017 23:59:47 +0000 (23:59 +0000)] 
upstream commit

Replace atoi and strtol conversions for integer arguments
to config keywords with a checking wrapper around strtonum.  This will
prevent and flag invalid and negative arguments to these keywords.  ok djm@

OpenBSD-Commit-ID: 99ae3981f3d608a219ccb8d2fff635ae52c17998

7 years agoupstream commit
dtucker@openbsd.org [Tue, 5 Dec 2017 23:56:07 +0000 (23:56 +0000)] 
upstream commit

Add missing break for rdomain.  Prevents spurious
"Deprecated option" warnings.  ok djm@

OpenBSD-Commit-ID: ba28a675d39bb04a974586241c3cba71a9c6099a

7 years agoupstream commit
djm@openbsd.org [Tue, 5 Dec 2017 01:30:19 +0000 (01:30 +0000)] 
upstream commit

include the addr:port in bind/listen failure messages

OpenBSD-Commit-ID: fdadb69fe1b38692608809cf0376b71c2c28e58e

7 years agoupstream commit
dtucker@openbsd.org [Wed, 29 Nov 2017 05:49:54 +0000 (05:49 +0000)] 
upstream commit

Import updated moduli.

OpenBSD-Commit-ID: 524d210f982af6007aa936ca7f4c977f4d32f38a

7 years agoupstream commit
dtucker@openbsd.org [Tue, 28 Nov 2017 21:10:22 +0000 (21:10 +0000)] 
upstream commit

Have sftp print a warning about shell cleanliness when
decoding the first packet fails, which is usually caused by shells polluting
stdout of non-interactive starups.  bz#2800, ok markus@ deraadt@.

OpenBSD-Commit-ID: 88d6a9bf3470f9324b76ba1cbd53e50120f685b5

7 years agoReplace mkinstalldirs with mkdir -p.
Darren Tucker [Fri, 1 Dec 2017 06:11:47 +0000 (17:11 +1100)] 
Replace mkinstalldirs with mkdir -p.

Check for MIKDIR_P and use it instead of mkinstalldirs.  Should fix "mkdir:
cannot create directory:... File exists" during "make install".
Patch from eb at emlix.com.

7 years agoPull in newer install-sh from autoconf-2.69.
Darren Tucker [Fri, 1 Dec 2017 06:07:08 +0000 (17:07 +1100)] 
Pull in newer install-sh from autoconf-2.69.

Suggested by eb at emlix.com

7 years agoRemove RSA1 host key generation.
Darren Tucker [Fri, 1 Dec 2017 05:55:35 +0000 (16:55 +1100)] 
Remove RSA1 host key generation.

SSH1 support is now gone, remove SSH1 key generation.
Patch from eb at emlix.com.

7 years agoupstream commit
djm@openbsd.org [Tue, 28 Nov 2017 06:09:38 +0000 (06:09 +0000)] 
upstream commit

more whitespace errors

OpenBSD-Commit-ID: 5e11c125378327b648940b90145e0d98beb05abb

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Tue, 28 Nov 2017 06:04:51 +0000 (06:04 +0000)] 
upstream commit

whitespace at EOL

OpenBSD-Commit-ID: 76d3965202b22d59c2784a8df3a8bfa5ee67b96a

7 years agoupstream commit
dtucker@openbsd.org@openbsd.org [Sat, 25 Nov 2017 06:46:22 +0000 (06:46 +0000)] 
upstream commit

Add monotime_ts and monotime_tv that return monotonic
timespec and timeval respectively.  Replace calls to gettimeofday() in packet
timing with monotime_tv so that the callers will work over a clock step.
Should prevent integer overflow during clock steps reported by wangle6 at
huawei.com. "I like" markus@

OpenBSD-Commit-ID: 74d684264814ff806f197948b87aa732cb1b0b8a

7 years agoupstream commit
dtucker@openbsd.org@openbsd.org [Sat, 25 Nov 2017 05:58:47 +0000 (05:58 +0000)] 
upstream commit

Remove get_current_time() and replace with calls to
monotime_double() which uses CLOCK_MONOTONIC and works over clock steps.  "I
like" markus@

OpenBSD-Commit-ID: 3ad2f7d2414e2cfcaef99877a7a5b0baf2242952

7 years agoInclude string.h for explicit_bzero.
Darren Tucker [Fri, 24 Nov 2017 05:24:31 +0000 (16:24 +1100)] 
Include string.h for explicit_bzero.

7 years agofix incorrect range of OpenSSL versions supported
Damien Miller [Thu, 23 Nov 2017 23:23:47 +0000 (10:23 +1100)] 
fix incorrect range of OpenSSL versions supported

Pointed out by Solar Designer

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Wed, 15 Nov 2017 02:10:16 +0000 (02:10 +0000)] 
upstream commit

downgrade a couple more request parsing errors from
process-fatal to just returning failure, making them consistent with the
others that were already like that.

OpenBSD-Commit-ID: c111461f7a626690a2d53018ef26557b34652918

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Wed, 15 Nov 2017 00:13:40 +0000 (00:13 +0000)] 
upstream commit

fix regression in 7.6: failure to parse a signature request
message shouldn't be fatal to the process, just the request. Reported by Ron
Frederick

OpenBSD-Commit-ID: e5d01b3819caa1a2ad51fc57d6ded43f48bbcc05

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Tue, 14 Nov 2017 00:45:29 +0000 (00:45 +0000)] 
upstream commit

fix problem in configuration parsing when in config dump mode
(sshd -T) without providing a full connection specification (sshd -T -C ...)

spotted by bluhm@

OpenBSD-Commit-ID: 7125faf5740eaa9d3a2f25400a0bc85e94e28b8f

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Fri, 3 Nov 2017 05:18:44 +0000 (05:18 +0000)] 
upstream commit

reuse parse_multistate for parse_flag (yes/no arguments).
Saves a few lines of code and makes the parser more consistent wrt case-
sensitivity.  bz#2664 ok dtucker@

OpenBSD-Commit-ID: b2ad1b6086858d5db71c7b11e5a74dba6d60efef

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Fri, 3 Nov 2017 05:14:04 +0000 (05:14 +0000)] 
upstream commit

allow certificate validity intervals that specify only a
start or stop time (we already support specifying both or neither)

OpenBSD-Commit-ID: 9be486545603c003030bdb5c467d1318b46b4e42

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Fri, 3 Nov 2017 03:46:52 +0000 (03:46 +0000)] 
upstream commit

allow "cd" and "lcd" commands with no explicit path
argument. lcd will change to the local user's home directory as usual. cd
will change to the starting directory for session (because the protocol
offers no way to obtain the remote user's home directory). bz#2760 ok
dtucker@

OpenBSD-Commit-ID: 15333f5087cee8c1ed1330cac1bd0a3e6a767393

7 years agoupstream commit
dtucker@openbsd.org@openbsd.org [Fri, 3 Nov 2017 03:18:53 +0000 (03:18 +0000)] 
upstream commit

When doing a config test with sshd -T, only require the
attributes that are actually used in Match criteria rather than (an
incomplete list of) all criteria.  ok djm@, man page help jmc@

OpenBSD-Commit-ID: b4e773c4212d3dea486d0259ae977551aab2c1fc

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Fri, 3 Nov 2017 02:32:19 +0000 (02:32 +0000)] 
upstream commit

typos in ECDSA certificate names; bz#2787 reported by
Mike Gerow

OpenBSD-Commit-ID: 824938b6aba1b31321324ba1f56c05f84834b163

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Fri, 3 Nov 2017 02:29:17 +0000 (02:29 +0000)] 
upstream commit

Private keys in PEM format have been encrypted by AES-128 for
a while (not 3DES). bz#2788 reported by Calum Mackay

OpenBSD-Commit-ID: bd33da7acbbb3c882f0a0ee56007a35ce0d8a11a

7 years agoCheck for linux/if.h when enabling rdomain.
Darren Tucker [Fri, 3 Nov 2017 03:52:51 +0000 (14:52 +1100)] 
Check for linux/if.h when enabling rdomain.

musl libc doesn't seem to have linux/if.h, so check for its presence
before enabling rdomain support on Linux.

7 years agoAdd headers for sys/sysctl.h and net/route.h
Darren Tucker [Fri, 3 Nov 2017 03:09:45 +0000 (14:09 +1100)] 
Add headers for sys/sysctl.h and net/route.h

On at least older OpenBSDs, sys/sysctl.h and net/route.h require
sys/types and, in the case of sys/sysctl.h, sys/param.h for MAXLOGNAME.

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Fri, 3 Nov 2017 02:22:41 +0000 (02:22 +0000)] 
upstream commit

avoid unused variable warnings for !WITH_OPENSSL; patch from
Marcus Folkesson

OpenBSD-Commit-ID: c01d27a3f907acdc3dd4ea48170fac3ba236d229

7 years agoonly enable functions in dh.c when openssl is used
Marcus Folkesson [Sat, 28 Oct 2017 17:48:39 +0000 (19:48 +0200)] 
only enable functions in dh.c when openssl is used

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
7 years agoupstream commit
djm@openbsd.org@openbsd.org [Wed, 1 Nov 2017 00:04:15 +0000 (00:04 +0000)] 
upstream commit

fix broken stdout in ControlPersist mode, introduced by me in
r1.467 and reported by Alf Schlichting

OpenBSD-Commit-ID: 3750a16e02108fc25f747e4ebcedb7123c1ef509

7 years agoInclude includes.h for HAVE_GETPAGESIZE.
Darren Tucker [Mon, 30 Oct 2017 23:09:33 +0000 (10:09 +1100)] 
Include includes.h for HAVE_GETPAGESIZE.

The configure script checks for getpagesize() and sets HAVE_GETPAGESIZE in
config.h, but bsd-getpagesize.c forgot to include includes.h (which
indirectly includes config.h) so the checks always fails, causing linker
issues when linking statically on systems with getpagesize().

Patch from Peter Korsgaard <peter at korsgaard.com>

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Mon, 30 Oct 2017 22:01:52 +0000 (22:01 +0000)] 
upstream commit

whitespace at EOL

OpenBSD-Regress-ID: f4b5df99b28c6f63478deb916c6ed0e794685f07

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Mon, 30 Oct 2017 21:59:43 +0000 (21:59 +0000)] 
upstream commit

whitespace at EOL

OpenBSD-Regress-ID: 19b1394393deee4c8a2114a3b7d18189f27a15cd

7 years agoupstream commit
millert@openbsd.org@openbsd.org [Wed, 25 Oct 2017 20:08:36 +0000 (20:08 +0000)] 
upstream commit

Use printenv to test whether an SSH_USER_AUTH is set
instead of using $SSH_USER_AUTH.  The latter won't work with csh which treats
unknown variables as an error when expanding them.  OK markus@

OpenBSD-Regress-ID: f601e878dd8b71aa40381573dde3a8f567e6f2d1

7 years agoupstream commit
millert@openbsd.org@openbsd.org [Tue, 24 Oct 2017 19:33:32 +0000 (19:33 +0000)] 
upstream commit

Add tests for URI parsing.  OK markus@

OpenBSD-Regress-ID: 5d1df19874f3b916d1a2256a905526e17a98bd3b

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Fri, 27 Oct 2017 01:57:06 +0000 (01:57 +0000)] 
upstream commit

whitespace at EOL

OpenBSD-Commit-ID: c95549cf5a07d56ea11aaff818415118720214f6

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Fri, 27 Oct 2017 01:01:17 +0000 (01:01 +0000)] 
upstream commit

whitespace at EOL (lots)

OpenBSD-Commit-ID: 757257dd44116794ee1b5a45c6724973de181747

7 years agoupstream commit
djm@openbsd.org@openbsd.org [Fri, 27 Oct 2017 00:18:41 +0000 (00:18 +0000)] 
upstream commit

improve printing of rdomain on accept() a little

OpenBSD-Commit-ID: 5da58db2243606899cedaa646c70201b2d12247a

7 years agoupstream commit
jmc@openbsd.org@openbsd.org [Thu, 26 Oct 2017 06:44:01 +0000 (06:44 +0000)] 
upstream commit

mark up the rdomain keyword;

OpenBSD-Commit-ID: 1b597d0ad0ad20e94dbd61ca066057e6f6313b8a

7 years agoupstream commit
jmc@openbsd.org@openbsd.org [Wed, 25 Oct 2017 06:19:46 +0000 (06:19 +0000)] 
upstream commit

tweak the uri text, specifically removing some markup to
make it a bit more readable;

issue reported by - and diff ok - millert

OpenBSD-Commit-ID: 8b56a20208040b2d0633536fd926e992de37ef3f

7 years agoupstream commit
jmc@openbsd.org@openbsd.org [Wed, 25 Oct 2017 06:18:06 +0000 (06:18 +0000)] 
upstream commit

simplify macros in previous, and some minor tweaks;

OpenBSD-Commit-ID: 6efeca3d8b095b76e21b484607d9cc67ac9a11ca

7 years agoSwitch upstream git repository.
Damien Miller [Mon, 30 Oct 2017 13:46:29 +0000 (00:46 +1100)] 
Switch upstream git repository.

Previously portable OpenSSH has synced against a conversion of OpenBSD's
CVS repository made using the git cvsimport tool, but this has become
increasingly unreliable.

As of this commit, portable OpenSSH now tracks a conversion of the
OpenBSD CVS upstream made using the excellent cvs2gitdump tool from
YASUOKA Masahiko: https://github.com/yasuoka/cvs2gitdump

cvs2gitdump is considerably more reliable than gitcvsimport and the old
version of cvsps that it uses under the hood, and is the same tool used
to export the entire OpenBSD repository to git (so we know it can cope
with future growth).

These new conversions are mirrored at github, so interested parties can
match portable OpenSSH commits to their upstream counterparts.

https://github.com/djmdjm/openbsd-openssh-src
https://github.com/djmdjm/openbsd-openssh-regress

An unfortunate side effect of switching upstreams is that we must have
a flag day, across which the upstream commit IDs will be inconsistent.
The old commit IDs are recorded with the tags "Upstream-ID" for main
directory commits and "Upstream-Regress-ID" for regress commits.

To make it clear that the commit IDs do not refer to the same
things, the new repository will instead use "OpenBSD-ID" and
"OpenBSD-Regress-ID" tags instead.

Apart from being a longwinded explanation of what is going on, this
commit message also serves to synchronise our tools with the state of
the tree, which happens to be:

OpenBSD-ID: 9c43a9968c7929613284ea18e9fb92e4e2a8e4c1
OpenBSD-Regress-ID: b33b385719420bf3bc57d664feda6f699c147fef

7 years agofix rdomain compilation errors
Damien Miller [Thu, 26 Oct 2017 21:42:33 +0000 (08:42 +1100)] 
fix rdomain compilation errors

7 years agoautoconf glue to enable Linux VRF
Damien Miller [Wed, 25 Oct 2017 03:15:42 +0000 (14:15 +1100)] 
autoconf glue to enable Linux VRF

7 years agobasic valid_rdomain() implementation for Linux
Damien Miller [Wed, 25 Oct 2017 03:09:56 +0000 (14:09 +1100)] 
basic valid_rdomain() implementation for Linux

7 years agoimplement get/set_rdomain() for Linux
Damien Miller [Wed, 25 Oct 2017 02:47:59 +0000 (13:47 +1100)] 
implement get/set_rdomain() for Linux

Not enabled, pending implementation of valid_rdomain() and autoconf glue

7 years agostubs for rdomain replacement functions
Damien Miller [Wed, 25 Oct 2017 02:22:29 +0000 (13:22 +1100)] 
stubs for rdomain replacement functions

7 years agorename port-tun.[ch] => port-net.[ch]
Damien Miller [Wed, 25 Oct 2017 02:13:57 +0000 (13:13 +1100)] 
rename port-tun.[ch] => port-net.[ch]

Ahead of adding rdomain support

7 years agoupstream commit
djm@openbsd.org [Wed, 25 Oct 2017 02:10:39 +0000 (02:10 +0000)] 
upstream commit

uninitialised variable in PermitTunnel printing code

Upstream-ID: f04dc33e42855704e116b8da61095ecc71bc9e9a

7 years agoprovide hooks and fallbacks for rdomain support
Damien Miller [Wed, 25 Oct 2017 02:10:59 +0000 (13:10 +1100)] 
provide hooks and fallbacks for rdomain support

7 years agocheck for net/route.h and sys/sysctl.h
Damien Miller [Wed, 25 Oct 2017 00:25:43 +0000 (11:25 +1100)] 
check for net/route.h and sys/sysctl.h

7 years agoupstream commit
djm@openbsd.org [Wed, 25 Oct 2017 00:21:37 +0000 (00:21 +0000)] 
upstream commit

transfer ownership of stdout to the session channel by
dup2'ing /dev/null to fd 1. This allows propagation of remote stdout close to
the local side; reported by David Newall, ok markus@

Upstream-ID: 8d9ac18a11d89e6b0415f0cbf67b928ac67f0e79

7 years agoupstream commit
djm@openbsd.org [Wed, 25 Oct 2017 00:19:47 +0000 (00:19 +0000)] 
upstream commit

add a "rdomain" criteria for the sshd_config Match
keyword to allow conditional configuration that depends on which rdomain(4) a
connection was recevied on. ok markus@

Upstream-ID: 27d8fd5a3f1bae18c9c6e533afdf99bff887a4fb

7 years agoupstream commit
djm@openbsd.org [Wed, 25 Oct 2017 00:17:08 +0000 (00:17 +0000)] 
upstream commit

add sshd_config RDomain keyword to place sshd and the
subsequent user session (including the shell and any TCP/IP forwardings) into
the specified rdomain(4)

ok markus@

Upstream-ID: be2358e86346b5cacf20d90f59f980b87d1af0f5

7 years agoupstream commit
djm@openbsd.org [Wed, 25 Oct 2017 00:15:35 +0000 (00:15 +0000)] 
upstream commit

Add optional rdomain qualifier to sshd_config's
ListenAddress option to allow listening on a different rdomain(4), e.g.

ListenAddress 0.0.0.0 rdomain 4

Upstream-ID: 24b6622c376feeed9e9be8b9605e593695ac9091

7 years agoupstream commit
millert@openbsd.org [Tue, 24 Oct 2017 19:41:45 +0000 (19:41 +0000)] 
upstream commit

Kill dead store and some spaces vs. tabs indent in
parse_user_host_path(). Noticed by markus@

Upstream-ID: 114fec91dadf9af46c7c94fd40fc630ea2de8200

7 years agoupstream commit
jmc@openbsd.org [Tue, 24 Oct 2017 06:27:42 +0000 (06:27 +0000)] 
upstream commit

tweak previous; ok djm

Upstream-ID: 7d913981ab315296be1f759c67b6e17aea38fca9

7 years agoavoid -Wsign-compare warning in argv copying
Damien Miller [Mon, 23 Oct 2017 05:25:24 +0000 (16:25 +1100)] 
avoid -Wsign-compare warning in argv copying

7 years agoupstream commit
djm@openbsd.org [Mon, 23 Oct 2017 05:08:00 +0000 (05:08 +0000)] 
upstream commit

Expose devices allocated for tun/tap forwarding.

At the client, the device may be obtained from a new %T expansion
for LocalCommand.

At the server, the allocated devices will be listed in a
SSH_TUNNEL variable exposed to the environment of any user sessions
started after the tunnel forwarding was established.

ok markus

Upstream-ID: e61e53f8ae80566e9ddc0d67a5df5bdf2f3c9f9e

7 years agoupstream commit
millert@openbsd.org [Sat, 21 Oct 2017 23:06:24 +0000 (23:06 +0000)] 
upstream commit

Add URI support to ssh, sftp and scp.  For example
ssh://user@host or sftp://user@host/path.  The connection parameters
described in draft-ietf-secsh-scp-sftp-ssh-uri-04 are not implemented since
the ssh fingerprint format in the draft uses md5 with no way to specify the
hash function type.  OK djm@

Upstream-ID: 4ba3768b662d6722de59e6ecb00abf2d4bf9cacc

7 years agoFix missed RCSID merges
Damien Miller [Fri, 20 Oct 2017 02:22:00 +0000 (13:22 +1100)] 
Fix missed RCSID merges

7 years agoupstream commit
djm@openbsd.org [Fri, 20 Oct 2017 02:13:41 +0000 (02:13 +0000)] 
upstream commit

more RCSIDs

Upstream-Regress-ID: 1aecbe3f8224793f0ec56741a86d619830eb33be

7 years agoupstream commit
djm@openbsd.org [Fri, 20 Oct 2017 01:56:39 +0000 (01:56 +0000)] 
upstream commit

add RCSIDs to these; they make syncing portable a bit
easier

Upstream-ID: 56cb7021faea599736dd7e7f09c2e714425b1e68

7 years agoupstream commit
Damien Miller [Fri, 20 Oct 2017 01:54:15 +0000 (12:54 +1100)] 
upstream commit

Apply missing commit 1.11 to kexc25519s.c

Upstream-ID: 5f020e23a1ee6c3597af1f91511e68552cdf15e8

7 years agoupstream commit
Damien Miller [Fri, 20 Oct 2017 01:52:50 +0000 (12:52 +1100)] 
upstream commit

Apply missing commit 1.127 to servconf.h

Upstream-ID: f14c4bac74a2b7cf1e3cff6bea5c447f192a7d15