diff options
author | Colin Watson <cjwatson@debian.org> | 2014-10-07 13:33:15 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-10-07 14:27:30 +0100 |
commit | f0b009aea83e9ff3a50be30f51012099a5143c16 (patch) | |
tree | 3825e6f7e3b7ea4481d06ed89aba9a7a95150df5 /misc.h | |
parent | 47f0bad4330b16ec3bad870fcf9839c196e42c12 (diff) | |
parent | 762c062828f5a8f6ed189ed6e44ad38fd92f8b36 (diff) |
Merge 6.7p1.
* New upstream release (http://www.openssh.com/txt/release-6.7):
- sshd(8): The default set of ciphers and MACs has been altered to
remove unsafe algorithms. In particular, CBC ciphers and arcfour* are
disabled by default. The full set of algorithms remains available if
configured explicitly via the Ciphers and MACs sshd_config options.
- ssh(1), sshd(8): Add support for Unix domain socket forwarding. A
remote TCP port may be forwarded to a local Unix domain socket and
vice versa or both ends may be a Unix domain socket (closes: #236718).
- ssh(1), ssh-keygen(1): Add support for SSHFP DNS records for ED25519
key types.
- sftp(1): Allow resumption of interrupted uploads.
- ssh(1): When rekeying, skip file/DNS lookups of the hostkey if it is
the same as the one sent during initial key exchange.
- sshd(8): Allow explicit ::1 and 127.0.0.1 forwarding bind addresses
when GatewayPorts=no; allows client to choose address family.
- sshd(8): Add a sshd_config PermitUserRC option to control whether
~/.ssh/rc is executed, mirroring the no-user-rc authorized_keys
option.
- ssh(1): Add a %C escape sequence for LocalCommand and ControlPath that
expands to a unique identifer based on a hash of the tuple of (local
host, remote user, hostname, port). Helps avoid exceeding miserly
pathname limits for Unix domain sockets in multiplexing control paths.
- sshd(8): Make the "Too many authentication failures" message include
the user, source address, port and protocol in a format similar to the
authentication success / failure messages.
- Use CLOCK_BOOTTIME in preference to CLOCK_MONOTONIC when it is
available. It considers time spent suspended, thereby ensuring
timeouts (e.g. for expiring agent keys) fire correctly (closes:
#734553).
- Use prctl() to prevent sftp-server from accessing
/proc/self/{mem,maps}.
* Restore TCP wrappers support, removed upstream in 6.7. It is true that
dropping this reduces preauth attack surface in sshd. On the other
hand, this support seems to be quite widely used, and abruptly dropping
it (from the perspective of users who don't read openssh-unix-dev) could
easily cause more serious problems in practice. It's not entirely clear
what the right long-term answer for Debian is, but it at least probably
doesn't involve dropping this feature shortly before a freeze.
* Replace patch to disable OpenSSL version check with an updated version
of Kurt Roeckx's patch from #732940 to just avoid checking the status
field.
Diffstat (limited to 'misc.h')
-rw-r--r-- | misc.h | 31 |
1 files changed, 30 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.h,v 1.50 2013/10/14 23:28:23 djm Exp $ */ | 1 | /* $OpenBSD: misc.h,v 1.54 2014/07/15 15:54:14 millert Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -15,6 +15,25 @@ | |||
15 | #ifndef _MISC_H | 15 | #ifndef _MISC_H |
16 | #define _MISC_H | 16 | #define _MISC_H |
17 | 17 | ||
18 | /* Data structure for representing a forwarding request. */ | ||
19 | struct Forward { | ||
20 | char *listen_host; /* Host (address) to listen on. */ | ||
21 | int listen_port; /* Port to forward. */ | ||
22 | char *listen_path; /* Path to bind domain socket. */ | ||
23 | char *connect_host; /* Host to connect. */ | ||
24 | int connect_port; /* Port to connect on connect_host. */ | ||
25 | char *connect_path; /* Path to connect domain socket. */ | ||
26 | int allocated_port; /* Dynamically allocated listen port */ | ||
27 | int handle; /* Handle for dynamic listen ports */ | ||
28 | }; | ||
29 | |||
30 | /* Common server and client forwarding options. */ | ||
31 | struct ForwardOptions { | ||
32 | int gateway_ports; /* Allow remote connects to forwarded ports. */ | ||
33 | mode_t streamlocal_bind_mask; /* umask for streamlocal binds */ | ||
34 | int streamlocal_bind_unlink; /* unlink socket before bind */ | ||
35 | }; | ||
36 | |||
18 | /* misc.c */ | 37 | /* misc.c */ |
19 | 38 | ||
20 | char *chop(char *); | 39 | char *chop(char *); |
@@ -37,6 +56,7 @@ void ms_subtract_diff(struct timeval *, int *); | |||
37 | void ms_to_timeval(struct timeval *, int); | 56 | void ms_to_timeval(struct timeval *, int); |
38 | time_t monotime(void); | 57 | time_t monotime(void); |
39 | void lowercase(char *s); | 58 | void lowercase(char *s); |
59 | int unix_listener(const char *, int, int); | ||
40 | 60 | ||
41 | void sock_set_v6only(int); | 61 | void sock_set_v6only(int); |
42 | 62 | ||
@@ -68,6 +88,9 @@ int tun_open(int, int); | |||
68 | #define SSH_TUNID_ERR (SSH_TUNID_ANY - 1) | 88 | #define SSH_TUNID_ERR (SSH_TUNID_ANY - 1) |
69 | #define SSH_TUNID_MAX (SSH_TUNID_ANY - 2) | 89 | #define SSH_TUNID_MAX (SSH_TUNID_ANY - 2) |
70 | 90 | ||
91 | /* Fake port to indicate that host field is really a path. */ | ||
92 | #define PORT_STREAMLOCAL -2 | ||
93 | |||
71 | /* Functions to extract or store big-endian words of various sizes */ | 94 | /* Functions to extract or store big-endian words of various sizes */ |
72 | u_int64_t get_u64(const void *) | 95 | u_int64_t get_u64(const void *) |
73 | __attribute__((__bounded__( __minbytes__, 1, 8))); | 96 | __attribute__((__bounded__( __minbytes__, 1, 8))); |
@@ -82,6 +105,12 @@ void put_u32(void *, u_int32_t) | |||
82 | void put_u16(void *, u_int16_t) | 105 | void put_u16(void *, u_int16_t) |
83 | __attribute__((__bounded__( __minbytes__, 1, 2))); | 106 | __attribute__((__bounded__( __minbytes__, 1, 2))); |
84 | 107 | ||
108 | /* Little-endian store/load, used by umac.c */ | ||
109 | u_int32_t get_u32_le(const void *) | ||
110 | __attribute__((__bounded__(__minbytes__, 1, 4))); | ||
111 | void put_u32_le(void *, u_int32_t) | ||
112 | __attribute__((__bounded__(__minbytes__, 1, 4))); | ||
113 | |||
85 | struct bwlimit { | 114 | struct bwlimit { |
86 | size_t buflen; | 115 | size_t buflen; |
87 | u_int64_t rate, thresh, lamt; | 116 | u_int64_t rate, thresh, lamt; |