Commit Graph

8070 Commits

Author SHA1 Message Date
markus@openbsd.org
2521cf0e36 upstream commit
compress.c is gone

Upstream-ID: 174fa7faa9b9643cba06164b5e498591356fbced
2015-07-15 15:36:21 +10:00
djm@openbsd.org
c65a7aa6c4 upstream commit
another SSH_RSA_MINIMUM_MODULUS_SIZE that needed
 cranking

Upstream-ID: 9d8826cafe96aab4ae8e2f6fd22800874b7ffef1
2015-07-15 15:36:21 +10:00
djm@openbsd.org
b1f383da5c upstream commit
add an XXX reminder for getting correct key paths from
 sshd_config

Upstream-ID: feae52b209d7782ad742df04a4260e9fe41741db
2015-07-15 15:36:02 +10:00
djm@openbsd.org
933935ce8d upstream commit
refuse to generate or accept RSA keys smaller than 1024
 bits; feedback and ok dtucker@

Upstream-ID: 7ea3d31271366ba264f06e34a3539bf1ac30f0ba
2015-07-15 15:36:02 +10:00
djm@openbsd.org
bdfd29f60b upstream commit
turn off 1024 bit diffie-hellman-group1-sha1 key
 exchange method (already off in server, this turns it off in the client by
 default too) ok dtucker@

Upstream-ID: f59b88f449210ab7acf7d9d88f20f1daee97a4fa
2015-07-15 15:35:31 +10:00
djm@openbsd.org
c28fc62d78 upstream commit
delete support for legacy v00 certificates; "sure"
 markus@ dtucker@

Upstream-ID: b5b9bb5f9202d09e88f912989d74928601b6636f
2015-07-15 15:35:09 +10:00
djm@openbsd.org
564d63e1b4 upstream commit
Compile-time disable SSH v.1 again

Upstream-ID: 1d4b513a3a06232f02650b73bad25100d1b800af
2015-07-15 15:24:40 +10:00
djm@openbsd.org
868109b650 upstream commit
twiddle PermitRootLogin back

Upstream-ID: 2bd23976305d0512e9f84d054e1fc23cd70b89f2
2015-07-15 15:24:09 +10:00
djm@openbsd.org
7de4b03a6e upstream commit
twiddle; (this commit marks the openssh-6.9 release)

Upstream-ID: 78500582819f61dd8adee36ec5cc9b9ac9351234
2015-07-01 12:35:31 +10:00
djm@openbsd.org
1bf477d3cd upstream commit
better refuse ForwardX11Trusted=no connections attempted
 after ForwardX11Timeout expires; reported by Jann Horn

Upstream-ID: bf0fddadc1b46a0334e26c080038313b4b6dea21
2015-07-01 12:29:43 +10:00
djm@openbsd.org
47aa7a0f85 upstream commit
put back default PermitRootLogin=no

Upstream-ID: 7bdedd5cead99c57ed5571f3b6b7840922d5f728
2015-07-01 12:29:42 +10:00
djm@openbsd.org
984b064fe2 upstream commit
openssh-6.9

Upstream-ID: 6cfe8e1904812531080e6ab6e752d7001b5b2d45
2015-07-01 11:58:36 +10:00
djm@openbsd.org
d921082ed6 upstream commit
reset default PermitRootLogin to 'yes' (momentarily, for
 release)

Upstream-ID: cad8513527066e65dd7a1c16363d6903e8cefa24
2015-07-01 11:58:35 +10:00
Damien Miller
66295e0e1b crank version numbers for release 2015-07-01 11:49:12 +10:00
Damien Miller
37035c07d4 s/--with-ssh1/--without-ssh1/ 2015-07-01 10:49:37 +10:00
djm@openbsd.org
629df770db upstream commit
fatal() when a remote window update causes the window
 value to overflow. Reported by Georg Wicherski, ok markus@

Upstream-ID: ead397a9aceb3bf74ebfa5fcaf259d72e569f351
2015-06-30 16:12:20 +10:00
djm@openbsd.org
f715afebe7 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
2015-06-30 16:12:20 +10:00
Damien Miller
52fb6b9b03 skip IPv6-related portions on hosts without IPv6
with Tim Rice
2015-06-30 16:05:40 +10:00
djm@openbsd.org
512caddf59 upstream commit
add getpid to sandbox, reachable by grace_alarm_handler

reported by Jakub Jelen; bz#2419

Upstream-ID: d0da1117c16d4c223954995d35b0f47c8f684cd8
2015-06-30 08:36:34 +10:00
djm@openbsd.org
78c2a4f883 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
2015-06-27 09:24:04 +10:00
Damien Miller
bc20205c91 add missing pselect6
patch from Jakub Jelen
2015-06-25 09:51:39 +10:00
djm@openbsd.org
9d27fb73b4 upstream commit
correct test to sshkey_sign(); spotted by Albert S.

Upstream-ID: 5f7347f40f0ca6abdaca2edb3bd62f4776518933
2015-06-25 09:50:30 +10:00
dtucker@openbsd.org
7ed01a96a1 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
2015-06-25 09:50:12 +10:00
dtucker@openbsd.org
882f8bf94f 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
2015-06-25 09:48:41 +10:00
djm@openbsd.org
9488538a72 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
2015-06-23 10:34:47 +10:00
dtucker@openbsd.org
63b78d003b 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
2015-06-23 10:34:46 +10:00
Damien Miller
5c15e22c69 fix syntax error 2015-06-18 15:07:56 +10:00
jsing@openbsd.org
596dbca82f 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
2015-06-17 22:12:05 +10:00
jsing@openbsd.org
aff3e94c0d 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
2015-06-17 22:12:04 +10:00
Damien Miller
97e2e1596c 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.
2015-06-17 14:36:54 +10:00
Damien Miller
99f33d7304 aarch64 support for seccomp-bpf sandbox
Also resort and tidy syscall list. Based on patches by Jakub Jelen
bz#2361; ok dtucker@
2015-06-17 10:50:51 +10:00
djm@openbsd.org
4ef702e124 upstream commit
return failure on RSA signature error; reported by Albert S

Upstream-ID: e61bb93dbe0349625807b0810bc213a6822121fa
2015-06-15 13:45:24 +10:00
Tim Rice
a170f22baf Fix t12 rules for out of tree builds. 2015-06-09 22:41:13 -07:00
millert@openbsd.org
ec04dc4a55 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
2015-06-07 13:09:58 +10:00
djm@openbsd.org
732d61f417 upstream commit
typo: accidental repetition; bz#2386

Upstream-ID: 45e620d99f6bc301e5949d34a54027374991c88b
2015-06-05 15:18:02 +10:00
Darren Tucker
adfb24c69d 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@
2015-06-05 14:51:40 +10:00
Tim Rice
a1195a0fdc Merge branch 'master' of git.mindrot.org:/var/git/openssh 2015-06-03 21:43:13 -07:00
Tim Rice
6397eedf95 Remove unneeded backslashes. Patch from Ángel González 2015-06-03 21:41:11 -07:00
Darren Tucker
d2480bcac1 Remove redundant include of stdarg.h. bz#2410 2015-06-04 14:10:55 +10:00
djm@openbsd.org
5e67859a62 upstream commit
mention CheckHostIP adding addresses to known_hosts;
 bz#1993; ok dtucker@

Upstream-ID: fd44b68440fd0dc29abf9f2d3f703d74a2396cb7
2015-06-04 08:53:54 +10:00
Darren Tucker
d7a58bbac6 Replace strcpy with strlcpy.
ok djm, sanity check by Corinna Vinschen.
2015-06-02 20:15:26 +10:00
Damien Miller
51a1c21152 skip, rather than fatal when run without SUDO set 2015-05-29 18:27:21 +10:00
Damien Miller
599f01142a fix merge botch that left ",," in KEX algs 2015-05-29 18:03:15 +10:00
Damien Miller
0c2a81dfc2 re-enable SSH protocol 1 at compile time 2015-05-29 17:08:28 +10:00
djm@openbsd.org
db438f9285 upstream commit
make this work without SUDO set; ok dtucker@

Upstream-Regress-ID: bca88217b70bce2fe52b23b8e06bdeb82d98c715
2015-05-29 13:06:30 +10:00
djm@openbsd.org
1d9a2e2849 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
2015-05-28 18:54:58 +10:00
dtucker@openbsd.org
496aeb25bc 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
2015-05-28 18:54:57 +10:00
dtucker@openbsd.org
dd2cfeb586 upstream commit
Fix typo (keywork->keyword)

Upstream-ID: 8aacd0f4089c0a244cf43417f4f9045dfaeab534
2015-05-28 18:54:56 +10:00
djm@openbsd.org
9cc6842493 upstream commit
add error message on ftruncate failure; bz#2176

Upstream-ID: cbcc606e0b748520c74a210d8f3cc9718d3148cf
2015-05-28 18:54:55 +10:00
djm@openbsd.org
d1958793a0 upstream commit
make ssh-keygen default to ed25519 keys when compiled
 without OpenSSL; bz#2388, ok dtucker@

Upstream-ID: 85a471fa6d3fa57a7b8e882d22cfbfc1d84cdc71
2015-05-28 18:54:54 +10:00