diff options
author | Damien Miller <djm@mindrot.org> | 2010-02-27 07:55:05 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-02-27 07:55:05 +1100 |
commit | 0a80ca190a39943029719facf7edb990def7ae62 (patch) | |
tree | e423e30d8412de67170b8240ba919df10ed8e391 /PROTOCOL.agent | |
parent | d27d85d5320bb946d4bb734dcf45a8d20bad6020 (diff) |
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2010/02/26 20:29:54
[PROTOCOL PROTOCOL.agent PROTOCOL.certkeys addrmatch.c auth-options.c]
[auth-options.h auth.h auth2-pubkey.c authfd.c dns.c dns.h hostfile.c]
[hostfile.h kex.h kexdhs.c kexgexs.c key.c key.h match.h monitor.c]
[myproposal.h servconf.c servconf.h ssh-add.c ssh-agent.c ssh-dss.c]
[ssh-keygen.1 ssh-keygen.c ssh-rsa.c ssh.1 ssh.c ssh2.h sshconnect.c]
[sshconnect2.c sshd.8 sshd.c sshd_config.5]
Add support for certificate key types for users and hosts.
OpenSSH certificate key types are not X.509 certificates, but a much
simpler format that encodes a public key, identity information and
some validity constraints and signs it with a CA key. CA keys are
regular SSH keys. This certificate style avoids the attack surface
of X.509 certificates and is very easy to deploy.
Certified host keys allow automatic acceptance of new host keys
when a CA certificate is marked as sh/known_hosts.
see VERIFYING HOST KEYS in ssh(1) for details.
Certified user keys allow authentication of users when the signing
CA key is marked as trusted in authorized_keys. See "AUTHORIZED_KEYS
FILE FORMAT" in sshd(8) for details.
Certificates are minted using ssh-keygen(1), documentation is in
the "CERTIFICATES" section of that manpage.
Documentation on the format of certificates is in the file
PROTOCOL.certkeys
feedback and ok markus@
Diffstat (limited to 'PROTOCOL.agent')
-rw-r--r-- | PROTOCOL.agent | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/PROTOCOL.agent b/PROTOCOL.agent index 49adbdd5c..b34fcd318 100644 --- a/PROTOCOL.agent +++ b/PROTOCOL.agent | |||
@@ -173,6 +173,15 @@ be added using the following request | |||
173 | string key_comment | 173 | string key_comment |
174 | constraint[] key_constraints | 174 | constraint[] key_constraints |
175 | 175 | ||
176 | DSA certificates may be added with: | ||
177 | byte SSH2_AGENTC_ADD_IDENTITY or | ||
178 | SSH2_AGENTC_ADD_ID_CONSTRAINED | ||
179 | string "ssh-dss-cert-v00@openssh.com" | ||
180 | string certificate | ||
181 | mpint dsa_private_key | ||
182 | string key_comment | ||
183 | constraint[] key_constraints | ||
184 | |||
176 | RSA keys may be added with this request: | 185 | RSA keys may be added with this request: |
177 | 186 | ||
178 | byte SSH2_AGENTC_ADD_IDENTITY or | 187 | byte SSH2_AGENTC_ADD_IDENTITY or |
@@ -187,6 +196,19 @@ RSA keys may be added with this request: | |||
187 | string key_comment | 196 | string key_comment |
188 | constraint[] key_constraints | 197 | constraint[] key_constraints |
189 | 198 | ||
199 | RSA certificates may be added with this request: | ||
200 | |||
201 | byte SSH2_AGENTC_ADD_IDENTITY or | ||
202 | SSH2_AGENTC_ADD_ID_CONSTRAINED | ||
203 | string "ssh-rsa-cert-v00@openssh.com" | ||
204 | string certificate | ||
205 | mpint rsa_d | ||
206 | mpint rsa_iqmp | ||
207 | mpint rsa_p | ||
208 | mpint rsa_q | ||
209 | string key_comment | ||
210 | constraint[] key_constraints | ||
211 | |||
190 | Note that the 'rsa_p' and 'rsa_q' parameters are sent in the reverse | 212 | Note that the 'rsa_p' and 'rsa_q' parameters are sent in the reverse |
191 | order to the protocol 1 add keys message. As with the corresponding | 213 | order to the protocol 1 add keys message. As with the corresponding |
192 | protocol 1 "add key" request, the private key is overspecified to avoid | 214 | protocol 1 "add key" request, the private key is overspecified to avoid |
@@ -513,4 +535,4 @@ Locking and unlocking affects both protocol 1 and protocol 2 keys. | |||
513 | SSH_AGENT_CONSTRAIN_LIFETIME 1 | 535 | SSH_AGENT_CONSTRAIN_LIFETIME 1 |
514 | SSH_AGENT_CONSTRAIN_CONFIRM 2 | 536 | SSH_AGENT_CONSTRAIN_CONFIRM 2 |
515 | 537 | ||
516 | $OpenBSD: PROTOCOL.agent,v 1.4 2008/07/01 23:12:47 stevesk Exp $ | 538 | $OpenBSD: PROTOCOL.agent,v 1.5 2010/02/26 20:29:54 djm Exp $ |