diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-10 00:27:24 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-10 02:40:28 +0000 |
commit | a2b8818c5d21cfcba443625251f691a2ea3a29c7 (patch) | |
tree | 8fe1fe448cde57eecf71a7bcd57186661b90313f /PROTOCOL | |
parent | d399ecd8eb7d4aed3b7ba0d2727e619607fb901b (diff) | |
parent | ee8d8b97cc2c6081df3af453a228992b87309ec4 (diff) |
Merge 6.5p1.
* New upstream release (http://www.openssh.com/txt/release-6.5,
LP: #1275068):
- ssh(1): Add support for client-side hostname canonicalisation using a
set of DNS suffixes and rules in ssh_config(5). This allows
unqualified names to be canonicalised to fully-qualified domain names
to eliminate ambiguity when looking up keys in known_hosts or checking
host certificate names (closes: #115286).
Diffstat (limited to 'PROTOCOL')
-rw-r--r-- | PROTOCOL | 27 |
1 files changed, 26 insertions, 1 deletions
@@ -91,6 +91,17 @@ an MAC algorithm. Additionally, if AES-GCM is selected as the cipher | |||
91 | the exchanged MAC algorithms are ignored and there doesn't have to be | 91 | the exchanged MAC algorithms are ignored and there doesn't have to be |
92 | a matching MAC. | 92 | a matching MAC. |
93 | 93 | ||
94 | 1.7 transport: chacha20-poly1305@openssh.com authenticated encryption | ||
95 | |||
96 | OpenSSH supports authenticated encryption using ChaCha20 and Poly1305 | ||
97 | as described in PROTOCOL.chacha20poly1305. | ||
98 | |||
99 | 1.8 transport: curve25519-sha256@libssh.org key exchange algorithm | ||
100 | |||
101 | OpenSSH supports the use of ECDH in Curve25519 for key exchange as | ||
102 | described at: | ||
103 | http://git.libssh.org/users/aris/libssh.git/plain/doc/curve25519-sha256@libssh.org.txt?h=curve25519 | ||
104 | |||
94 | 2. Connection protocol changes | 105 | 2. Connection protocol changes |
95 | 106 | ||
96 | 2.1. connection: Channel write close extension "eow@openssh.com" | 107 | 2.1. connection: Channel write close extension "eow@openssh.com" |
@@ -331,4 +342,18 @@ link(oldpath, newpath) and will respond with a SSH_FXP_STATUS message. | |||
331 | This extension is advertised in the SSH_FXP_VERSION hello with version | 342 | This extension is advertised in the SSH_FXP_VERSION hello with version |
332 | "1". | 343 | "1". |
333 | 344 | ||
334 | $OpenBSD: PROTOCOL,v 1.20 2013/01/08 18:49:04 markus Exp $ | 345 | 10. sftp: Extension request "fsync@openssh.com" |
346 | |||
347 | This request asks the server to call fsync(2) on an open file handle. | ||
348 | |||
349 | uint32 id | ||
350 | string "fsync@openssh.com" | ||
351 | string handle | ||
352 | |||
353 | One receiving this request, a server will call fsync(handle_fd) and will | ||
354 | respond with a SSH_FXP_STATUS message. | ||
355 | |||
356 | This extension is advertised in the SSH_FXP_VERSION hello with version | ||
357 | "1". | ||
358 | |||
359 | $OpenBSD: PROTOCOL,v 1.23 2013/12/01 23:19:05 djm Exp $ | ||