summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-01-09 15:56:13 +1100
committerDamien Miller <djm@mindrot.org>2013-01-09 15:56:13 +1100
commit697485d50af953d36503c11d9e549dd0db8a3287 (patch)
treeea645608fd2d688b7703205c3ac165e4e334cdf8
parent73298f420efd37659f462d3eb10d8a7f71022e1b (diff)
- djm@cvs.openbsd.org 2013/01/02 00:33:49
[PROTOCOL.agent] correct format description for SSH_AGENTC_ADD_RSA_ID_CONSTRAINED bz#2051 from david AT lechnology.com
-rw-r--r--ChangeLog4
-rw-r--r--PROTOCOL.agent4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b15b99c8..35a29d51a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
7 [clientloop.c mux.c] 7 [clientloop.c mux.c]
8 channel_setup_local_fwd_listener() returns 0 on failure, not -ve 8 channel_setup_local_fwd_listener() returns 0 on failure, not -ve
9 bz#2055 reported by mathieu.lacage AT gmail.com 9 bz#2055 reported by mathieu.lacage AT gmail.com
10 - djm@cvs.openbsd.org 2013/01/02 00:33:49
11 [PROTOCOL.agent]
12 correct format description for SSH_AGENTC_ADD_RSA_ID_CONSTRAINED
13 bz#2051 from david AT lechnology.com
10 14
1120121217 1520121217
12 - (dtucker) [Makefile.in] Add some scaffolding so that the new regress 16 - (dtucker) [Makefile.in] Add some scaffolding so that the new regress
diff --git a/PROTOCOL.agent b/PROTOCOL.agent
index de94d037d..3fcaa14d4 100644
--- a/PROTOCOL.agent
+++ b/PROTOCOL.agent
@@ -152,7 +152,7 @@ fully specified using just rsa_q, rsa_p and rsa_e at the cost of extra
152computation. 152computation.
153 153
154"key_constraints" may only be present if the request type is 154"key_constraints" may only be present if the request type is
155SSH_AGENTC_ADD_RSA_IDENTITY. 155SSH_AGENTC_ADD_RSA_ID_CONSTRAINED.
156 156
157The agent will reply with a SSH_AGENT_SUCCESS if the key has been 157The agent will reply with a SSH_AGENT_SUCCESS if the key has been
158successfully added or a SSH_AGENT_FAILURE if an error occurred. 158successfully added or a SSH_AGENT_FAILURE if an error occurred.
@@ -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.6 2010/08/31 11:54:45 djm Exp $ 560$OpenBSD: PROTOCOL.agent,v 1.7 2013/01/02 00:33:49 djm Exp $