summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/V_6_5' into baserock/tiagogomes/armv8l64baserock/tiagogomes/armv8l64Tiago Gomes2015-02-09306-8184/+24084
|\ | | | | | | | | | | Conflicts: ssh_config sshd_config
| * gratuitious commit to let the git tree see this branchV_6_5djm2014-01-301-0/+1
| |
| * - (djm) Release openssh-6.5p1V_6_5_P1djm2014-01-301-0/+1
| |
| * trim entries prior to openssh-6.0p1djm2014-01-301-2049/+0
| |
| * - (djm) [configure.ac atomicio.c] Kludge around NetBSD offeringdjm2014-01-303-2/+12
| | | | | | | | | | | | different symbols for 'read' when various compiler flags are in use, causing atomicio.c comparisons against it to break and read/write operations to hang; ok dtucker
| * - (djm) [configure.ac] Only check for width-specified integer typesdjm2014-01-292-6/+17
| | | | | | | | | | in headers that actually exist. patch from Tom G. Christensen; ok dtucker@
| * - (djm) [configure.ac] Fix broken shell test '==' vs '='; patch fromdjm2014-01-292-3/+7
| | | | | | | | Tom G. Christensen
| * - (tim) [regress/agent.sh regress/agent-ptrace.sh] Assign $? to a variabletim2014-01-283-14/+24
| | | | | | | | | | when used as an error message inside an if statement so we display the correct into. agent.sh patch from Petr Lautrbach.
| * - (djm) [sshd.c] Use kill(0, ...) instead of killpg(0, ...); thedjm2014-01-282-1/+4
| | | | | | | | | | latter being specified to have undefined behaviour in SUSv3; ok dtucker
| * - (djm) [configure.ac] Search for inet_ntop in libnsl and libresovl;djm2014-01-282-2/+9
| | | | | | | | ok dtucker
| * - (dtucker) [Makefile.in] Remove trailing backslash which some makedtucker2014-01-272-2/+6
| | | | | | | | implementations (eg older Solaris) do not cope with.
| * Welcome to 2014dtucker2014-01-271-5/+5
| |
| * - (djm) [configure.ac] correct AC_DEFINE for previous.djm2014-01-252-3/+5
| |
| * - (djm) [configure.ac sandbox-capsicum.c sandbox-rlimit.c] Disabledjm2014-01-254-2/+13
| | | | | | | | | | | | RLIMIT_NOFILE pseudo-sandbox on FreeBSD. In some configurations, libc will attempt to open additional file descriptors for crypto offload and crash if they cannot be opened.
| * - markus@cvs.openbsd.org 2014/01/25 20:35:37djm2014-01-252-11/+13
| | | | | | | | | | | | [kex.c] dh_need needs to be set to max(seclen, blocksize, ivlen, mac_len) ok dtucker@, noted by mancha
| * - dtucker@cvs.openbsd.org 2014/01/25 10:12:50djm2014-01-256-8/+32
| | | | | | | | | | | | | | | | | | | | [cipher.c cipher.h kex.c kex.h kexgexc.c] Add a special case for the DH group size for 3des-cbc, which has an effective strength much lower than the key size. This causes problems with some cryptlib implementations, which don't support group sizes larger than 4k but also don't use the largest group size it does support as specified in the RFC. Based on a patch from Petr Lautrbach at Redhat, reduced by me with input from Markus. ok djm@ markus@
| * - (djm) [configure.ac] autoconf sets finds to 'yes' not '1', so testdjm2014-01-252-6/+8
| | | | | | | | against the correct thing.
| * - (djm) [configure.ac] Do not attempt to use capsicum sandbox unlessdjm2014-01-252-8/+14
| | | | | | | | | | | | sys/capability.h exists and cap_rights_limit is in libc. Fixes build on FreeBSD9x which provides the header but not the libc support.
| * - (djm) [configure.ac] Fix detection of capsicum sandbox on FreeBSDdjm2014-01-252-9/+12
| |
| * - (djm) [Makefile.in regress/scp-ssh-wrapper.sh regress/scp.sh] Makedjm2014-01-244-3/+13
| | | | | | | | | | the scp regress test actually test the built scp rather than the one in $PATH. ok dtucker@
| * - (dtucker) [configure.ac] NetBSD's (and FreeBSD's) strnvis is gratuitouslydtucker2014-01-232-3/+9
| | | | | | | | | | incompatible with OpenBSD's despite post-dating it by more than a decade. Declare it as broken, and document FreeBSD's as the same. ok djm@
| * - (tim) [session.c] Improve error reporting on set_id().tim2014-01-232-1/+4
| |
| * - (djm) [configure.ac aclocal.m4] More tests to detect fallout fromdjm2014-01-223-6/+67
| | | | | | | | | | | | | | platform hardening options: include some long long int arithmatic to detect missing support functions for -ftrapv in libgcc and equivalents, actually test linking when -ftrapv is supplied and set either both -pie/-fPIE or neither. feedback and ok dtucker@
| * - (djm) [configure.ac] Unless specifically requested, only attemptdjm2014-01-222-9/+30
| | | | | | | | to build Position Independent Executables on gcc >= 4.x; ok dtucker
| * - (djm) [openbsd-compat/setproctitle.c] Don't fail to compile if adjm2014-01-222-1/+7
| | | | | | | | | | platform that is expected to use the reuse-argv style setproctitle hack surprises us by providing a setproctitle in libc; ok dtucker
| * - (djm) [aclocal.m4] Flesh out the code run in the OSSH_CHECK_CFLAG_COMPILEdjm2014-01-212-4/+29
| | | | | | | | | | and OSSH_CHECK_LDFLAG_LINK tests to give them a better chance of detecting toolchain-related problems; ok dtucker
| * - (tim) [platform.c session.c] Fix bug affecting SVR5 platforms introducedtim2014-01-213-7/+8
| | | | | | | | with sftp chroot support. Move set_id call after chroot.
| * - (dtucker) [aclocal.m4] Differentiate between compile-time and link-timedtucker2014-01-212-3/+5
| | | | | | | | tests in the configure output. ok djm.
| * - (dtucker) [configure.ac] Make PIE a configure-time option which defaultsdtucker2014-01-212-4/+27
| | | | | | | | | | | | to on platforms where it's known to be reliably detected and off elsewhere. Works around platforms such as FreeBSD 9.1 where it does not interop with -ftrapv (it seems to work but fails when trying to link ssh). ok djm@
| * - (djm) [regress/cert-hostkey.sh] Fix regress failure on platforms thatdjm2014-01-202-26/+6
| | | | | | | | skip one or more key types (e.g. RHEL/CentOS 6.5); ok dtucker@
| * - (dtucker) [gss-serv-krb5.c] Fall back to krb5_cc_gen_new if the Kerberosdtucker2014-01-202-0/+9
| | | | | | | | | | implementation does not have krb5_cc_new_unique, similar to what we do in auth-krb5.c.
| * - djm@cvs.openbsd.org 2014/01/20 00:08:48djm2014-01-202-1/+8
| | | | | | | | | | [digest.c] memleak; found by Loganaden Velvindron @ AfriNIC; ok markus@
| * - dtucker@cvs.openbsd.org 2014/01/19 11:21:51dtucker2014-01-192-3/+7
| | | | | | | | | | | | [addrmatch.c] Cast the sizeof to socklen_t so it'll work even if the supplied len is negative. Suggested by and ok djm, ok deraadt.
| * - djm@cvs.openbsd.org 2014/01/19 04:48:08dtucker2014-01-192-4/+7
| | | | | | | | | | [ssh_config.5] fix inverted meaning of 'no' and 'yes' for CanonicalizeFallbackLocal
| * - dtucker@cvs.openbsd.org 2014/01/19 04:17:29dtucker2014-01-193-7/+12
| | | | | | | | | | | | | | [canohost.c addrmatch.c] Cast socklen_t when comparing to size_t and use socklen_t to iterate over the ip options, both to prevent signed/unsigned comparison warnings. Patch from vinschen at redhat via portable openssh, begrudging ok deraadt.
| * - dtucker@cvs.openbsd.org 2014/01/18 09:36:26dtucker2014-01-192-2/+6
| | | | | | | | | | | | | | [session.c] explicitly define USE_PIPES to 1 to prevent redefinition warnings in portable on platforms that use pipes for everything. From redhat @ redhat.
| * - dtucker@cvs.openbsd.org 2014/01/17 06:23:24dtucker2014-01-192-3/+9
| | | | | | | | | | [sftp-server.c] fix log message statvfs. ok djm
| * - (dtucker) [sandbox-capsicum.c] Correct some error messages and make thedtucker2014-01-182-3/+6
| | | | | | | | | | return value check for cap_enter() consistent with the other uses in FreeBSD. From by Loganaden Velvindron @ AfriNIC via bz#2140.
| * - (dtucker) [configure.ac] On Cygwin the getopt variables (like optargs,dtucker2014-01-182-3/+15
| | | | | | | | | | | | | | | | | | | | | | optind) are defined in getopt.h already. Unfortunately they are defined as "declspec(dllimport)" for historical reasons, because the GNU linker didn't allow auto-import on PE/COFF targets way back when. The problem is the dllexport attributes collide with the definitions in the various source files in OpenSSH, which obviousy define the variables without declspec(dllimport). The least intrusive way to get rid of these warnings is to disable warnings for GCC compiler attributes when building on Cygwin. Patch from vinschen at redhat.com.
| * - (dtucker) [openbsd-compat/bsd-cygwin_util.h] Add missing functiondtucker2014-01-182-1/+11
| | | | | | | | | | | | declarations that stopped being included when we stopped including <windows.h> from openbsd-compat/bsd-cygwin_util.h. Patch from vinschen at redhat.com.
| * - (dtucker) [uidswap.c] Prevent unused variable warnings on Cygwin. Patchdtucker2014-01-182-0/+8
| | | | | | | | from vinschen at redhat.com
| * - (dtucker) [defines.h] Move our definitions of uintXX_t types down to afterdtucker2014-01-172-8/+11
| | | | | | | | | | they're defined if we have to define them ourselves. Fixes builds on old AIX.
| * - (dtucker) [readconf.c] Wrap paths.h inside an ifdef. Allows building ondtucker2014-01-172-1/+5
| | | | | | | | Solaris.
| * - (dtucker) [configure.ac] Have --without-toolchain-hardening not turn offdtucker2014-01-172-3/+4
| | | | | | | | stack-protector since that has a separate flag that's been around a while.
| * - (dtucker) [configure.ac] Also look in inttypes.h for uintXX_t types.dtucker2014-01-172-2/+15
| |
| * - (dtucker) [openbsd-compat/bsd-statvfs.h] Only start including headers if wedtucker2014-01-172-3/+5
| | | | | | | | need them to cut down on the name collisions.
| * - (dtucker) [configure.ac openbsd-compat/bsd-statvfs.cdtucker2014-01-174-10/+63
| | | | | | | | | | | | openbsd-compat/bsd-statvfs.h] Implement enough of statvfs on top of statfs to be useful (and for the regression tests to pass) on platforms that have statfs and fstatfs. ok djm@
| * - (dtucker) Fix typo in #ifndef.dtucker2014-01-172-2/+3
| |
| * - (dtucker) [configure.ac digest.c openbsd-compat/openssl-compat.cdtucker2014-01-175-4/+57
| | | | | | | | | | openbsd-compat/openssl-compat.h] Add compatibility layer for older openssl versions. ok djm@
| * - (djm) [Makefile.in configure.ac sandbox-capsicum.c sandbox-darwin.c]djm2014-01-1711-13/+147
| | | | | | | | | | | | | | [sandbox-null.c sandbox-rlimit.c sandbox-seccomp-filter.c] [sandbox-systrace.c ssh-sandbox.h sshd.c] Support preauth sandboxing using the Capsicum API introduced in FreeBSD 10. Patch by Dag-Erling Smorgrav, updated by Loganaden Velvindron @ AfriNIC; ok dtucker@