summaryrefslogtreecommitdiff
path: root/PROTOCOL
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-08-10 00:44:01 +0000
committerDamien Miller <djm@mindrot.org>2018-08-10 11:14:06 +1000
commite1b26ce504662a5d5b991091228984ccfd25f280 (patch)
treec59c9d443242e23acd905175c2350dd97a5544f3 /PROTOCOL
parent7c712966a3139622f7fb55045368d05de4e6782c (diff)
upstream: improve
OpenBSD-Commit-ID: 40d839db0977b4e7ac8b647b16d5411d4faf2f60
Diffstat (limited to 'PROTOCOL')
-rw-r--r--PROTOCOL12
1 files changed, 6 insertions, 6 deletions
diff --git a/PROTOCOL b/PROTOCOL
index 099aca05..010bec92 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 $