diff options
author | Damien Miller <djm@mindrot.org> | 2010-04-16 15:56:21 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-04-16 15:56:21 +1000 |
commit | 4e270b05dd9d850fb9e2e0ac43f33cb4090d3ebc (patch) | |
tree | 4fc84942b5966e9f38f18a1257ac43ddbed336be /myproposal.h | |
parent | 031c9100dfe3ee65a29084ebbd61965a76b3ad26 (diff) |
- djm@cvs.openbsd.org 2010/04/16 01:47:26
[PROTOCOL.certkeys auth-options.c auth-options.h auth-rsa.c]
[auth2-pubkey.c authfd.c key.c key.h myproposal.h ssh-add.c]
[ssh-agent.c ssh-dss.c ssh-keygen.1 ssh-keygen.c ssh-rsa.c]
[sshconnect.c sshconnect2.c sshd.c]
revised certificate format ssh-{dss,rsa}-cert-v01@openssh.com with the
following changes:
move the nonce field to the beginning of the certificate where it can
better protect against chosen-prefix attacks on the signature hash
Rename "constraints" field to "critical options"
Add a new non-critical "extensions" field
Add a serial number
The older format is still support for authentication and cert generation
(use "ssh-keygen -t v00 -s ca_key ..." to generate a v00 certificate)
ok markus@
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/myproposal.h b/myproposal.h index 98f27fd15..7bedfab0a 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.24 2010/02/26 20:29:54 djm Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.25 2010/04/16 01:47:26 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -40,9 +40,12 @@ | |||
40 | "diffie-hellman-group1-sha1" | 40 | "diffie-hellman-group1-sha1" |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | #define KEX_DEFAULT_PK_ALG "ssh-rsa-cert-v00@openssh.com," \ | 43 | #define KEX_DEFAULT_PK_ALG \ |
44 | "ssh-dss-cert-v00@openssh.com," \ | 44 | "ssh-rsa-cert-v01@openssh.com," \ |
45 | "ssh-rsa,ssh-dss" | 45 | "ssh-dss-cert-v01@openssh.com," \ |
46 | "ssh-rsa-cert-v00@openssh.com," \ | ||
47 | "ssh-dss-cert-v00@openssh.com," \ | ||
48 | "ssh-rsa,ssh-dss" | ||
46 | 49 | ||
47 | #define KEX_DEFAULT_ENCRYPT \ | 50 | #define KEX_DEFAULT_ENCRYPT \ |
48 | "aes128-ctr,aes192-ctr,aes256-ctr," \ | 51 | "aes128-ctr,aes192-ctr,aes256-ctr," \ |