]> git.ipfire.org Git - thirdparty/openssh-portable.git/log
thirdparty/openssh-portable.git
10 years agoupstream commit origin/HEAD origin/V_6_9 origin/master
djm@openbsd.org [Wed, 1 Jul 2015 01:55:13 +0000 (01:55 +0000)] 
upstream commit

openssh-6.9

Upstream-ID: 6cfe8e1904812531080e6ab6e752d7001b5b2d45

10 years agoupstream commit
djm@openbsd.org [Wed, 1 Jul 2015 01:55:00 +0000 (01:55 +0000)] 
upstream commit

reset default PermitRootLogin to 'yes' (momentarily, for
 release)

Upstream-ID: cad8513527066e65dd7a1c16363d6903e8cefa24

10 years agocrank version numbers for release
Damien Miller [Wed, 1 Jul 2015 01:49:12 +0000 (11:49 +1000)] 
crank version numbers for release

10 years agos/--with-ssh1/--without-ssh1/
Damien Miller [Wed, 1 Jul 2015 00:49:37 +0000 (10:49 +1000)] 
s/--with-ssh1/--without-ssh1/

10 years agoupstream commit
djm@openbsd.org [Tue, 30 Jun 2015 05:25:07 +0000 (05:25 +0000)] 
upstream commit

fatal() when a remote window update causes the window
 value to overflow. Reported by Georg Wicherski, ok markus@

Upstream-ID: ead397a9aceb3bf74ebfa5fcaf259d72e569f351

10 years agoupstream commit
djm@openbsd.org [Tue, 30 Jun 2015 05:23:25 +0000 (05:23 +0000)] 
upstream commit

Fix math error in remote window calculations that causes
 eventual stalls for datagram channels. Reported by Georg Wicherski, ok
 markus@

Upstream-ID: be54059d11bf64e0d85061f7257f53067842e2ab

10 years agoskip IPv6-related portions on hosts without IPv6
Damien Miller [Tue, 30 Jun 2015 06:05:40 +0000 (16:05 +1000)] 
skip IPv6-related portions on hosts without IPv6

with Tim Rice

10 years agoupstream commit
djm@openbsd.org [Mon, 29 Jun 2015 22:35:12 +0000 (22:35 +0000)] 
upstream commit

add getpid to sandbox, reachable by grace_alarm_handler

reported by Jakub Jelen; bz#2419

Upstream-ID: d0da1117c16d4c223954995d35b0f47c8f684cd8

10 years agoupstream commit
djm@openbsd.org [Fri, 26 Jun 2015 05:13:20 +0000 (05:13 +0000)] 
upstream commit

Fix \-escaping bug that caused forward path parsing to skip
 two characters and skip past the end of the string.

Based on patch by Salvador Fandino; ok dtucker@

Upstream-ID: 7b879dc446335677cbe4cb549495636a0535f3bd

10 years agoadd missing pselect6
Damien Miller [Wed, 24 Jun 2015 23:51:39 +0000 (09:51 +1000)] 
add missing pselect6

patch from Jakub Jelen

10 years agoupstream commit
djm@openbsd.org [Wed, 24 Jun 2015 23:47:23 +0000 (23:47 +0000)] 
upstream commit

correct test to sshkey_sign(); spotted by Albert S.

Upstream-ID: 5f7347f40f0ca6abdaca2edb3bd62f4776518933

10 years agoupstream commit
dtucker@openbsd.org [Wed, 24 Jun 2015 01:49:19 +0000 (01:49 +0000)] 
upstream commit

Revert previous commit.  We still want to call setgroups
 in the case where there are zero groups to remove any that we might otherwise
 inherit (as pointed out by grawity at gmail.com) and since the 2nd argument
 to setgroups is always a static global it's always valid to dereference in
 this case.  ok deraadt@ djm@

Upstream-ID: 895b5ac560a10befc6b82afa778641315725fd01

10 years agoupstream commit
dtucker@openbsd.org [Wed, 24 Jun 2015 01:49:19 +0000 (01:49 +0000)] 
upstream commit

Revert previous commit.  We still want to call setgroups in
 the case where there are zero groups to remove any that we might otherwise
 inherit (as pointed out by grawity at gmail.com) and since the 2nd argument
 to setgroups is always a static global it's always valid to dereference in
 this case.  ok deraadt@ djm@

Upstream-ID: 895b5ac560a10befc6b82afa778641315725fd01

10 years agoupstream commit
djm@openbsd.org [Mon, 22 Jun 2015 23:42:16 +0000 (23:42 +0000)] 
upstream commit

Don't count successful partial authentication as failures
 in monitor; this may have caused the monitor to refuse multiple
 authentications that would otherwise have successfully completed; ok markus@

Upstream-ID: eb74b8e506714d0f649bd5c300f762a527af04a3

10 years agoupstream commit
dtucker@openbsd.org [Mon, 22 Jun 2015 12:29:57 +0000 (12:29 +0000)] 
upstream commit

Don't call setgroups if we have zero groups; there's no
 guarantee that it won't try to deref the pointer.  Based on a patch from mail
 at quitesimple.org, ok djm deraadt

Upstream-ID: 2fff85e11d7a9a387ef7fddf41fbfaf566708ab1

10 years agofix syntax error
Damien Miller [Thu, 18 Jun 2015 05:07:56 +0000 (15:07 +1000)] 
fix syntax error

10 years agoupstream commit
jsing@openbsd.org [Mon, 15 Jun 2015 18:44:22 +0000 (18:44 +0000)] 
upstream commit

If AuthorizedPrincipalsCommand is specified, however
 AuthorizedPrincipalsFile is not (or is set to "none"), authentication will
 potentially fail due to key_cert_check_authority() failing to locate a
 principal that matches the username, even though an authorized principal has
 already been matched in the output of the subprocess. Fix this by using the
 same logic to determine if pw->pw_name should be passed, as is used to
 determine if a authorized principal must be matched earlier on.

ok djm@

Upstream-ID: 43b42302ec846b0ea68aceb40677245391b9409d

10 years agoupstream commit
jsing@openbsd.org [Mon, 15 Jun 2015 18:42:19 +0000 (18:42 +0000)] 
upstream commit

Make the arguments to match_principals_command() similar
 to match_principals_file(), by changing the last argument a struct
 sshkey_cert * and dereferencing key->cert in the caller.

No functional change.

ok djm@

Upstream-ID: 533f99b844b21b47342b32b62e198dfffcf8651c

10 years agotrivial optimisation for seccomp-bpf
Damien Miller [Wed, 17 Jun 2015 04:36:54 +0000 (14:36 +1000)] 
trivial optimisation for seccomp-bpf

When doing arg inspection and the syscall doesn't match, skip
past the instruction that reloads the syscall into the accumulator,
since the accumulator hasn't been modified at this point.

10 years agoaarch64 support for seccomp-bpf sandbox
Damien Miller [Wed, 17 Jun 2015 00:50:51 +0000 (10:50 +1000)] 
aarch64 support for seccomp-bpf sandbox

Also resort and tidy syscall list. Based on patches by Jakub Jelen
bz#2361; ok dtucker@

10 years agoupstream commit
djm@openbsd.org [Mon, 15 Jun 2015 01:32:50 +0000 (01:32 +0000)] 
upstream commit

return failure on RSA signature error; reported by Albert S

Upstream-ID: e61bb93dbe0349625807b0810bc213a6822121fa

10 years agoFix t12 rules for out of tree builds.
Tim Rice [Wed, 10 Jun 2015 05:41:13 +0000 (22:41 -0700)] 
Fix t12 rules for out of tree builds.

10 years agoupstream commit
millert@openbsd.org [Fri, 5 Jun 2015 15:13:13 +0000 (15:13 +0000)] 
upstream commit

For "ssh -L 12345:/tmp/sock" don't fail with "No forward host
 name." (we have a path, not a host name).  Based on a diff from Jared
 Yanovich. OK djm@

Upstream-ID: 2846b0a8c7de037e33657f95afbd282837fc213f

10 years agoupstream commit
djm@openbsd.org [Fri, 5 Jun 2015 03:44:14 +0000 (03:44 +0000)] 
upstream commit

typo: accidental repetition; bz#2386

Upstream-ID: 45e620d99f6bc301e5949d34a54027374991c88b

10 years agoAdd Linux powerpc64le and powerpcle entries.
Darren Tucker [Fri, 5 Jun 2015 04:51:40 +0000 (14:51 +1000)] 
Add Linux powerpc64le and powerpcle entries.

Stopgap to resolve bz#2409 because we are so close to release and will
update config.guess and friends shortly after the release.  ok djm@

10 years agoMerge branch 'master' of git.mindrot.org:/var/git/openssh
Tim Rice [Thu, 4 Jun 2015 04:43:13 +0000 (21:43 -0700)] 
Merge branch 'master' of git.mindrot.org:/var/git/openssh

10 years agoRemove unneeded backslashes. Patch from Ángel González
Tim Rice [Thu, 4 Jun 2015 04:41:11 +0000 (21:41 -0700)] 
Remove unneeded backslashes. Patch from Ángel González

10 years agoRemove redundant include of stdarg.h. bz#2410
Darren Tucker [Thu, 4 Jun 2015 04:10:55 +0000 (14:10 +1000)] 
Remove redundant include of stdarg.h.  bz#2410

10 years agoupstream commit
djm@openbsd.org [Tue, 2 Jun 2015 09:10:40 +0000 (09:10 +0000)] 
upstream commit

mention CheckHostIP adding addresses to known_hosts;
 bz#1993; ok dtucker@

Upstream-ID: fd44b68440fd0dc29abf9f2d3f703d74a2396cb7

10 years agoReplace strcpy with strlcpy.
Darren Tucker [Tue, 2 Jun 2015 10:15:26 +0000 (20:15 +1000)] 
Replace strcpy with strlcpy.

ok djm, sanity check by Corinna Vinschen.

10 years agoskip, rather than fatal when run without SUDO set
Damien Miller [Fri, 29 May 2015 08:27:21 +0000 (18:27 +1000)] 
skip, rather than fatal when run without SUDO set

10 years agofix merge botch that left ",," in KEX algs
Damien Miller [Fri, 29 May 2015 08:03:15 +0000 (18:03 +1000)] 
fix merge botch that left ",," in KEX algs

10 years agore-enable SSH protocol 1 at compile time
Damien Miller [Fri, 29 May 2015 07:08:28 +0000 (17:08 +1000)] 
re-enable SSH protocol 1 at compile time

10 years agoupstream commit
djm@openbsd.org [Fri, 29 May 2015 03:05:13 +0000 (03:05 +0000)] 
upstream commit

make this work without SUDO set; ok dtucker@

Upstream-Regress-ID: bca88217b70bce2fe52b23b8e06bdeb82d98c715

10 years agoupstream commit
djm@openbsd.org [Thu, 28 May 2015 07:37:31 +0000 (07:37 +0000)] 
upstream commit

wrap all moduli-related code in #ifdef WITH_OPENSSL.
 based on patch from Reuben Hawkins; bz#2388 feedback and ok dtucker@

Upstream-ID: d80cfc8be3e6ec65b3fac9e87c4466533b31b7cf

10 years agoupstream commit
dtucker@openbsd.org [Thu, 28 May 2015 05:41:29 +0000 (05:41 +0000)] 
upstream commit

Increase the allowed length of the known host file name
 in the log message to be consistent with other cases.  Part of bz#1993, ok
 deraadt.

Upstream-ID: a9e97567be49f25daf286721450968251ff78397

10 years agoupstream commit
dtucker@openbsd.org [Thu, 28 May 2015 05:09:45 +0000 (05:09 +0000)] 
upstream commit

Fix typo (keywork->keyword)

Upstream-ID: 8aacd0f4089c0a244cf43417f4f9045dfaeab534

10 years agoupstream commit
djm@openbsd.org [Thu, 28 May 2015 04:50:53 +0000 (04:50 +0000)] 
upstream commit

add error message on ftruncate failure; bz#2176

Upstream-ID: cbcc606e0b748520c74a210d8f3cc9718d3148cf

10 years agoupstream commit
djm@openbsd.org [Thu, 28 May 2015 04:40:13 +0000 (04:40 +0000)] 
upstream commit

make ssh-keygen default to ed25519 keys when compiled
 without OpenSSL; bz#2388, ok dtucker@

Upstream-ID: 85a471fa6d3fa57a7b8e882d22cfbfc1d84cdc71

10 years agoupstream commit
dtucker@openbsd.org [Wed, 27 May 2015 23:51:10 +0000 (23:51 +0000)] 
upstream commit

Reorder client proposal to prefer
 diffie-hellman-group-exchange-sha1 over diffie-hellman-group14-sha1.  ok djm@

Upstream-ID: 552c08d47347c3ee1a9a57d88441ab50abe17058

10 years agoupstream commit
dtucker@openbsd.org [Wed, 27 May 2015 23:39:18 +0000 (23:39 +0000)] 
upstream commit

Add a stronger (4k bit) fallback group that sshd can use
 when the moduli file is missing or broken, sourced from RFC3526.  bz#2302, ok
 markus@ (earlier version), djm@

Upstream-ID: b635215746a25a829d117673d5e5a76d4baee7f4

10 years agoNew moduli file from OpenBSD, removing 1k groups.
Darren Tucker [Thu, 28 May 2015 00:03:40 +0000 (10:03 +1000)] 
New moduli file from OpenBSD, removing 1k groups.

Remove 1k bit groups.  ok deraadt@, markus@

10 years agoupstream commit
djm@openbsd.org [Wed, 27 May 2015 05:15:02 +0000 (05:15 +0000)] 
upstream commit

support PKCS#11 devices with external PIN entry devices
 bz#2240, based on patch from Dirk-Willem van Gulik; feedback and ok dtucker@

Upstream-ID: 504568992b55a8fc984375242b1bd505ced61b0d

10 years agoupstream commit
dtucker@openbsd.org [Tue, 26 May 2015 23:23:40 +0000 (23:23 +0000)] 
upstream commit

Cap DH-GEX group size at 4kbits for Cisco implementations.
 Some of them will choke when asked for preferred sizes >4k instead of
 returning the 4k group that they do have.  bz#2209, ok djm@

Upstream-ID: 54b863a19713446b7431f9d06ad0532b4fcfef8d

10 years agoupstream commit
djm@openbsd.org [Sun, 24 May 2015 23:39:16 +0000 (23:39 +0000)] 
upstream commit

add missing 'c' option to getopt(), case statement was
 already there; from Felix Bolte

Upstream-ID: 9b19b4e2e0b54d6fefa0dfac707c51cf4bae3081

10 years agoupstream commit
jsg@openbsd.org [Sat, 23 May 2015 14:28:37 +0000 (14:28 +0000)] 
upstream commit

fix a memory leak in an error path ok markus@ dtucker@

Upstream-ID: bc1da0f205494944918533d8780fde65dff6c598

10 years agoupstream commit
djm@openbsd.org [Fri, 22 May 2015 05:28:45 +0000 (05:28 +0000)] 
upstream commit

mention ssh-keygen -E for comparing legacy MD5
 fingerprints; bz#2332

Upstream-ID: 079a3669549041dbf10dbc072d9563f0dc3b2859

10 years agoupstream commit
djm@openbsd.org [Fri, 22 May 2015 04:45:52 +0000 (04:45 +0000)] 
upstream commit

Reorder EscapeChar option parsing to avoid a single-byte
 out- of-bounds read. bz#2396 from Jaak Ristioja; ok dtucker@

Upstream-ID: 1dc6b5b63d1c8d9a88619da0b27ade461d79b060

10 years agoupstream commit
djm@openbsd.org [Fri, 22 May 2015 03:50:02 +0000 (03:50 +0000)] 
upstream commit

add knob to relax GSSAPI host credential check for
 multihomed hosts bz#928, patch by Simon Wilkinson; ok dtucker
 (kerberos/GSSAPI is not compiled by default on OpenBSD)

Upstream-ID: 15ddf1c6f7fd9d98eea9962f480079ae3637285d

10 years agoInclude signal.h for sig_atomic_t, used by kex.h.
Darren Tucker [Fri, 22 May 2015 07:49:46 +0000 (17:49 +1000)] 
Include signal.h for sig_atomic_t, used by kex.h.

bz#2402, from tomas.kuthan at oracle com.

10 years agoImport updated moduli file from OpenBSD.
Darren Tucker [Fri, 22 May 2015 02:47:24 +0000 (12:47 +1000)] 
Import updated moduli file from OpenBSD.

10 years agoupstream commit
djm@openbsd.org [Thu, 21 May 2015 12:01:19 +0000 (12:01 +0000)] 
upstream commit

Support "ssh-keygen -lF hostname" to find search known_hosts
 and print key hashes. Already advertised by ssh-keygen(1), but not delivered
 by code; ok dtucker@

Upstream-ID: 459e0e2bf39825e41b0811c336db2d56a1c23387

10 years agoconditionalise util.h inclusion
Damien Miller [Thu, 21 May 2015 07:55:15 +0000 (17:55 +1000)] 
conditionalise util.h inclusion

10 years agoupstream commit
djm@openbsd.org [Thu, 21 May 2015 06:44:25 +0000 (06:44 +0000)] 
upstream commit

regress test for AuthorizedPrincipalsCommand

Upstream-Regress-ID: c658fbf1ab6b6011dc83b73402322e396f1e1219

10 years agoupstream commit
djm@openbsd.org [Thu, 21 May 2015 06:40:02 +0000 (06:40 +0000)] 
upstream commit

regress test for AuthorizedKeysCommand arguments

Upstream-Regress-ID: bbd65c13c6b3be9a442ec115800bff9625898f12

10 years agoupstream commit
djm@openbsd.org [Thu, 21 May 2015 06:43:30 +0000 (06:43 +0000)] 
upstream commit

add AuthorizedPrincipalsCommand that allows getting
 authorized_principals from a subprocess rather than a file, which is quite
 useful in deployments with large userbases

feedback and ok markus@

Upstream-ID: aa1bdac7b16fc6d2fa3524ef08f04c7258d247f6

10 years agoupstream commit
djm@openbsd.org [Thu, 21 May 2015 06:38:35 +0000 (06:38 +0000)] 
upstream commit

support arguments to AuthorizedKeysCommand

bz#2081 loosely based on patch by Sami Hartikainen
feedback and ok markus@

Upstream-ID: b080387a14aa67dddd8ece67c00f268d626541f7

10 years agoupstream commit
djm@openbsd.org [Thu, 21 May 2015 04:55:51 +0000 (04:55 +0000)] 
upstream commit

refactor: split base64 encoding of pubkey into its own
 sshkey_to_base64() function and out of sshkey_write(); ok markus@

Upstream-ID: 54fc38f5832e9b91028900819bda46c3959a0c1a

10 years agoupstream commit
deraadt@openbsd.org [Mon, 18 May 2015 15:06:05 +0000 (15:06 +0000)] 
upstream commit

getentropy() and sendsyslog() have been around long
 enough. openssh-portable may want the #ifdef's but not base. discussed with
 djm few weeks back

Upstream-ID: 0506a4334de108e3fb6c66f8d6e0f9c112866926

10 years agoupstream commit
dtucker@openbsd.org [Fri, 15 May 2015 05:44:21 +0000 (05:44 +0000)] 
upstream commit

Use a salted hash of the lock passphrase instead of plain
 text and do constant-time comparisons of it. Should prevent leaking any
 information about it via timing, pointed out by Ryan Castellucci.  Add a 0.1s
 incrementing delay for each failed unlock attempt up to 10s.  ok markus@
 (earlier version), djm@

Upstream-ID: c599fcc325aa1cc65496b25220b622d22208c85f

10 years agoupstream commit
Damien Miller [Tue, 5 May 2015 09:10:58 +0000 (19:10 +1000)] 
upstream commit

   - tedu@cvs.openbsd.org 2015/01/12 03:20:04
     [bcrypt_pbkdf.c]
     rename blocks to words. bcrypt "blocks" are unrelated to blowfish blocks,
     nor are they the same size.

10 years agoupstream commit
Damien Miller [Tue, 5 May 2015 09:10:23 +0000 (19:10 +1000)] 
upstream commit

   - deraadt@cvs.openbsd.org 2015/01/08 00:30:07
     [bcrypt_pbkdf.c]
     declare a local version of MIN(), call it MINIMUM()

10 years agoupstream commit
Damien Miller [Tue, 5 May 2015 09:09:46 +0000 (19:09 +1000)] 
upstream commit

   - djm@cvs.openbsd.org 2014/12/30 01:41:43
     [bcrypt_pbkdf.c]
     typo in comment: ouput => output

10 years agoupstream commit
djm@openbsd.org [Mon, 4 May 2015 06:10:48 +0000 (06:10 +0000)] 
upstream commit

Remove pattern length argument from match_pattern_list(), we
 only ever use it for strlen(pattern).

Prompted by hanno AT hboeck.de pointing an out-of-bound read
error caused by an incorrect pattern length found using AFL
and his own tools.

ok markus@

10 years agoupstream commit
djm@openbsd.org [Fri, 1 May 2015 07:10:01 +0000 (07:10 +0000)] 
upstream commit

refactor ssh_dispatch_run_fatal() to use sshpkt_fatal()
 to better report error conditions. Teach sshpkt_fatal() about ECONNRESET.

Improves error messages on TCP connection resets. bz#2257

ok dtucker@

10 years agoupstream commit
djm@openbsd.org [Fri, 1 May 2015 07:08:08 +0000 (07:08 +0000)] 
upstream commit

a couple of parse targets were missing activep checks,
 causing them to be misapplied in match context; bz#2272 diagnosis and
 original patch from Sami Hartikainen ok dtucker@

10 years agoupstream commit
djm@openbsd.org [Fri, 1 May 2015 04:17:51 +0000 (04:17 +0000)] 
upstream commit

make handling of AuthorizedPrincipalsFile=none more
 consistent with other =none options; bz#2288 from Jakub Jelen; ok dtucker@

10 years agoupstream commit
djm@openbsd.org [Fri, 1 May 2015 04:03:20 +0000 (04:03 +0000)] 
upstream commit

remove failed remote forwards established by muliplexing
 from the list of active forwards; bz#2363, patch mostly by Yoann Ricordel; ok
 dtucker@

10 years agoupstream commit
djm@openbsd.org [Fri, 1 May 2015 04:01:58 +0000 (04:01 +0000)] 
upstream commit

reduce stderr spam when using ssh -S /path/mux -O forward
 -R 0:... ok dtucker@

10 years agoupstream commit
djm@openbsd.org [Fri, 1 May 2015 03:23:51 +0000 (03:23 +0000)] 
upstream commit

prevent authorized_keys options picked up on public key
 tests without a corresponding private key authentication being applied to
 other authentication methods. Reported by halex@, ok markus@

10 years agoupstream commit
djm@openbsd.org [Fri, 1 May 2015 03:20:54 +0000 (03:20 +0000)] 
upstream commit

Don't make parsing of authorized_keys' environment=
 option conditional on PermitUserEnv - always parse it, but only use the
 result if the option is enabled. This prevents the syntax of authorized_keys
 changing depending on which sshd_config options were enabled.

bz#2329; based on patch from coladict AT gmail.com, ok dtucker@

10 years agoupstream commit
djm@openbsd.org [Mon, 4 May 2015 06:10:48 +0000 (06:10 +0000)] 
upstream commit

Remove pattern length argument from match_pattern_list(), we
 only ever use it for strlen(pattern).

Prompted by hanno AT hboeck.de pointing an out-of-bound read
error caused by an incorrect pattern length found using AFL
and his own tools.

ok markus@

10 years agoupstream commit
dtucker@openbsd.org [Thu, 23 Apr 2015 05:01:19 +0000 (05:01 +0000)] 
upstream commit

Add a simple regression test for sshd's configuration
 parser.  Right now, all it does is run the output of sshd -T back through
 itself and ensure the output is valid and invariant.

10 years agoupstream commit
djm@openbsd.org [Wed, 22 Apr 2015 01:38:36 +0000 (01:38 +0000)] 
upstream commit

use correct key for nested certificate test

10 years agoupstream commit
djm@openbsd.org [Fri, 1 May 2015 07:11:47 +0000 (07:11 +0000)] 
upstream commit

mention that the user's shell from /etc/passwd is used
 for commands too; bz#1459 ok dtucker@

10 years agoupstream commit
djm@openbsd.org [Fri, 8 May 2015 07:29:00 +0000 (07:29 +0000)] 
upstream commit

whitespace

Upstream-Regress-ID: 6b708a3e709d5b7fd37890f874bafdff1f597519

10 years agoupstream commit
djm@openbsd.org [Fri, 8 May 2015 07:26:13 +0000 (07:26 +0000)] 
upstream commit

whitespace at EOL

Upstream-Regress-ID: 9c48911643d5b05173b36a012041bed4080b8554

10 years agoupstream commit
djm@openbsd.org [Fri, 8 May 2015 06:45:13 +0000 (06:45 +0000)] 
upstream commit

moar whitespace at eol

Upstream-ID: 64eaf872a3ba52ed41e494287e80d40aaba4b515

10 years agoupstream commit
djm@openbsd.org [Fri, 8 May 2015 06:41:56 +0000 (06:41 +0000)] 
upstream commit

whitespace at EOL

Upstream-ID: 57bcf67d666c6fc1ad798aee448fdc3f70f7ec2c

10 years agoupstream commit
djm@openbsd.org [Fri, 8 May 2015 03:56:51 +0000 (03:56 +0000)] 
upstream commit

whitespace at EOL

10 years agoupstream commit
dtucker@openbsd.org [Mon, 4 May 2015 01:47:53 +0000 (01:47 +0000)] 
upstream commit

Use diff w/out -u for better portability

10 years agoupstream commit
dtucker@openbsd.org [Fri, 8 May 2015 03:25:07 +0000 (03:25 +0000)] 
upstream commit

Use xcalloc for permitted_adm_opens instead of xmalloc to
 ensure it's zeroed. Fixes post-auth crash with permitopen=none.  bz#2355, ok
 djm@

10 years agoupstream commit
djm@openbsd.org [Fri, 8 May 2015 03:17:49 +0000 (03:17 +0000)] 
upstream commit

don't choke on new-format private keys encrypted with an
 AEAD cipher; bz#2366, patch from Ron Frederick; ok markus@

10 years agoupstream commit
dtucker@openbsd.org [Wed, 6 May 2015 05:45:17 +0000 (05:45 +0000)] 
upstream commit

Clarify pseudo-terminal request behaviour and use
 "pseudo-terminal" consistently.  bz#1716, ok jmc@ "I like it" deraadt@.

10 years agoupstream commit
dtucker@openbsd.org [Wed, 6 May 2015 04:07:18 +0000 (04:07 +0000)] 
upstream commit

Blacklist DH-GEX for specific PuTTY versions known to
 send non-RFC4419 DH-GEX messages rather than all versions of PuTTY.
 According to Simon Tatham, 0.65 and newer versions will send RFC4419 DH-GEX
 messages.  ok djm@

10 years agoupstream commit
dtucker@openbsd.org [Tue, 5 May 2015 10:17:49 +0000 (10:17 +0000)] 
upstream commit

WinSCP doesn't implement RFC4419 DH-GEX so flag it so we
 don't offer that KEX method.  ok markus@

10 years agoupstream commit
jsg@openbsd.org [Tue, 5 May 2015 02:48:17 +0000 (02:48 +0000)] 
upstream commit

use the sizeof the struct not the sizeof a pointer to the
 struct in ssh_digest_start()

This file is only used if ssh is built with OPENSSL=no

ok markus@

10 years agoPut brackets around mblen() compat constant.
Darren Tucker [Fri, 8 May 2015 01:07:27 +0000 (11:07 +1000)] 
Put brackets around mblen() compat constant.

This might help with the reported problem cross compiling for Android
("error: expected identifier or '(' before numeric constant") but
shouldn't hurt in any case.

10 years agoxrealloc -> xreallocarray in portable code too.
Darren Tucker [Wed, 29 Apr 2015 23:18:11 +0000 (09:18 +1000)] 
xrealloc -> xreallocarray in portable code too.

10 years agoupstream commit
dtucker@openbsd.org [Wed, 29 Apr 2015 03:48:56 +0000 (03:48 +0000)] 
upstream commit

Allow ListenAddress, Port and AddressFamily in any
 order.  bz#68, ok djm@, jmc@ (for the man page bit).

10 years agoupstream commit
jmc@openbsd.org [Tue, 28 Apr 2015 13:47:38 +0000 (13:47 +0000)] 
upstream commit

enviroment -> environment: apologies to darren for not
 spotting that first time round...

10 years agoupstream commit
dtucker@openbsd.org [Tue, 28 Apr 2015 10:25:15 +0000 (10:25 +0000)] 
upstream commit

Fix typo in previous

10 years agoupstream commit
dtucker@openbsd.org [Tue, 28 Apr 2015 10:17:58 +0000 (10:17 +0000)] 
upstream commit

Document that the TERM environment variable is not
 subject to SendEnv and AcceptEnv.  bz#2386, based loosely on a patch from
 jjelen at redhat, help and ok jmc@

10 years agoupstream commit
djm@openbsd.org [Mon, 27 Apr 2015 21:42:48 +0000 (21:42 +0000)] 
upstream commit

Make sshd default to PermitRootLogin=no; ok deraadt@
 rpe@

10 years agoupstream commit
djm@openbsd.org [Mon, 27 Apr 2015 01:52:30 +0000 (01:52 +0000)] 
upstream commit

fix compilation with OPENSSL=no; ok dtucker@

10 years agoupstream commit
dtucker@openbsd.org [Mon, 27 Apr 2015 00:37:53 +0000 (00:37 +0000)] 
upstream commit

Include stdio.h for FILE (used in sshkey.h) so it
 compiles with OPENSSL=no.

10 years agoupstream commit
djm@openbsd.org [Mon, 27 Apr 2015 00:21:21 +0000 (00:21 +0000)] 
upstream commit

allow "sshd -f none" to skip reading the config file,
 much like "ssh -F none" does. ok dtucker

10 years agoupstream commit
jmc@openbsd.org [Fri, 24 Apr 2015 06:26:49 +0000 (06:26 +0000)] 
upstream commit

combine -Dd onto one line and update usage();

10 years agoupstream commit
djm@openbsd.org [Fri, 24 Apr 2015 05:26:44 +0000 (05:26 +0000)] 
upstream commit

add ssh-agent -D to leave ssh-agent in foreground
 without enabling debug mode; bz#2381 ok dtucker@

10 years agoupstream commit
deraadt@openbsd.org [Fri, 24 Apr 2015 01:36:24 +0000 (01:36 +0000)] 
upstream commit

2*len -> use xreallocarray() ok djm