]> git.ipfire.org Git - thirdparty/openssh-portable.git/log
thirdparty/openssh-portable.git
8 years agoupstream commit
djm@openbsd.org [Sun, 6 Nov 2016 05:46:37 +0000 (05:46 +0000)] 
upstream commit

Validate address ranges for AllowUser/DenyUsers at
configuration load time and refuse to accept bad ones. It was previously
possible to specify invalid CIDR address ranges (e.g. djm@127.1.2.3/55) and
these would always match.

Thanks to Laurence Parry for a detailed bug report. ok markus (for
a previous diff version)

Upstream-ID: 9dfcdd9672b06e65233ea4434c38226680d40bfb

8 years agoupstream commit
djm@openbsd.org [Fri, 28 Oct 2016 03:33:52 +0000 (03:33 +0000)] 
upstream commit

Improve pkcs11_add_provider() logging: demote some
excessively verbose error()s to debug()s, include PKCS#11 provider name and
slot in log messages where possible. bz#2610, based on patch from Jakub Jelen

Upstream-ID: 3223ef693cfcbff9079edfc7e89f55bf63e1973d

8 years agoUse ptrace(PT_DENY_ATTACH, ..) on OS X.
Darren Tucker [Mon, 31 Oct 2016 21:12:33 +0000 (08:12 +1100)] 
Use ptrace(PT_DENY_ATTACH, ..) on OS X.

8 years agoUnbreak AES-CTR ciphers on old (~0.9.8) OpenSSL
Damien Miller [Fri, 28 Oct 2016 03:34:07 +0000 (14:34 +1100)] 
Unbreak AES-CTR ciphers on old (~0.9.8) OpenSSL

ok dtucker@

8 years agoMove OPENSSL_NO_RIPEMD160 to compat.
Darren Tucker [Fri, 28 Oct 2016 03:26:58 +0000 (14:26 +1100)] 
Move OPENSSL_NO_RIPEMD160 to compat.

Move OPENSSL_NO_RIPEMD160 to compat and add ifdefs to mac.c around the
ripemd160 MACs.

8 years agoCheck if RIPEMD160 is disabled in OpenSSL.
Darren Tucker [Fri, 28 Oct 2016 02:52:31 +0000 (13:52 +1100)] 
Check if RIPEMD160 is disabled in OpenSSL.

8 years agoSkip ssh1 specfic ciphers.
Darren Tucker [Fri, 28 Oct 2016 02:38:19 +0000 (13:38 +1100)] 
Skip ssh1 specfic ciphers.

cipher-3des1.c and cipher-bf1.c are specific to sshv1 so don't even try
to compile them when Protocol 1 is not enabled.

8 years agoupstream commit
jsg@openbsd.org [Tue, 25 Oct 2016 04:08:13 +0000 (04:08 +0000)] 
upstream commit

Fix logic in add_local_forward() that inverted a test
when code was refactored out into bind_permitted().  This broke ssh port
forwarding for non-priv ports as a non root user.

ok dtucker@ 'looks good' deraadt@

Upstream-ID: ddb8156ca03cc99997de284ce7777536ff9570c9

8 years agoupstream commit
dtucker@openbsd.org [Mon, 24 Oct 2016 01:09:17 +0000 (01:09 +0000)] 
upstream commit

Remove dead breaks, found via opencoverage.net.  ok
deraadt@

Upstream-ID: ad9cc655829d67fad219762810770787ba913069

8 years agoUse !=NULL instead of >0 for getdefaultproj.
Darren Tucker [Tue, 25 Oct 2016 21:43:25 +0000 (08:43 +1100)] 
Use !=NULL instead of >0 for getdefaultproj.

getdefaultproj() returns a pointer so test it for NULL inequality
instead of >0.  Fixes compiler warning and is more correct.  Patch from
David Binderman.

8 years agoupstream commit
dtucker@openbsd.org [Sun, 23 Oct 2016 22:04:05 +0000 (22:04 +0000)] 
upstream commit

Factor out "can bind to low ports" check into its own function.  This will
make it easier for Portable to support platforms with permissions models
other than uid==0 (eg bz#2625).  ok djm@, "doesn't offend me too much"
deraadt@.

Upstream-ID: 86213df4183e92b8f189a6d2dac858c994bfface

8 years agoupstream commit
dtucker@openbsd.org [Wed, 19 Oct 2016 23:21:56 +0000 (23:21 +0000)] 
upstream commit

When tearing down ControlMaster connecctions, don't
pollute stderr when LogLevel=quiet.  Patch from Tim Kuijsten via tech@.

Upstream-ID: d9b3a68b2a7c2f2fc7f74678e29a4618d55ceced

8 years agoWrap stdint.h include in ifdef.
Darren Tucker [Sun, 23 Oct 2016 22:06:18 +0000 (09:06 +1100)] 
Wrap stdint.h include in ifdef.

8 years agoFix formatting.
Darren Tucker [Thu, 20 Oct 2016 22:46:46 +0000 (09:46 +1100)] 
Fix formatting.

8 years agoUpdate links to https.
Darren Tucker [Thu, 20 Oct 2016 19:55:58 +0000 (06:55 +1100)] 
Update links to https.

www.openssh.com now supports https and ftp.openbsd.org no longer
supports ftp.  Make all links to these https.

8 years agoUpdate host key generation examples.
Darren Tucker [Thu, 20 Oct 2016 19:48:46 +0000 (06:48 +1100)] 
Update host key generation examples.

Remove ssh1 host key generation, add ssh-keygen -A

8 years agoUpdate links.
Darren Tucker [Thu, 20 Oct 2016 18:22:55 +0000 (05:22 +1100)] 
Update links.

Make links to openssh.com HTTPS now that it's supported, point release
notes link to the HTML release notes page, and update a couple of other
links and bits of text.

8 years agoRemote channels .orig and .rej files.
Darren Tucker [Wed, 19 Oct 2016 16:42:09 +0000 (03:42 +1100)] 
Remote channels .orig and .rej files.

These files were incorrectly added during an OpenBSD sync.

8 years agoupstream commit
dtucker@openbsd.org [Tue, 18 Oct 2016 17:32:54 +0000 (17:32 +0000)] 
upstream commit

Remove channel_input_port_forward_request(); the only caller
was the recently-removed SSH1 server code so it's now dead code.  ok markus@

Upstream-ID: 05453983230a1f439562535fec2818f63f297af9

8 years agoupstream commit
millert@openbsd.org [Tue, 18 Oct 2016 12:41:22 +0000 (12:41 +0000)] 
upstream commit

Install a signal handler for tty-generated signals and
wait for the ssh child to suspend before suspending sftp.  This lets ssh
restore the terminal mode as needed when it is suspended at the password
prompt.  OK dtucker@

Upstream-ID: a31c1f42aa3e2985dcc91e46e6a17bd22e372d69

8 years agoupstream commit
jmc@openbsd.org [Sat, 15 Oct 2016 19:56:25 +0000 (19:56 +0000)] 
upstream commit

various formatting fixes, specifically removing Dq;

Upstream-ID: 81e85df2b8e474f5f93d66e61d9a4419ce87347c

8 years agoImport readpassphrase.c rev 1.26.
Darren Tucker [Tue, 18 Oct 2016 16:26:09 +0000 (03:26 +1100)] 
Import readpassphrase.c rev 1.26.

Author: miller@openbsd.org:
Avoid generate SIGTTOU when restoring the terminal mode.  If we get
SIGTTOU it means the process is not in the foreground process group
which, in most cases, means that the shell has taken control of the tty.
Requiring the user the fg the process in this case doesn't make sense
and can result in both SIGTSTP and SIGTTOU being sent which can lead to
the process being suspended again immediately after being brought into
the foreground.

8 years agoImport readpassphrase.c rev 1.25.
Darren Tucker [Tue, 18 Oct 2016 16:23:16 +0000 (03:23 +1100)] 
Import readpassphrase.c rev 1.25.

Wrap <readpassphrase.h> so internal calls go direct and
readpassphrase is weak.

(DEF_WEAK is a no-op in portable.)

8 years agoMove DEF_WEAK into defines.h.
Darren Tucker [Fri, 14 Oct 2016 18:51:12 +0000 (05:51 +1100)] 
Move DEF_WEAK into defines.h.

As well pull in more recent changes from OpenBSD these will start to
arrive so put it where the definition is shared.

8 years agoRemove do_pam_set_tty which is dead code.
Darren Tucker [Fri, 14 Oct 2016 17:34:46 +0000 (04:34 +1100)] 
Remove do_pam_set_tty which is dead code.

The callers of do_pam_set_tty were removed in 2008, so this is now dead
code.  bz#2604, pointed out by jjelen at redhat.com.

8 years agounbreak principals-command test
Damien Miller [Thu, 13 Oct 2016 07:53:43 +0000 (18:53 +1100)] 
unbreak principals-command test

Undo inconsistetly updated variable name.

8 years agoupstream commit
djm@openbsd.org [Tue, 11 Oct 2016 21:49:54 +0000 (21:49 +0000)] 
upstream commit

fix the KEX fuzzer - the previous method of obtaining the
packet contents was broken. This now uses the new per-packet input hook, so
it sees exact post-decrypt packets and doesn't have to pass packet integrity
checks. ok markus@

Upstream-Regress-ID: 402fb6ffabd97de590e8e57b25788949dce8d2fd

8 years agoupstream commit
natano@openbsd.org [Thu, 6 Oct 2016 09:31:38 +0000 (09:31 +0000)] 
upstream commit

Move USER out of the way to unbreak the BUILDUSER
mechanism. ok tb

Upstream-Regress-ID: 74ab9687417dd071d62316eaadd20ddad1d5af3c

8 years agoupstream commit
bluhm@openbsd.org [Fri, 30 Sep 2016 11:55:20 +0000 (11:55 +0000)] 
upstream commit

In ssh tests set REGRESS_FAIL_EARLY with ?= so that the
environment can change it. OK djm@

Upstream-Regress-ID: 77bcb50e47b68c7209c7f0a5a020d73761e5143b

8 years agoupstream commit
djm@openbsd.org [Tue, 11 Oct 2016 21:47:45 +0000 (21:47 +0000)] 
upstream commit

Add a per-packet input hook that is called with the
decrypted packet contents. This will be used for fuzzing; ok markus@

Upstream-ID: a3221cee6b1725dd4ae1dd2c13841b4784cb75dc

8 years agoupstream commit
markus@openbsd.org [Mon, 10 Oct 2016 19:28:48 +0000 (19:28 +0000)] 
upstream commit

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

Upstream-ID: 43649ae12a27ef94290db16d1a98294588b75c05

8 years agoImport rev 1.24 from OpenBSD.
Darren Tucker [Wed, 12 Oct 2016 17:07:20 +0000 (04:07 +1100)] 
Import rev 1.24 from OpenBSD.

revision 1.24
date: 2013/11/24 23:51:29;  author: deraadt;  state: Exp;  lines: +4 -4;
most obvious unsigned char casts for ctype
ok jca krw ingo

8 years agoImport rev 1.23 from OpenBSD. Fixes bz#2619.
Darren Tucker [Wed, 12 Oct 2016 17:04:44 +0000 (04:04 +1100)] 
Import rev 1.23 from OpenBSD.  Fixes bz#2619.

revision 1.23
date: 2010/05/14 13:30:34;  author: millert;  state: Exp;  lines: +41 -39;
Defer installing signal handlers until echo is disabled so that we
get suspended normally when not the foreground process.  Fix potential
infinite loop when restoring terminal settings if process is in the
background when restore occurs.  OK miod@

8 years agoIf we don't have TCSASOFT, define it to zero.
Darren Tucker [Wed, 12 Oct 2016 16:53:51 +0000 (03:53 +1100)] 
If we don't have TCSASOFT, define it to zero.

This makes it a no-op when we use it below, which allows us to re-sync
those lines with the upstream and make future updates easier.

8 years agoupstream commit
jmc@openbsd.org [Fri, 7 Oct 2016 14:41:52 +0000 (14:41 +0000)] 
upstream commit

tidy up the formatting in this file. more specifically,
replace .Dq, which looks appalling, with .Cm, where appropriate;

Upstream-ID: ff8e90aa0343d9bb56f40a535e148607973cc738

8 years agoupstream commit
djm@openbsd.org [Tue, 4 Oct 2016 21:34:40 +0000 (21:34 +0000)] 
upstream commit

add a comment about implicitly-expected checks to
sshkey_ec_validate_public()

Upstream-ID: 74a7f71c28f7c13a50f89fc78e7863b9cd61713f

8 years agoupstream commit
djm@openbsd.org [Fri, 30 Sep 2016 20:24:46 +0000 (20:24 +0000)] 
upstream commit

fix some -Wpointer-sign warnings in the new mux proxy; ok
markus@

Upstream-ID: b1ba7b3769fbc6b7f526792a215b0197f5e55dfd

8 years agoupstream commit
bluhm@openbsd.org [Wed, 28 Sep 2016 20:09:52 +0000 (20:09 +0000)] 
upstream commit

Add a makefile rule to create the ssh library when
regress needs it.  This allows to run the ssh regression tests without doing
a "make build" before. Discussed with dtucker@ and djm@; OK djm@

Upstream-Regress-ID: ce489bd53afcd471225a125b4b94565d4717c025

8 years agoupstream commit
bluhm@openbsd.org [Mon, 26 Sep 2016 21:34:38 +0000 (21:34 +0000)] 
upstream commit

Allow to run ssh regression tests as root.  If the user
is already root, the test should not expect that SUDO is set.  If ssh needs
another user, use sudo or doas to switch from root if necessary. OK dtucker@

Upstream-Regress-ID: b464e55185ac4303529e3e6927db41683aaeace2

8 years agoupstream commit
markus@openbsd.org [Fri, 30 Sep 2016 09:19:13 +0000 (09:19 +0000)] 
upstream commit

ssh proxy mux mode (-O proxy; idea from Simon Tatham): - mux
client speaks the ssh-packet protocol directly over unix-domain socket. - mux
server acts as a proxy, translates channel IDs and relays to the server. - no
filedescriptor passing necessary. - combined with unix-domain forwarding it's
even possible to run mux client   and server on different machines. feedback
& ok djm@

Upstream-ID: 666a2fb79f58e5c50e246265fb2b9251e505c25b

8 years agoupstream commit
djm@openbsd.org [Wed, 28 Sep 2016 21:44:52 +0000 (21:44 +0000)] 
upstream commit

put back some pre-auth zlib bits that I shouldn't have
removed - they are still used by the client. Spotted by naddy@

Upstream-ID: 80919468056031037d56a1f5b261c164a6f90dc2

8 years agoupstream commit
djm@openbsd.org [Wed, 28 Sep 2016 20:32:42 +0000 (20:32 +0000)] 
upstream commit

restore pre-auth compression support in the client -- the
previous commit was intended to remove it from the server only.

remove a few server-side pre-auth compression bits that escaped

adjust wording of Compression directive in sshd_config(5)

pointed out by naddy@ ok markus@

Upstream-ID: d23696ed72a228dacd4839dd9f2dec424ba2016b

8 years agoupstream commit
jmc@openbsd.org [Wed, 28 Sep 2016 17:59:22 +0000 (17:59 +0000)] 
upstream commit

use a separate TOKENS section, as we've done for
sshd_config(5); help/ok djm

Upstream-ID: 640e32b5e4838e4363738cdec955084b3579481d

8 years agoRemove portability support for mmap
Damien Miller [Wed, 28 Sep 2016 17:19:23 +0000 (03:19 +1000)] 
Remove portability support for mmap

We no longer need to wrap/replace mmap for portability now that
pre-auth compression has been removed from OpenSSH.

8 years agoupstream commit
djm@openbsd.org [Wed, 28 Sep 2016 16:33:06 +0000 (16:33 +0000)] 
upstream commit

Remove support for pre-authentication compression. Doing
compression early in the protocol probably seemed reasonable in the 1990s,
but today it's clearly a bad idea in terms of both cryptography (cf. multiple
compression oracle attacks in TLS) and attack surface.

Moreover, to support it across privilege-separation zlib needed
the assistance of a complex shared-memory manager that made the
required attack surface considerably larger.

Prompted by Guido Vranken pointing out a compiler-elided security
check in the shared memory manager found by Stack
(http://css.csail.mit.edu/stack/); ok deraadt@ markus@

NB. pre-auth authentication has been disabled by default in sshd
for >10 years.

Upstream-ID: 32af9771788d45a0779693b41d06ec199d849caf

8 years agoupstream commit
djm@openbsd.org [Mon, 26 Sep 2016 21:16:11 +0000 (21:16 +0000)] 
upstream commit

Avoid a theoretical signed integer overflow should
BN_num_bytes() ever violate its manpage and return a negative value. Improve
order of tests to avoid confusing increasingly pedantic compilers.

Reported by Guido Vranken from stack (css.csail.mit.edu/stack)
unstable optimisation analyser output.  ok deraadt@

Upstream-ID: f8508c830c86d8f36c113985e52bf8eedae23505

8 years agofix mdoc2man.awk formatting for top-level lists
Damien Miller [Tue, 27 Sep 2016 21:40:33 +0000 (07:40 +1000)] 
fix mdoc2man.awk formatting for top-level lists

Reported by Glenn Golden
Diagnosis and fix from Ingo Schwarze

8 years agoupstream commit
djm@openbsd.org [Thu, 22 Sep 2016 21:15:41 +0000 (21:15 +0000)] 
upstream commit

missing bit from previous commit

Upstream-ID: 438d5ed6338b28b46e822eb13eee448aca31df37

8 years agoupstream commit
jmc@openbsd.org [Thu, 22 Sep 2016 19:19:01 +0000 (19:19 +0000)] 
upstream commit

organise the token stuff into a separate section; ok
markus for an earlier version of the diff ok/tweaks djm

Upstream-ID: 81a6daa506a4a5af985fce7cf9e59699156527c8

8 years agoupstream commit
djm@openbsd.org [Thu, 22 Sep 2016 17:55:13 +0000 (17:55 +0000)] 
upstream commit

mention curve25519-sha256 KEX

Upstream-ID: 33ae1f433ce4795ffa6203761fbdf86e0d7ffbaf

8 years agoupstream commit
djm@openbsd.org [Thu, 22 Sep 2016 17:52:53 +0000 (17:52 +0000)] 
upstream commit

support plain curve25519-sha256 KEX algorithm now that it
is approaching standardisation (same algorithm is currently supported as
curve25519-sha256@libssh.org)

Upstream-ID: 5e2b6db2e72667048cf426da43c0ee3fc777baa2

8 years agoupstream commit
dtucker@openbsd.org [Thu, 22 Sep 2016 02:29:57 +0000 (02:29 +0000)] 
upstream commit

If ssh receives a PACKET_DISCONNECT during userauth it
will cause ssh_dispatch_run(DISPATCH_BLOCK, ...) to return without the
session being authenticated.  Check for this and exit if necessary.  ok djm@

Upstream-ID: b3afe126c0839d2eae6cddd41ff2ba317eda0903

8 years agoupstream commit
djm@openbsd.org [Wed, 21 Sep 2016 19:53:12 +0000 (19:53 +0000)] 
upstream commit

correctly return errors from kex_send_ext_info(). Fix from
Sami Farin via https://github.com/openssh/openssh-portable/pull/50

Upstream-ID: c85999af28aaecbf92cfa2283381df81e839b42c

8 years agoupstream commit
djm@openbsd.org [Wed, 21 Sep 2016 17:44:20 +0000 (17:44 +0000)] 
upstream commit

cast uint64_t for printf

Upstream-ID: 76d23e89419ccbd2320f92792a6d878211666ac1

8 years agoupstream commit
djm@openbsd.org [Wed, 21 Sep 2016 17:03:54 +0000 (17:03 +0000)] 
upstream commit

disable tests for affirmative negated match after backout of
match change

Upstream-Regress-ID: acebb8e5042f03d66d86a50405c46c4de0badcfd

8 years agoupstream commit
djm@openbsd.org [Wed, 21 Sep 2016 16:55:42 +0000 (16:55 +0000)] 
upstream commit

Revert two recent changes to negated address matching. The
new behaviour offers unintuitive surprises. We'll find a better way to deal
with single negated matches.

match.c 1.31:
> fix matching for pattern lists that contain a single negated match,
> e.g. "Host !example"
>
> report and patch from Robin Becker. bz#1918 ok dtucker@

addrmatch.c 1.11:
> fix negated address matching where the address list consists of a
> single negated match, e.g. "Match addr !192.20.0.1"
>
> Report and patch from Jakub Jelen. bz#2397 ok dtucker@

Upstream-ID: ec96c770f0f5b9a54e5e72fda25387545e9c80c6

8 years agoupstream commit
djm@openbsd.org [Wed, 21 Sep 2016 01:35:12 +0000 (01:35 +0000)] 
upstream commit

test all the AuthorizedPrincipalsCommand % expansions

Upstream-Regress-ID: 0a79a84dfaa59f958e46b474c3db780b454d30e3

8 years agoupstream commit
djm@openbsd.org [Wed, 21 Sep 2016 01:34:45 +0000 (01:34 +0000)] 
upstream commit

add a way for principals command to get see key ID and serial
too

Upstream-ID: 0d30978bdcf7e8eaeee4eea1b030eb2eb1823fcb

8 years agoupstream commit
djm@openbsd.org [Fri, 16 Sep 2016 06:09:31 +0000 (06:09 +0000)] 
upstream commit

add a note on kexfuzz' limitations

Upstream-Regress-ID: 03804d4a0dbc5163e1a285a4c8cc0a76a4e864ec

8 years agoupstream commit
djm@openbsd.org [Fri, 16 Sep 2016 01:01:41 +0000 (01:01 +0000)] 
upstream commit

fix for newer modp DH groups
(diffie-hellman-group14-sha256 etc)

Upstream-Regress-ID: fe942c669959462b507516ae1634fde0725f1c68

8 years agoupstream commit
markus@openbsd.org [Mon, 19 Sep 2016 19:02:19 +0000 (19:02 +0000)] 
upstream commit

move inbound NEWKEYS handling to kex layer; otherwise
early NEWKEYS causes NULL deref; found by Robert Swiecki/honggfuzz; fixed
with & ok djm@

Upstream-ID: 9a68b882892e9f51dc7bfa9f5a423858af358b2f

8 years agoupstream commit
natano@openbsd.org [Mon, 19 Sep 2016 07:52:42 +0000 (07:52 +0000)] 
upstream commit

Replace two more arc4random() loops with
arc4random_buf().

tweaks and ok dtucker
ok deraadt

Upstream-ID: 738d3229130ccc7eac975c190276ca6fcf0208e4

8 years agoupstream commit
tedu@openbsd.org [Sat, 17 Sep 2016 18:00:27 +0000 (18:00 +0000)] 
upstream commit

replace two arc4random loops with arc4random_buf ok
deraadt natano

Upstream-ID: e18ede972d1737df54b49f011fa4f3917a403f48

8 years agoupstream commit
djm@openbsd.org [Wed, 14 Sep 2016 20:11:26 +0000 (20:11 +0000)] 
upstream commit

take fingerprint of correct key for
AuthorizedPrincipalsCommand

Upstream-ID: 553581a549cd6a3e73ce9f57559a325cc2cb1f38

8 years agoupstream commit
djm@openbsd.org [Wed, 14 Sep 2016 05:42:25 +0000 (05:42 +0000)] 
upstream commit

add %-escapes to AuthorizedPrincipalsCommand to match those
supported for AuthorizedKeysCommand (key, key type, fingerprint, etc) and a
few more to provide access to the certificate's CA key; 'looks ok' dtucker@

Upstream-ID: 6b00fd446dbebe67f4e4e146d2e492d650ae04eb

8 years agoupstream commit
dtucker@openbsd.org [Wed, 14 Sep 2016 00:45:31 +0000 (00:45 +0000)] 
upstream commit

Improve test coverage of ssh-keygen -T a bit.

Upstream-Regress-ID: 8851668c721bcc2b400600cfc5a87644cc024e72

8 years agoupstream commit
dtucker@openbsd.org [Mon, 12 Sep 2016 02:25:46 +0000 (02:25 +0000)] 
upstream commit

Add testcase for ssh-keygen -j, -J and -K options for
moduli screening. Does not currently test generation as that is extremely
slow.

Upstream-Regress-ID: 9de6ce801377ed3ce0a63a1413f1cd5fd3c2d062

8 years agoupstream commit
djm@openbsd.org [Tue, 23 Aug 2016 08:17:04 +0000 (08:17 +0000)] 
upstream commit

add tests for addr_match_list()

Upstream-Regress-ID: fae2d1fef84687ece584738a924c7bf969616c8e

8 years agoupstream commit
djm@openbsd.org [Mon, 12 Sep 2016 23:39:34 +0000 (23:39 +0000)] 
upstream commit

handle certs in rsa_hash_alg_from_ident(), saving an
unnecessary special case elsewhere.

Upstream-ID: 901cb081c59d6d2698b57901c427f3f6dc7397d4

8 years agoupstream commit
djm@openbsd.org [Mon, 12 Sep 2016 23:31:27 +0000 (23:31 +0000)] 
upstream commit

list all supported signature algorithms in the
server-sig-algs Reported by mb AT smartftp.com in bz#2547 and (independantly)
Ron Frederick; ok markus@

Upstream-ID: ddf702d721f54646b11ef2cee6d916666cb685cd

8 years agoRemove no-op brackets to resync with upstream.
Darren Tucker [Mon, 12 Sep 2016 04:43:58 +0000 (14:43 +1000)] 
Remove no-op brackets to resync with upstream.

8 years agoResync ssh-keygen -W error message with upstream.
Darren Tucker [Mon, 12 Sep 2016 03:57:28 +0000 (13:57 +1000)] 
Resync ssh-keygen -W error message with upstream.

8 years agoMove ssh-keygen -W handling code to match upstream
Darren Tucker [Mon, 12 Sep 2016 03:55:37 +0000 (13:55 +1000)] 
Move ssh-keygen -W handling code to match upstream

8 years agoMove ssh-keygen -T handling code to match upstream.
Darren Tucker [Mon, 12 Sep 2016 03:52:17 +0000 (13:52 +1000)] 
Move ssh-keygen -T handling code to match upstream.

8 years agoMove -M handling code to match upstream.
Darren Tucker [Mon, 12 Sep 2016 03:30:50 +0000 (13:30 +1000)] 
Move -M handling code to match upstream.

8 years agoupstream commit
dtucker@openbsd.org [Mon, 12 Sep 2016 03:29:16 +0000 (03:29 +0000)] 
upstream commit

Spaces->tabs.

Upstream-ID: f4829dfc3f36318273f6082b379ac562eead70b7

8 years agoupstream commit
dtucker@openbsd.org [Mon, 12 Sep 2016 03:25:20 +0000 (03:25 +0000)] 
upstream commit

Style whitespace fix.  Also happens to remove a no-op
diff with portable.

Upstream-ID: 45d90f9a62ad56340913a433a9453eb30ceb8bf3

8 years agoupstream commit
deraadt@openbsd.org [Mon, 12 Sep 2016 01:22:38 +0000 (01:22 +0000)] 
upstream commit

Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then
use those definitions rather than pulling <sys/param.h> and unknown namespace
pollution. ok djm markus dtucker

Upstream-ID: 712cafa816c9f012a61628b66b9fbd5687223fb8

8 years agoupstream commit
jmc@openbsd.org [Wed, 7 Sep 2016 18:39:24 +0000 (18:39 +0000)] 
upstream commit

sort; from matthew martin

Upstream-ID: 73cec7f7ecc82d37a4adffad7745e4684de67ce7

8 years agoupstream commit
markus@openbsd.org [Tue, 6 Sep 2016 09:22:56 +0000 (09:22 +0000)] 
upstream commit

ssh_set_newkeys: print correct block counters on
rekeying; ok djm@

Upstream-ID: 32bb7a9cb9919ff5bab28d50ecef3a2b2045dd1e

8 years agoupstream commit
markus@openbsd.org [Tue, 6 Sep 2016 09:14:05 +0000 (09:14 +0000)] 
upstream commit

update ext_info_c every time we receive a kexinit msg;
fixes sending of ext_info if privsep is disabled; report Aris Adamantiadis &
Mancha; ok djm@

Upstream-ID: 2ceaa1076e19dbd3542254b4fb8e42d608f28856

8 years agoupstream commit
djm@openbsd.org [Mon, 5 Sep 2016 14:02:42 +0000 (14:02 +0000)] 
upstream commit

remove 3des-cbc from the client's default proposal;
64-bit block ciphers are not safe in 2016 and we don't want to wait until
attacks like sweet32 are extended to SSH.

As 3des-cbc was the only mandatory cipher in the SSH RFCs, this may
cause problems connecting to older devices using the defaults, but
it's highly likely that such devices already need explicit
configuration for KEX and hostkeys anyway.

ok deraadt, markus, dtucker

Upstream-ID: a505dfe65c6733af0f751b64cbc4bb7e0761bc2f

8 years agoupstream commit
djm@openbsd.org [Mon, 5 Sep 2016 13:57:31 +0000 (13:57 +0000)] 
upstream commit

enforce expected request flow for GSSAPI calls; thanks to
Jakub Jelen for testing; ok markus@

Upstream-ID: d4bc0e70e1be403735d3d9d7e176309b1fd626b9

8 years agoRestore ssh-keygen's -J and -j option handling.
Darren Tucker [Mon, 12 Sep 2016 01:07:00 +0000 (11:07 +1000)] 
Restore ssh-keygen's -J and -j option handling.

These were incorrectly removed in the 1d9a2e28 sync commit.

9 years agotighten PAM monitor calls
Damien Miller [Wed, 31 Aug 2016 00:48:07 +0000 (10:48 +1000)] 
tighten PAM monitor calls

only allow kbd-interactive ones when that authentication method is
enabled. Prompted by Solar Designer

9 years agoupstream commit
djm@openbsd.org [Tue, 30 Aug 2016 07:50:21 +0000 (07:50 +0000)] 
upstream commit

restrict monitor auth calls to be allowed only when their
respective authentication methods are enabled in the configuration.

prompted by Solar Designer; ok markus dtucker

Upstream-ID: 6eb3f89332b3546d41d6dbf5a8e6ff920142b553

9 years agoTighten monitor state-machine flow for PAM calls
Damien Miller [Mon, 29 Aug 2016 01:47:07 +0000 (11:47 +1000)] 
Tighten monitor state-machine flow for PAM calls

(attack surface reduction)

9 years agoupstream commit
djm@openbsd.org [Sun, 28 Aug 2016 22:28:12 +0000 (22:28 +0000)] 
upstream commit

fix uninitialised optlen in getsockopt() call; harmless
on Unix/BSD but potentially crashy on Cygwin. Reported by James Slepicka ok
deraadt@

Upstream-ID: 1987ccee508ba5b18f016c85100d7ac3f70ff965

9 years agoupstream commit
guenther@openbsd.org [Sat, 27 Aug 2016 04:05:12 +0000 (04:05 +0000)] 
upstream commit

Pull in <sys/time.h> for struct timeval

ok deraadt@

Upstream-ID: ae34525485a173bccd61ac8eefeb91c57e3b7df6

9 years agoupstream commit
guenther@openbsd.org [Sat, 27 Aug 2016 04:04:56 +0000 (04:04 +0000)] 
upstream commit

Pull in <stdlib.h> for NULL

ok deraadt@

Upstream-ID: 7baa6a0f1e049bb3682522b4b95a26c866bfc043

9 years agoupstream commit
djm@openbsd.org [Thu, 25 Aug 2016 23:57:54 +0000 (23:57 +0000)] 
upstream commit

add a sIgnore opcode that silently ignores options and
use it to suppress noisy deprecation warnings for the Protocol directive.

req henning, ok markus

Upstream-ID: 9fe040aca3d6ff393f6f7e60045cdd821dc4cbe0

9 years agoupstream commit
djm@openbsd.org [Thu, 25 Aug 2016 23:56:51 +0000 (23:56 +0000)] 
upstream commit

remove superfluous NOTREACHED comment

Upstream-ID: a7485c1f1be618e8c9e38fd9be46c13b2d03b90c

9 years agoupstream commit
otto@openbsd.org [Tue, 23 Aug 2016 16:21:45 +0000 (16:21 +0000)] 
upstream commit

fix previous, a condition was modified incorrectly; ok
markus@ deraadt@

Upstream-ID: c443e339768e7ed396dff3bb55f693e7d3641453

9 years agoupstream commit
djm@openbsd.org [Tue, 23 Aug 2016 08:17:42 +0000 (08:17 +0000)] 
upstream commit

downgrade an error() to a debug2() to match similar cases
in addr_match_list()

Upstream-ID: 07c3d53e357214153d9d08f234411e0d1a3d6f5c

9 years agoupstream commit
djm@openbsd.org [Tue, 23 Aug 2016 06:36:23 +0000 (06:36 +0000)] 
upstream commit

remove Protocol directive from client/server configs that
causes spammy deprecation warnings

hardcode SSH_PROTOCOLS=2, since that's all we support on the server
now (the client still may support both, so it could get confused)

Upstream-Regress-ID: c16662c631af51633f9fd06aca552a70535de181

9 years agohook match and utf8 unittests up to Makefile
Damien Miller [Tue, 23 Aug 2016 06:33:48 +0000 (16:33 +1000)] 
hook match and utf8 unittests up to Makefile

9 years agoupstream commit
djm@openbsd.org [Fri, 19 Aug 2016 06:44:13 +0000 (06:44 +0000)] 
upstream commit

add tests for matching functions

Upstream-Regress-ID: 0869d4f5c5d627c583c6a929d69c17d5dd65882c

9 years agoremoving UseLogin bits from configure.ac
Damien Miller [Tue, 23 Aug 2016 04:32:37 +0000 (14:32 +1000)] 
removing UseLogin bits from configure.ac

9 years agoupstream commit
djm@openbsd.org [Tue, 23 Aug 2016 03:24:10 +0000 (03:24 +0000)] 
upstream commit

fix negated address matching where the address list
consists of a single negated match, e.g. "Match addr !192.20.0.1"

Report and patch from Jakub Jelen. bz#2397 ok dtucker@

Upstream-ID: 01dcac3f3e6ca47518cf293e31c73597a4bb40d8

9 years agoupstream commit
djm@openbsd.org [Tue, 23 Aug 2016 03:22:49 +0000 (03:22 +0000)] 
upstream commit

fix matching for pattern lists that contain a single
negated match, e.g. "Host !example"

report and patch from Robin Becker. bz#1918 ok dtucker@

Upstream-ID: 05a0cb323ea4bc20e98db099b42c067bfb9ea1ea