From ef100a2c5a8ed83afac0b8f36520815803da227a Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Fri, 10 Aug 2018 00:27:15 +0000 Subject: upstream: fix numbering OpenBSD-Commit-ID: bc7a1764dff23fa4c5ff0e3379c9c4d5b63c9596 --- PROTOCOL | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'PROTOCOL') diff --git a/PROTOCOL b/PROTOCOL index b1fc00691..033f00b49 100644 --- a/PROTOCOL +++ b/PROTOCOL @@ -428,7 +428,7 @@ The values of the f_flag bitmask are as follows: Both the "statvfs@openssh.com" and "fstatvfs@openssh.com" extensions are advertised in the SSH_FXP_VERSION hello with version "2". -10. sftp: Extension request "hardlink@openssh.com" +3.5. sftp: Extension request "hardlink@openssh.com" This request is for creating a hard link to a regular file. This request is implemented as a SSH_FXP_EXTENDED request with the @@ -444,7 +444,7 @@ link(oldpath, newpath) and will respond with a SSH_FXP_STATUS message. This extension is advertised in the SSH_FXP_VERSION hello with version "1". -10. sftp: Extension request "fsync@openssh.com" +3.6. sftp: Extension request "fsync@openssh.com" This request asks the server to call fsync(2) on an open file handle. @@ -458,4 +458,4 @@ respond with a SSH_FXP_STATUS message. This extension is advertised in the SSH_FXP_VERSION hello with version "1". -$OpenBSD: PROTOCOL,v 1.32 2018/02/19 00:55:02 djm Exp $ +$OpenBSD: PROTOCOL,v 1.33 2018/08/10 00:27:15 djm Exp $ -- cgit v1.2.3 From 7c712966a3139622f7fb55045368d05de4e6782c Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Fri, 10 Aug 2018 00:42:29 +0000 Subject: upstream: Describe pubkey format, prompted by bz#2853 While I'm here, describe and link to the remaining local PROTOCOL.* docs that weren't already mentioned (PROTOCOL.key, PROTOCOL.krl and PROTOCOL.mux) OpenBSD-Commit-ID: 2a900f9b994ba4d53e7aeb467d44d75829fd1231 --- PROTOCOL | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'PROTOCOL') diff --git a/PROTOCOL b/PROTOCOL index 033f00b49..099aca051 100644 --- a/PROTOCOL +++ b/PROTOCOL @@ -458,4 +458,35 @@ respond with a SSH_FXP_STATUS message. This extension is advertised in the SSH_FXP_VERSION hello with version "1". -$OpenBSD: PROTOCOL,v 1.33 2018/08/10 00:27:15 djm Exp $ +4. Miscellaneous changes + +4.1 Public key format + +OpenSSH public keys, as generated by ssh-keygen(1) and appearing in +authorized_keys files, are formatted as a single line of text consisting +of the public key algorithm name followed by a base64-encoded key blob. +The public key blob (before base64 encoding) is the same format used +for the encoding of public keys sent on the wire, e.g. as described in +RFC4253 section 6.6 for RSA and DSA keys, RFC5656 section 3.1 for ECDSA +keys and the "New public key formats" section of PROTOCOL.certkeys for +the OpenSSH certificate formats. + +4.2 Private key format + +OpenSSH private keys, as generated by ssh-keygen(1) use the format +described in PROTOCOL.key by default. As a legacy option, PEM format +(RFC7468) private keys are also supported for RSA, DSA and ECDSA keys +and were the default format before OpenSSH 7.8. + +4.3 KRL format + +OpenSSH supports a compact format for Key Revocation Lists (KRLs). This +format is described in the PROTOCOL.krl file. + +4.4 Connection multiplexing + +OpenSSH's connection multiplexing uses messages as described in +PROTOCOL.mux over a Unix domain socket for communications between a +master instance and later clients. + +$OpenBSD: PROTOCOL,v 1.34 2018/08/10 00:42:29 djm Exp $ -- cgit v1.2.3 From e1b26ce504662a5d5b991091228984ccfd25f280 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Fri, 10 Aug 2018 00:44:01 +0000 Subject: upstream: improve OpenBSD-Commit-ID: 40d839db0977b4e7ac8b647b16d5411d4faf2f60 --- PROTOCOL | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'PROTOCOL') diff --git a/PROTOCOL b/PROTOCOL index 099aca051..010bec92f 100644 --- a/PROTOCOL +++ b/PROTOCOL @@ -465,11 +465,11 @@ This extension is advertised in the SSH_FXP_VERSION hello with version OpenSSH public keys, as generated by ssh-keygen(1) and appearing in authorized_keys files, are formatted as a single line of text consisting of the public key algorithm name followed by a base64-encoded key blob. -The public key blob (before base64 encoding) is the same format used -for the encoding of public keys sent on the wire, e.g. as described in -RFC4253 section 6.6 for RSA and DSA keys, RFC5656 section 3.1 for ECDSA -keys and the "New public key formats" section of PROTOCOL.certkeys for -the OpenSSH certificate formats. +The public key blob (before base64 encoding) is the same format used for +the encoding of public keys sent on the wire: as described in RFC4253 +section 6.6 for RSA and DSA keys, RFC5656 section 3.1 for ECDSA keys +and the "New public key formats" section of PROTOCOL.certkeys for the +OpenSSH certificate formats. 4.2 Private key format @@ -489,4 +489,4 @@ OpenSSH's connection multiplexing uses messages as described in PROTOCOL.mux over a Unix domain socket for communications between a master instance and later clients. -$OpenBSD: PROTOCOL,v 1.34 2018/08/10 00:42:29 djm Exp $ +$OpenBSD: PROTOCOL,v 1.35 2018/08/10 00:44:01 djm Exp $ -- cgit v1.2.3