]> git.ipfire.org Git - thirdparty/openssh-portable.git/log
thirdparty/openssh-portable.git
6 years agoupstream: When system calls indicate an error they return -1, not
deraadt@openbsd.org [Fri, 28 Jun 2019 13:35:04 +0000 (13:35 +0000)] 
upstream: When system calls indicate an error they return -1, not

some arbitrary value < 0.  errno is only updated in this case.  Change all
(most?) callers of syscalls to follow this better, and let's see if this
strictness helps us in the future.

OpenBSD-Commit-ID: 48081f00db7518e3b712a49dca06efc2a5428075

6 years agoupstream: asprintf returns -1, not an arbitrary value < 0. Also
deraadt@openbsd.org [Fri, 28 Jun 2019 05:44:09 +0000 (05:44 +0000)] 
upstream: asprintf returns -1, not an arbitrary value < 0. Also

upon error the (very sloppy specification) leaves an undefined value in *ret,
so it is wrong to inspect it, the error condition is enough. discussed a
little with nicm, and then much more with millert until we were exasperated

OpenBSD-Commit-ID: 29258fa51edf8115d244b9d4b84028487bf8923e

6 years agoupstream: oops, from asou
deraadt@openbsd.org [Fri, 28 Jun 2019 01:23:50 +0000 (01:23 +0000)] 
upstream: oops, from asou

OpenBSD-Commit-ID: 702e765d1639b732370d8f003bb84a1c71c4d0c6

6 years agoupstream: Some asprintf() calls were checked < 0, rather than the
deraadt@openbsd.org [Thu, 27 Jun 2019 18:03:37 +0000 (18:03 +0000)] 
upstream: Some asprintf() calls were checked < 0, rather than the

precise == -1. ok millert nicm tb, etc

OpenBSD-Commit-ID: caecf8f57938685c04f125515b9f2806ad408d53

6 years agoupstream: fix NULL deference (bzero) on err
djm@openbsd.org [Thu, 27 Jun 2019 06:29:35 +0000 (06:29 +0000)] 
upstream: fix NULL deference (bzero) on err

=?UTF-8?q?or=20path=20added=20in=20last=20commit;=20spotted=20by=20Reynir?=
=?UTF-8?q?=20Bj=C3=B6rnsson?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ok deraadt@ markus@ tb@

OpenBSD-Commit-ID: b11b084bcc551b2c630560eb08618dd501027bbd

6 years agoUpdate README doc to include missing test cases
Jitendra Sharma [Fri, 21 Jun 2019 04:24:17 +0000 (09:54 +0530)] 
Update README doc to include missing test cases

Readme regress document is missing various individual tests,
which are supported currently. Update README to
include those test cases.

6 years agoupstream: Remove unneeded unlink of xauthfile o
dtucker@openbsd.org [Wed, 26 Jun 2019 22:29:43 +0000 (22:29 +0000)] 
upstream: Remove unneeded unlink of xauthfile o

=?UTF-8?q?n=20error=20path.=20=20From=20Erik=20Sj=C3=B6lund=20via=20githu?=
=?UTF-8?q?b,=20ok=20djm@=20deraadt@?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OpenBSD-Commit-ID: 62a4893cf83b29a4bbfedc40e7067c25c203e632

6 years agoupstream: fix mismatch proto/decl from key shielding change; spotted
djm@openbsd.org [Sun, 23 Jun 2019 12:21:46 +0000 (12:21 +0000)] 
upstream: fix mismatch proto/decl from key shielding change; spotted

via oss-fuzz

OpenBSD-Commit-ID: 1ea0ba05ded2c5557507bd844cd446e5c8b5b3b7

6 years agoupstream: adapt for key shielding API changes (const removal)
djm@openbsd.org [Fri, 21 Jun 2019 04:21:45 +0000 (04:21 +0000)] 
upstream: adapt for key shielding API changes (const removal)

OpenBSD-Regress-ID: 298890bc52f0cd09dba76dc1022fabe89bc0ded6

6 years agoupstream: Add protection for private keys at rest in RAM against
djm@openbsd.org [Fri, 21 Jun 2019 04:21:04 +0000 (04:21 +0000)] 
upstream: Add protection for private keys at rest in RAM against

speculation and memory sidechannel attacks like Spectre, Meltdown, Rowhammer
and Rambleed. This change encrypts private keys when they are not in use with
a symmetic key that is derived from a relatively large "prekey" consisting of
random data (currently 16KB).

Attackers must recover the entire prekey with high accuracy before
they can attempt to decrypt the shielded private key, but the current
generation of attacks have bit error rates that, when applied
cumulatively to the entire prekey, make this unlikely.

Implementation-wise, keys are encrypted "shielded" when loaded and then
automatically and transparently unshielded when used for signatures or
when being saved/serialised.

Hopefully we can remove this in a few years time when computer
architecture has become less unsafe.

been in snaps for a bit already; thanks deraadt@

ok dtucker@ deraadt@

OpenBSD-Commit-ID: 19767213c312e46f94b303a512ef8e9218a39bd4

6 years agoupstream: print the correct AuthorizedPrincipalsCommand rather than
djm@openbsd.org [Fri, 21 Jun 2019 03:19:59 +0000 (03:19 +0000)] 
upstream: print the correct AuthorizedPrincipalsCommand rather than

an uninitialised variable; spotted by dtucker@

OpenBSD-Commit-ID: 02802018784250f68202f01c8561de82e17b0638

6 years agoupstream: from tim: - for reput, it is remote-path which is
jmc@openbsd.org [Wed, 19 Jun 2019 20:12:44 +0000 (20:12 +0000)] 
upstream: from tim: - for reput, it is remote-path which is

optional, not local-path - sync help

from deraadt:
- prefer -R and undocument -r (but add a comment for future editors)

from schwarze:
- prefer -p and undocument -P (as above. the comment was schwarze's too)

more:
- add the -f flag to reput and reget
- sort help (i can;t remember who suggested this originally)

djm and deraadt were ok with earlier versions of this;
tim and schwarze ok

OpenBSD-Commit-ID: 3c699b53b46111f5c57eed4533f132e7e58bacdd

6 years agoupstream: check for convtime() refusing to accept times that
djm@openbsd.org [Fri, 14 Jun 2019 04:03:48 +0000 (04:03 +0000)] 
upstream: check for convtime() refusing to accept times that

resolve to LONG_MAX Reported by Kirk Wolf bz2977; ok dtucker

OpenBSD-Regress-ID: 15c9fe87be1ec241d24707006a31123d3a3117e0

6 years agoupstream: Add unit tests for user@host and URI parsing.
dtucker@openbsd.org [Sun, 28 Apr 2019 22:53:26 +0000 (22:53 +0000)] 
upstream: Add unit tests for user@host and URI parsing.

OpenBSD-Regress-ID: 69d5b6f278e04ed32377046f7692c714c2d07a68

6 years agoupstream: Add tests for sshd -T -C with Match.
dtucker@openbsd.org [Thu, 18 Apr 2019 18:57:16 +0000 (18:57 +0000)] 
upstream: Add tests for sshd -T -C with Match.

OpenBSD-Regress-ID: d4c34916fe20d717692f10ef50b5ae5a271c12c7

6 years agoInclude stdio.h for vsnprintf.
Darren Tucker [Sun, 16 Jun 2019 02:55:27 +0000 (12:55 +1000)] 
Include stdio.h for vsnprintf.

Patch from mforney at mforney.org.

6 years agoupstream rev 1.27: fix integer overflow.
Darren Tucker [Fri, 7 Jun 2019 23:07:04 +0000 (09:07 +1000)] 
upstream rev 1.27: fix integer overflow.

Cast bitcount to u_in64_t before bit shifting to prevent integer overflow
on 32bit platforms which cause incorrect results when adding a block
>=512M in size.  sha1 patch from ante84 at gmail.com via openssh github,
sha2 with djm@, ok tedu@

6 years agoupstream rev 1.25: add DEF_WEAK.
Darren Tucker [Fri, 7 Jun 2019 23:06:06 +0000 (09:06 +1000)] 
upstream rev 1.25: add DEF_WEAK.

Wrap blowfish, sha*, md5, and rmd160 so that internal calls go direct
ok deraadt@

6 years agoupstream rev 1.25: add sys/types.h
Darren Tucker [Fri, 7 Jun 2019 23:02:24 +0000 (09:02 +1000)] 
upstream rev 1.25: add sys/types.h

6 years agoupstream: Use explicit_bzero instead of memset
Darren Tucker [Fri, 7 Jun 2019 23:01:14 +0000 (09:01 +1000)] 
upstream: Use explicit_bzero instead of memset

in hash Final and End functions.  OK deraadt@ djm@

6 years agoupstream: slightly more instructive error message when the user
djm@openbsd.org [Fri, 14 Jun 2019 04:13:58 +0000 (04:13 +0000)] 
upstream: slightly more instructive error message when the user

specifies multiple -J options on the commandline. bz3015 ok dtucker@

OpenBSD-Commit-ID: 181c15a65cac3b575819bc8d9a56212c3c748179

6 years agoupstream: process agent requests for RSA certificate private keys using
djm@openbsd.org [Fri, 14 Jun 2019 03:51:47 +0000 (03:51 +0000)] 
upstream: process agent requests for RSA certificate private keys using

correct signature algorithm when requested. Patch from Jakub Jelen in bz3016
ok dtucker markus

OpenBSD-Commit-ID: 61f86efbeb4a1857a3e91298c1ccc6cf49b79624

6 years agoupstream: for public key authentication, check AuthorizedKeysFiles
djm@openbsd.org [Fri, 14 Jun 2019 03:39:59 +0000 (03:39 +0000)] 
upstream: for public key authentication, check AuthorizedKeysFiles

files before consulting AuthorizedKeysCommand; ok dtucker markus

OpenBSD-Commit-ID: 13652998bea5cb93668999c39c3c48e8429db8b3

6 years agoupstream: if passed a bad fd, log what it was
djm@openbsd.org [Fri, 14 Jun 2019 03:28:19 +0000 (03:28 +0000)] 
upstream: if passed a bad fd, log what it was

OpenBSD-Commit-ID: 582e2bd05854e49365195b58989b68ac67f09140

6 years agoupstream: Hostname->HostName cleanup; from lauri tirkkonen ok
jmc@openbsd.org [Wed, 12 Jun 2019 11:31:50 +0000 (11:31 +0000)] 
upstream: Hostname->HostName cleanup; from lauri tirkkonen ok

dtucker

OpenBSD-Commit-ID: 4ade73629ede63b691f36f9a929f943d4e7a44e4

6 years agoupstream: deraadt noticed some inconsistency in the way we denote
jmc@openbsd.org [Wed, 12 Jun 2019 05:53:21 +0000 (05:53 +0000)] 
upstream: deraadt noticed some inconsistency in the way we denote

the "Hostname" and "X11UseLocalhost" keywords; this makes things consistent
(effectively reversing my commit of yesterday);

ok deraadt markus djm

OpenBSD-Commit-ID: 255c02adb29186ac91dcf47dfad7adb1b1e54667

6 years agoupstream: consistent lettering for "HostName" keyword; from lauri
jmc@openbsd.org [Tue, 11 Jun 2019 13:39:40 +0000 (13:39 +0000)] 
upstream: consistent lettering for "HostName" keyword; from lauri

tirkkonen

OpenBSD-Commit-ID: 0c267a1257ed7482b13ef550837b6496e657d563

6 years agoTypo fixes in error messages.
Darren Tucker [Fri, 7 Jun 2019 14:10:59 +0000 (00:10 +1000)] 
Typo fixes in error messages.

Patch from knweiss at gmail.com via github pull req #97 (portable-
specific parts).

6 years agoupstream: Typo and spelling fixes in comments and error messages.
dtucker@openbsd.org [Fri, 7 Jun 2019 14:18:48 +0000 (14:18 +0000)] 
upstream: Typo and spelling fixes in comments and error messages.

Patch from knweiss at gmail.com via -portable.

OpenBSD-Commit-ID: 2577465442f761a39703762c4f87a8dfcb918b4b

6 years agoInclude missed bits from previous sync.
Darren Tucker [Fri, 7 Jun 2019 14:47:07 +0000 (00:47 +1000)] 
Include missed bits from previous sync.

6 years agoupstream: Check for user@host when parsing sftp target. This
dtucker@openbsd.org [Fri, 7 Jun 2019 03:47:12 +0000 (03:47 +0000)] 
upstream: Check for user@host when parsing sftp target. This

allows user@[1.2.3.4] to work without a path in addition to with one.
bz#2999, ok djm@

OpenBSD-Commit-ID: d989217110932490ba8ce92127a9a6838878928b

6 years agoupstream: Replace calls to ssh_malloc_init() by a static init of
otto@openbsd.org [Thu, 6 Jun 2019 05:13:13 +0000 (05:13 +0000)] 
upstream: Replace calls to ssh_malloc_init() by a static init of

malloc_options. Prepares for changes in the way malloc is initialized.  ok
guenther@ dtucker@

OpenBSD-Commit-ID: 154f4e3e174f614b09f792d4d06575e08de58a6b

6 years agoupstream: fix ssh-keysign fd handling problem introduced in r1.304
djm@openbsd.org [Fri, 31 May 2019 03:20:07 +0000 (03:20 +0000)] 
upstream: fix ssh-keysign fd handling problem introduced in r1.304

caused by a typo (STDIN_FILENO vs STDERR_FILENO)

OpenBSD-Commit-ID: 57a0b4be7bef23963afe24150e24bf014fdd9cb0

6 years agoupstream: Make the standard output messages of both methods of
lum@openbsd.org [Wed, 29 May 2019 08:30:26 +0000 (08:30 +0000)] 
upstream: Make the standard output messages of both methods of

changing a key pair's comments (using -c and -C) more applicable to both
methods. ok and suggestions djm@ dtucker@

OpenBSD-Commit-ID: b379338118109eb36e14a65bc0a12735205b3de6

6 years agoAlways clean up before and after utimensat test.
Darren Tucker [Fri, 7 Jun 2019 14:03:07 +0000 (00:03 +1000)] 
Always clean up before and after utimensat test.

6 years agoUpdate utimensat test.
Darren Tucker [Fri, 7 Jun 2019 13:47:37 +0000 (23:47 +1000)] 
Update utimensat test.

POSIX specifies that when given a symlink, AT_SYMLINK_NOFOLLOW should
update the symlink and not the destination.  The compat code doesn't
have a way to do this, so where possible it fails instead of following a
symlink when explicitly asked not to. Instead of checking for an explicit
failure, check that it does not update the destination, which both the
real and compat implmentations should honour.

Inspired by github pull req #125 from chutzpah at gentoo.org.

6 years agoHave pthread_create return errno on failure.
Darren Tucker [Fri, 7 Jun 2019 04:26:54 +0000 (14:26 +1000)] 
Have pthread_create return errno on failure.

According to POSIX, pthread_create returns the failure reason in
the non-zero function return code so make the fork wrapper do that.
Matches previous change.

6 years agopthread_create(3) returns positive values on failure.
Elliott Hughes [Thu, 25 Apr 2019 20:36:27 +0000 (13:36 -0700)] 
pthread_create(3) returns positive values on failure.

Found by inspection after finding similar bugs in other code used by
Android.

6 years agoallow s390 specific ioctl for ecc hardware support
Harald Freudenberger [Fri, 24 May 2019 08:11:15 +0000 (10:11 +0200)] 
allow s390 specific ioctl for ecc hardware support

Adding another s390 specific ioctl to be able to support ECC hardware
acceleration to the sandbox seccomp filter rules.

Now the ibmca openssl engine provides elliptic curve cryptography
support with the help of libica and CCA crypto cards. This is done via
jet another ioctl call to the zcrypt device driver and so there is a
need to enable this on the openssl sandbox.

Code is s390 specific and has been tested, verified and reviewed.

Please note that I am also the originator of the previous changes in
that area.  I posted these changes to Eduardo and he forwarded the
patches to the openssl community.

Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
Reviewed-by: Joerg Schmidbauer <jschmidb@de.ibm.com>
6 years agoopenssl-devel is obsoleted by libssl-devel
Sorin Adrian Savu [Sun, 26 May 2019 18:50:08 +0000 (21:50 +0300)] 
openssl-devel is obsoleted by libssl-devel

openssl-devel is no longer installable via the cygwin setup and
it's hidden by default, so you can't see the replacement very easy.

6 years agoupstream: tweak previous;
jmc@openbsd.org [Mon, 20 May 2019 06:01:59 +0000 (06:01 +0000)] 
upstream: tweak previous;

OpenBSD-Commit-ID: 42f39f22f53cfcb913bce401ae0f1bb93e08dd6c

6 years agoupstream: embiggen format buffer size for certificate serial number so
djm@openbsd.org [Mon, 20 May 2019 00:25:55 +0000 (00:25 +0000)] 
upstream: embiggen format buffer size for certificate serial number so

that it will fit a full 64 bit integer. bz#3012 from Manoel Domingues Junior

OpenBSD-Commit-ID: a51f3013056d05b976e5af6b978dcb9e27bbc12b

6 years agoupstream: When signing certificates with an RSA key, default to
djm@openbsd.org [Mon, 20 May 2019 00:20:35 +0000 (00:20 +0000)] 
upstream: When signing certificates with an RSA key, default to

using the rsa-sha2-512 signature algorithm. Certificates signed by RSA keys
will therefore be incompatible with OpenSSH < 7.2 unless the default is
overridden.

Document the ability of the ssh-keygen -t flag to override the
signature algorithm when signing certificates, and the new default.

ok deraadt@

OpenBSD-Commit-ID: 400c9c15013978204c2cb80f294b03ae4cfc8b95

6 years agoAdd no-op implementation of pam_putenv.
Darren Tucker [Fri, 17 May 2019 03:14:12 +0000 (13:14 +1000)] 
Add no-op implementation of pam_putenv.

Some platforms such as HP-UX do not have pam_putenv.  Currently the
calls are ifdef'ed out, but a new one was recently added.  Remove the
ifdefs and add a no-op implementation.  bz#3008, ok djm.

6 years agoUse the correct macro for SSH_ALLOWED_CA_SIGALGS.
Darren Tucker [Fri, 17 May 2019 02:42:17 +0000 (12:42 +1000)] 
Use the correct macro for SSH_ALLOWED_CA_SIGALGS.

6 years agoFix building w/out ECC.
Darren Tucker [Fri, 17 May 2019 00:54:51 +0000 (10:54 +1000)] 
Fix building w/out ECC.

Ifdef out ECC specific code so that that it'll build against an OpenSSL
configured w/out ECC.  With & ok djm@

6 years agoConditionalize ECDH methods in CA algos.
Darren Tucker [Fri, 17 May 2019 00:50:29 +0000 (10:50 +1000)] 
Conditionalize ECDH methods in CA algos.

When building against an OpenSSL configured without ECC, don't include
those algos in CASignatureAlgorithms.  ok djm@

6 years agoupstream: Move a variable declaration to the block where it's used
dtucker@openbsd.org [Thu, 16 May 2019 08:47:27 +0000 (08:47 +0000)] 
upstream: Move a variable declaration to the block where it's used

to make things a little tidier for -portable.

OpenBSD-Commit-ID: 616379861be95619e5358768b7dee4793e2f3a75

6 years agoupstream: When doing the fork+exec'ing for ssh-keysign, rearrange
deraadt@openbsd.org [Wed, 15 May 2019 04:43:31 +0000 (04:43 +0000)] 
upstream: When doing the fork+exec'ing for ssh-keysign, rearrange

the socket into fd3, so as to not mistakenly leak other fd forward
accidentally. ok djm

OpenBSD-Commit-ID: 24cc753f5aa2c6a7d0fbf62766adbc75cd785296

6 years agoupstream: Delete some .Sx macros that were used in a wrong way.
schwarze@openbsd.org [Tue, 14 May 2019 12:47:17 +0000 (12:47 +0000)] 
upstream: Delete some .Sx macros that were used in a wrong way.

Part of a patch from Stephen Gregoratto <dev at sgregoratto dot me>.

OpenBSD-Commit-ID: 15501ed13c595f135e7610b1a5d8345ccdb513b7

6 years agoupstream: For PermitOpen violations add the remote host and port to
florian@openbsd.org [Fri, 10 May 2019 18:55:17 +0000 (18:55 +0000)] 
upstream: For PermitOpen violations add the remote host and port to

be able to find out from where the request was comming.

Add the same logging for PermitListen violations which where not
logged at all.

Pointed out by Robert Kisteleki (robert AT ripe.net)

input markus
OK deraadt

OpenBSD-Commit-ID: 8a7d0f1b7175504c0d1dca8d9aca1588b66448c8

6 years agoAdd OpenSSL 1.1.1 to the supported list.
Darren Tucker [Wed, 15 May 2019 21:53:20 +0000 (07:53 +1000)] 
Add OpenSSL 1.1.1 to the supported list.

Clarify the language around prngd and egd.

6 years agoFix typo in man page formatter selector.
Darren Tucker [Wed, 15 May 2019 06:19:14 +0000 (16:19 +1000)] 
Fix typo in man page formatter selector.

6 years agoUse "doc" man page format if mandoc present.
Darren Tucker [Fri, 10 May 2019 05:04:42 +0000 (15:04 +1000)] 
Use "doc" man page format if mandoc present.

Previously configure would not select the "doc" man page format if
mandoc was present but nroff was not.  This checks for mandoc first
and removes a now-superflous AC_PATH_PROG.  Based on a patch from
vehk at vehk.de and feedback from schwarze at usta.de.

6 years agoupstream: Use the correct (according to POSIX) format for
dtucker@openbsd.org [Fri, 3 May 2019 06:06:30 +0000 (06:06 +0000)] 
upstream: Use the correct (according to POSIX) format for

left-justification in snmprintf. bz#3002, patch from velemas at gmail.com, ok
markus@.

OpenBSD-Commit-ID: 65d252b799be0cc8f68b6c47cece0a57bb00fea7

6 years agoupstream: Free channel objects on exit path. Patch from markus at
dtucker@openbsd.org [Fri, 3 May 2019 04:11:00 +0000 (04:11 +0000)] 
upstream: Free channel objects on exit path. Patch from markus at

blueflash.cc, ok deraadt

OpenBSD-Commit-ID: dbe4db381603909482211ffdd2b48abd72169117

6 years agoupstream: Free host on exit path. Patch from markus at
dtucker@openbsd.org [Fri, 3 May 2019 03:27:38 +0000 (03:27 +0000)] 
upstream: Free host on exit path. Patch from markus at

blueflash.cc, ok djm@

OpenBSD-Commit-ID: c54e9945d93c4ce28350d8b9fa8b71f744ef2b5a

6 years agoupstream: Wrap XMSS including in ifdef. Patch from markus at
dtucker@openbsd.org [Fri, 3 May 2019 03:25:18 +0000 (03:25 +0000)] 
upstream: Wrap XMSS including in ifdef. Patch from markus at

blueflash.cc, ok djm

OpenBSD-Commit-ID: e3b34fc35cf12d33bde91ac03633210a3bc0f8b5

6 years agoupstream: Import regenerated moduli.
dtucker@openbsd.org [Fri, 26 Apr 2019 08:37:17 +0000 (08:37 +0000)] 
upstream: Import regenerated moduli.

OpenBSD-Commit-ID: db6375fc302e3bdf07d96430c63c991b2c2bd3ff

6 years agoupstream: Use the LogLevel typdef instead of int where appropriate. Patch from Markus...
dtucker@openbsd.org [Tue, 23 Apr 2019 11:56:41 +0000 (11:56 +0000)] 
upstream: Use the LogLevel typdef instead of int where appropriate. Patch from Markus Schmidt via openssh-unix-dev, ok markus@

OpenBSD-Commit-ID: 4c0f0f458e3da7807806b35e3eb5c1e8403c968a

6 years agoupstream: Document new default RSA key size. From
dtucker@openbsd.org [Fri, 19 Apr 2019 05:47:44 +0000 (05:47 +0000)] 
upstream: Document new default RSA key size. From

sebastiaanlokhorst at gmail.com via bz#2997.

OpenBSD-Commit-ID: bdd62ff5d4d649d2147904e91bf7cefa82fe11e1

6 years agoupstream: When running sshd -T, assume any attibute not provided by
dtucker@openbsd.org [Thu, 18 Apr 2019 18:56:16 +0000 (18:56 +0000)] 
upstream: When running sshd -T, assume any attibute not provided by

-C does not match, which allows it to work when sshd_config contains a Match
directive with or without -C.  bz#2858, ok djm@

OpenBSD-Commit-ID: 1a701f0a33e3bc96753cfda2fe0b0378520b82eb

6 years agoupstream: Remove crc32.{c,h} which were only used by the now-gone
dtucker@openbsd.org [Thu, 18 Apr 2019 07:32:56 +0000 (07:32 +0000)] 
upstream: Remove crc32.{c,h} which were only used by the now-gone

SSH1 protocol. Patch from yumkam at gmail.com, ok deraadt.

OpenBSD-Commit-ID: cceda5876c5ba6b4d8abcd52335329198cee3240

6 years agoRemove unused variables from RLIMIT_NOFILE test.
Darren Tucker [Tue, 30 Apr 2019 02:27:57 +0000 (12:27 +1000)] 
Remove unused variables from RLIMIT_NOFILE test.

6 years agoImport regenerated moduli.
Darren Tucker [Fri, 26 Apr 2019 08:38:27 +0000 (18:38 +1000)] 
Import regenerated moduli.

6 years agoWhitespace resync w/OpenBSD.
Darren Tucker [Fri, 26 Apr 2019 08:22:10 +0000 (18:22 +1000)] 
Whitespace resync w/OpenBSD.

Patch from markus at blueflash.cc via openssh-unix-dev.

6 years agoDon't install duplicate STREAMS modules on Solaris
Darren Tucker [Fri, 26 Apr 2019 08:06:34 +0000 (18:06 +1000)] 
Don't install duplicate STREAMS modules on Solaris

Check if STREAMS modules are already installed on pty before installing
since when compiling with XPG>=4 they will likely be installed already.
Prevents hangs and duplicate lines on the terminal.  bz#2945 and bz#2998,
patch from djm@

6 years agomakedepend V_8_0_P1
Damien Miller [Wed, 17 Apr 2019 22:52:57 +0000 (08:52 +1000)] 
makedepend

6 years agosecond thoughts: leave README in place
Damien Miller [Fri, 5 Apr 2019 18:29:51 +0000 (11:29 -0700)] 
second thoughts: leave README in place

A number of contrib/* files refer to the existing README so let's leave
it in place for release and add the new markdown version in parallel.

I'll get rid of README after release.

6 years agoRevert "rewrite README"
Damien Miller [Fri, 5 Apr 2019 18:29:31 +0000 (11:29 -0700)] 
Revert "rewrite README"

This reverts commit 9444d82678cb7781820da4d1c23b3c2b9fb1e12f.

6 years agorewrite README
Damien Miller [Fri, 5 Apr 2019 18:21:48 +0000 (11:21 -0700)] 
rewrite README

Include basic build instructions and comments on commonly-used build-
time flags, links to the manual pages and other resources.

Now in Markdown format for better viewing on github, etc.

6 years agoupdate versions
Damien Miller [Thu, 4 Apr 2019 16:41:52 +0000 (03:41 +1100)] 
update versions

6 years agoupstream: openssh-8.0
djm@openbsd.org [Wed, 3 Apr 2019 15:48:45 +0000 (15:48 +0000)] 
upstream: openssh-8.0

OpenBSD-Commit-ID: 5aafdf218679dab982fea20771afd643be9a127b

6 years agosession: Do not use removed API
Damien Miller [Wed, 3 Apr 2019 15:47:40 +0000 (02:47 +1100)] 
session: Do not use removed API

from Jakub Jelen

6 years agoupstream: when logging/fataling on error, include a bit more detail
djm@openbsd.org [Fri, 29 Mar 2019 11:31:40 +0000 (11:31 +0000)] 
upstream: when logging/fataling on error, include a bit more detail

than just the function name and the error message

OpenBSD-Commit-ID: dd72d7eba2215fcb89be516c378f633ea5bcca9f

6 years agoRemove "struct ssh" from sys_auth_record_login.
Darren Tucker [Tue, 2 Apr 2019 19:27:45 +0000 (06:27 +1100)] 
Remove "struct ssh" from sys_auth_record_login.

It's not needed, and is not available from the call site in loginrec.c
Should only affect AIX, spotted by Kevin Brott.

6 years agoAdapt custom_failed_login to new prototype.
Darren Tucker [Tue, 2 Apr 2019 07:21:35 +0000 (18:21 +1100)] 
Adapt custom_failed_login to new prototype.

Spotted by Kevin Brott.

6 years agoAdd includes.h for compat layer.
Darren Tucker [Mon, 1 Apr 2019 09:07:23 +0000 (20:07 +1100)] 
Add includes.h for compat layer.

Should fix build on AIX 7.2.

6 years agoStop USL compilers for erroring with "integral constant expression expected"
Tim Rice [Mon, 1 Apr 2019 05:14:22 +0000 (22:14 -0700)] 
Stop USL compilers for erroring with "integral constant expression expected"

6 years agoOnly use O_NOFOLLOW in fchownat and fchmodat if defined
Tim Rice [Mon, 1 Apr 2019 02:22:19 +0000 (19:22 -0700)] 
Only use O_NOFOLLOW in fchownat and fchmodat if defined

6 years agoAdjust softhsm2 path on Fedora Linux for regress
Jakub Jelen [Fri, 29 Mar 2019 11:29:41 +0000 (12:29 +0100)] 
Adjust softhsm2 path on Fedora Linux for regress

The SoftHSM lives in Fedora in /usr/lib64/pkcs11/libsofthsm2.so

6 years agoOnly use O_NOFOLLOW in utimensat if defined.
Darren Tucker [Wed, 27 Mar 2019 22:26:14 +0000 (09:26 +1100)] 
Only use O_NOFOLLOW in utimensat if defined.

Fixes build on systems that don't have it (Solaris <=9)  Found by
Tom G. Christensen.

6 years agodrop old Cygwin considerations
Corinna Vinschen [Wed, 27 Mar 2019 17:18:21 +0000 (18:18 +0100)] 
drop old Cygwin considerations

- Cygwin supports non-DOS characters in filenames
- Cygwin does not support Windows XP anymore

Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
6 years agoupstream: fix interaction between ClientAliveInterval and RekeyLimit
djm@openbsd.org [Wed, 27 Mar 2019 09:29:14 +0000 (09:29 +0000)] 
upstream: fix interaction between ClientAliveInterval and RekeyLimit

that could cause connection to close incorrectly; Report and patch from Jakub
Jelen in bz#2757; ok dtucker@ markus@

OpenBSD-Commit-ID: 17229a8a65bd8e6c2080318ec2b7a61e1aede3fb

6 years agoupstream: Fix authentication failures when "AuthenticationMethods
djm@openbsd.org [Mon, 25 Mar 2019 22:34:52 +0000 (22:34 +0000)] 
upstream: Fix authentication failures when "AuthenticationMethods

any" in a Match block overrides a more restrictive global default.

Spotted by jmc@, ok markus@

OpenBSD-Commit-ID: a90a4fe2ab81d0eeeb8fdfc21af81f7eabda6666

6 years agoupstream: whitespace
djm@openbsd.org [Mon, 25 Mar 2019 22:33:44 +0000 (22:33 +0000)] 
upstream: whitespace

OpenBSD-Commit-ID: 106e853ae8a477e8385bc53824d3884a8159db07

6 years agoupstream: Expand comment to document rationale for default key
dtucker@openbsd.org [Mon, 25 Mar 2019 16:19:44 +0000 (16:19 +0000)] 
upstream: Expand comment to document rationale for default key

sizes. "seems worthwhile" deraadt.

OpenBSD-Commit-ID: 72e5c0983d7da1fb72f191870f36cb58263a2456

6 years agoupstream: Increase the default RSA key size to 3072 bits. Based on
dtucker@openbsd.org [Mon, 25 Mar 2019 15:49:00 +0000 (15:49 +0000)] 
upstream: Increase the default RSA key size to 3072 bits. Based on

the estimates from NIST Special Publication 800-57, 3k bits provides security
equivalent to 128 bits which is the smallest symmetric cipher we enable by
default. ok markus@ deraadt@

OpenBSD-Commit-ID: 461dd32ebe808f88f4fc3ec74749b0e6bef2276b

6 years agoupstream: full stop in the wrong place;
jmc@openbsd.org [Fri, 22 Mar 2019 20:58:34 +0000 (20:58 +0000)] 
upstream: full stop in the wrong place;

OpenBSD-Commit-ID: 478a0567c83553a2aebf95d0f1bd67ac1b1253e4

6 years agoupstream: benno helped me clean up the tcp forwarding section;
jmc@openbsd.org [Sat, 16 Mar 2019 19:14:21 +0000 (19:14 +0000)] 
upstream: benno helped me clean up the tcp forwarding section;

OpenBSD-Commit-ID: d4bec27edefde636fb632b7f0b7c656b9c7b7f08

6 years agoupstream: fix use-after-free in ssh-pkcs11; found by hshoexer w/AFL
markus@openbsd.org [Fri, 8 Mar 2019 17:24:43 +0000 (17:24 +0000)] 
upstream: fix use-after-free in ssh-pkcs11; found by hshoexer w/AFL

OpenBSD-Commit-ID: febce81cca72b71f70513fbee4ff52ca050f675c

6 years agoFix build when configured --without-openssl.
Darren Tucker [Wed, 13 Mar 2019 23:17:28 +0000 (10:17 +1100)] 
Fix build when configured --without-openssl.

ok djm@

6 years agoOn Cygwin run sshd as SYSTEM where possible.
Darren Tucker [Wed, 13 Mar 2019 21:51:17 +0000 (08:51 +1100)] 
On Cygwin run sshd as SYSTEM where possible.

Seteuid now creates user token using S4U.  We don't create a token
from scratch anymore, so we don't need the "Create a process token"
privilege.  The service can run under SYSTEM again...

...unless Cygwin is running on Windows Vista or Windows 7 in the
WOW64 32 bit emulation layer.  It turns out that WOW64 on these systems
didn't implement MsV1_0 S4U Logon so we still need the fallback
to NtCreateToken for these systems.

Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
6 years agoReplace alloca with xcalloc.
Darren Tucker [Tue, 12 Mar 2019 23:49:16 +0000 (10:49 +1100)] 
Replace alloca with xcalloc.

The latter checks for memory exhaustion and integer overflow and may be
at a less predictable place.  Sanity check by vinschen at redhat.com, ok
djm@

6 years agoUse Cygwin-specific matching only for users+groups.
Darren Tucker [Mon, 11 Mar 2019 22:19:19 +0000 (09:19 +1100)] 
Use Cygwin-specific matching only for users+groups.

Patch from vinschen at redhat.com, updated a little by me.

6 years agoupstream: Move checks for lists of users or groups into their own
dtucker@openbsd.org [Wed, 6 Mar 2019 22:14:23 +0000 (22:14 +0000)] 
upstream: Move checks for lists of users or groups into their own

function. This is a no-op on OpenBSD but will make things easier in
-portable, eg on systems where these checks should be case-insensitive.  ok
djm@

OpenBSD-Commit-ID: 8bc9c8d98670e23f8eaaaefe29c1f98e7ba0487e

6 years agoupstream: Reset last-seen time when sending a keepalive. Prevents
dtucker@openbsd.org [Wed, 6 Mar 2019 21:06:59 +0000 (21:06 +0000)] 
upstream: Reset last-seen time when sending a keepalive. Prevents

sending two keepalives successively and prematurely terminating connection
when ClientAliveCount=1.  While there, collapse two similar tests into one.
ok markus@

OpenBSD-Commit-ID: 043670d201dfe222537a2a4bed16ce1087de5ddd

6 years agoupstream: PKCS#11 support is no longer limited to RSA; ok benno@
naddy@openbsd.org [Tue, 5 Mar 2019 16:17:12 +0000 (16:17 +0000)] 
upstream: PKCS#11 support is no longer limited to RSA; ok benno@

kn@

OpenBSD-Commit-ID: 1a9bec64d530aed5f434a960e7515a3e80cbc826

6 years agoupstream: in ssh_set_newkeys(), mention the direction that we're
djm@openbsd.org [Fri, 1 Mar 2019 03:29:32 +0000 (03:29 +0000)] 
upstream: in ssh_set_newkeys(), mention the direction that we're

keying in debug messages. Previously it would be difficult to tell which
direction it was talking about

OpenBSD-Commit-ID: c2b71bfcceb2a7389b9d0b497fb2122a406a522d

6 years agoupstream: Fix two race conditions in sshd relating to SIGHUP:
djm@openbsd.org [Fri, 1 Mar 2019 02:32:39 +0000 (02:32 +0000)] 
upstream: Fix two race conditions in sshd relating to SIGHUP:

1. Recently-forked child processes will briefly remain listening to
  listen_socks. If the main server sshd process completes its restart
  via execv() before these sockets are closed by the child processes
  then it can fail to listen at the desired addresses/ports and/or
  fail to restart.

2. When a SIGHUP is received, there may be forked child processes that
  are awaiting their reexecution state. If the main server sshd
  process restarts before passing this state, these child processes
  will yield errors and use a fallback path of reading the current
  sshd_config from the filesystem rather than use the one that sshd
  was started with.

To fix both of these cases, we reuse the startup_pipes that are shared
between the main server sshd and forked children. Previously this was
used solely to implement tracking of pre-auth child processes for
MaxStartups, but this extends the messaging over these pipes to include
a child->parent message that the parent process is safe to restart. This
message is sent from the child after it has completed its preliminaries:
closing listen_socks and receiving its reexec state.

bz#2953, reported by Michal Koutný; ok markus@ dtucker@

OpenBSD-Commit-ID: 7df09eacfa3ce13e9a7b1e9f17276ecc924d65ab