summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-05-08 03:56:51 +0000
committerDamien Miller <djm@mindrot.org>2015-05-08 13:58:06 +1000
commit4e636cf201ce6e7e3b9088568218f9d4e2c51712 (patch)
tree81eaec7f6fd26d6a9aae9dc44146683083455e28
parent38b8272f823dc1dd4e29dbcee83943ed48bb12fa (diff)
upstream commit
whitespace at EOL
-rw-r--r--PROTOCOL4
-rw-r--r--PROTOCOL.agent4
2 files changed, 4 insertions, 4 deletions
diff --git a/PROTOCOL b/PROTOCOL
index 91bfe270d..85641e650 100644
--- a/PROTOCOL
+++ b/PROTOCOL
@@ -175,7 +175,7 @@ whitelisted to receive this message upon request.
175 175
176OpenSSH supports layer 2 and layer 3 tunnelling via the "tun@openssh.com" 176OpenSSH supports layer 2 and layer 3 tunnelling via the "tun@openssh.com"
177channel type. This channel type supports forwarding of network packets 177channel type. This channel type supports forwarding of network packets
178with datagram boundaries intact between endpoints equipped with 178with datagram boundaries intact between endpoints equipped with
179interfaces like the BSD tun(4) device. Tunnel forwarding channels are 179interfaces like the BSD tun(4) device. Tunnel forwarding channels are
180requested by the client with the following packet: 180requested by the client with the following packet:
181 181
@@ -453,4 +453,4 @@ respond with a SSH_FXP_STATUS message.
453This extension is advertised in the SSH_FXP_VERSION hello with version 453This extension is advertised in the SSH_FXP_VERSION hello with version
454"1". 454"1".
455 455
456$OpenBSD: PROTOCOL,v 1.27 2015/02/20 22:17:21 djm Exp $ 456$OpenBSD: PROTOCOL,v 1.28 2015/05/08 03:56:51 djm Exp $
diff --git a/PROTOCOL.agent b/PROTOCOL.agent
index 3fcaa14d4..27ec0c1de 100644
--- a/PROTOCOL.agent
+++ b/PROTOCOL.agent
@@ -413,7 +413,7 @@ It may be requested using this message:
413 413
414"rsa_e" and "rsa_n" are used to identify which private key to use. 414"rsa_e" and "rsa_n" are used to identify which private key to use.
415"encrypted_challenge" is a challenge blob that has (presumably) 415"encrypted_challenge" is a challenge blob that has (presumably)
416been encrypted with the public key and must be in the range 416been encrypted with the public key and must be in the range
4171 <= encrypted_challenge < 2^256. "session_id" is the SSH protocol 1 4171 <= encrypted_challenge < 2^256. "session_id" is the SSH protocol 1
418session ID (computed from the server host key, the server semi-ephemeral 418session ID (computed from the server host key, the server semi-ephemeral
419key and the session cookie). 419key and the session cookie).
@@ -557,4 +557,4 @@ Locking and unlocking affects both protocol 1 and protocol 2 keys.
557 SSH_AGENT_CONSTRAIN_LIFETIME 1 557 SSH_AGENT_CONSTRAIN_LIFETIME 1
558 SSH_AGENT_CONSTRAIN_CONFIRM 2 558 SSH_AGENT_CONSTRAIN_CONFIRM 2
559 559
560$OpenBSD: PROTOCOL.agent,v 1.7 2013/01/02 00:33:49 djm Exp $ 560$OpenBSD: PROTOCOL.agent,v 1.8 2015/05/08 03:56:51 djm Exp $