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 /authfile.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 'authfile.h')
-rw-r--r-- | authfile.h | 59 |
1 files changed, 37 insertions, 22 deletions
diff --git a/authfile.h b/authfile.h index 8ba1c2dbe..03bc3958c 100644 --- a/authfile.h +++ b/authfile.h | |||
@@ -1,32 +1,47 @@ | |||
1 | /* $OpenBSD: authfile.h,v 1.17 2013/12/06 13:34:54 markus Exp $ */ | 1 | /* $OpenBSD: authfile.h,v 1.19 2014/07/03 23:18:35 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. |
5 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | ||
6 | * All rights reserved | ||
7 | * | 5 | * |
8 | * As far as I am concerned, the code I have written for this software | 6 | * Redistribution and use in source and binary forms, with or without |
9 | * can be used freely for any purpose. Any derived versions of this | 7 | * modification, are permitted provided that the following conditions |
10 | * software must be clearly marked as such, and if the derived work is | 8 | * are met: |
11 | * incompatible with the protocol description in the RFC file, it must be | 9 | * 1. Redistributions of source code must retain the above copyright |
12 | * called by a name other than "ssh" or "Secure Shell". | 10 | * notice, this list of conditions and the following disclaimer. |
11 | * 2. Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * | ||
15 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
16 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
17 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
18 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
19 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
20 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
21 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
22 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
13 | */ | 25 | */ |
14 | 26 | ||
15 | #ifndef AUTHFILE_H | 27 | #ifndef AUTHFILE_H |
16 | #define AUTHFILE_H | 28 | #define AUTHFILE_H |
17 | 29 | ||
18 | int key_save_private(Key *, const char *, const char *, const char *, | 30 | struct sshbuf; |
19 | int, const char *, int); | 31 | struct sshkey; |
20 | int key_load_file(int, const char *, Buffer *); | 32 | |
21 | Key *key_load_cert(const char *); | 33 | int sshkey_save_private(struct sshkey *, const char *, |
22 | Key *key_load_public(const char *, char **); | 34 | const char *, const char *, int, const char *, int); |
23 | Key *key_load_public_type(int, const char *, char **); | 35 | int sshkey_load_file(int, const char *, struct sshbuf *); |
24 | Key *key_parse_private(Buffer *, const char *, const char *, char **); | 36 | int sshkey_load_cert(const char *, struct sshkey **); |
25 | Key *key_load_private(const char *, const char *, char **); | 37 | int sshkey_load_public(const char *, struct sshkey **, char **); |
26 | Key *key_load_private_cert(int, const char *, const char *, int *); | 38 | int sshkey_load_private(const char *, const char *, struct sshkey **, char **); |
27 | Key *key_load_private_type(int, const char *, const char *, char **, int *); | 39 | int sshkey_load_private_cert(int, const char *, const char *, |
28 | Key *key_load_private_pem(int, int, const char *, char **); | 40 | struct sshkey **, int *); |
29 | int key_perm_ok(int, const char *); | 41 | int sshkey_load_private_type(int, const char *, const char *, |
30 | int key_in_file(Key *, const char *, int); | 42 | struct sshkey **, char **, int *); |
43 | int sshkey_load_private_pem(int, int, const char *, struct sshkey **, char **); | ||
44 | int sshkey_perm_ok(int, const char *); | ||
45 | int sshkey_in_file(struct sshkey *, const char *, int); | ||
31 | 46 | ||
32 | #endif | 47 | #endif |