diff options
| author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
| commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
| tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /PROTOCOL.agent | |
| parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
| parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) | |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'PROTOCOL.agent')
| -rw-r--r-- | PROTOCOL.agent | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
| 152 | computation. | 152 | computation. |
| 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 |
| 155 | SSH_AGENTC_ADD_RSA_IDENTITY. | 155 | SSH_AGENTC_ADD_RSA_ID_CONSTRAINED. |
| 156 | 156 | ||
| 157 | The agent will reply with a SSH_AGENT_SUCCESS if the key has been | 157 | The agent will reply with a SSH_AGENT_SUCCESS if the key has been |
| 158 | successfully added or a SSH_AGENT_FAILURE if an error occurred. | 158 | successfully 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 $ |