summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-08-31 22:41:14 +1000
committerDamien Miller <djm@mindrot.org>2010-08-31 22:41:14 +1000
commiteb8b60e320cdade9f4c07e2abacfb92c52e01348 (patch)
tree4e5bc25790566402e5b7ae00cefd2c57e867ef09 /myproposal.h
parentda108ece6843f1268aa36d7c8ed0030dc53acd15 (diff)
- djm@cvs.openbsd.org 2010/08/31 11:54:45
[PROTOCOL PROTOCOL.agent PROTOCOL.certkeys auth2-jpake.c authfd.c] [authfile.c buffer.h dns.c kex.c kex.h key.c key.h monitor.c] [monitor_wrap.c myproposal.h packet.c packet.h pathnames.h readconf.c] [ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c] [ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 ssh.1 ssh.c ssh2.h] [ssh_config.5 sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config.5] [uuencode.c uuencode.h bufec.c kexecdh.c kexecdhc.c kexecdhs.c ssh-ecdsa.c] Implement Elliptic Curve Cryptography modes for key exchange (ECDH) and host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA offer better performance than plain DH and DSA at the same equivalent symmetric key length, as well as much shorter keys. Only the mandatory sections of RFC5656 are implemented, specifically the three REQUIRED curves nistp256, nistp384 and nistp521 and only ECDH and ECDSA. Point compression (optional in RFC5656 is NOT implemented). Certificate host and user keys using the new ECDSA key types are supported. Note that this code has not been tested for interoperability and may be subject to change. feedback and ok markus@
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h32
1 files changed, 25 insertions, 7 deletions
diff --git a/myproposal.h b/myproposal.h
index 7bedfab0a..71f90ee5e 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: myproposal.h,v 1.25 2010/04/16 01:47:26 djm Exp $ */ 1/* $OpenBSD: myproposal.h,v 1.26 2010/08/31 11:54:45 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -32,20 +32,38 @@
32 "diffie-hellman-group-exchange-sha1," \ 32 "diffie-hellman-group-exchange-sha1," \
33 "diffie-hellman-group14-sha1," \ 33 "diffie-hellman-group14-sha1," \
34 "diffie-hellman-group1-sha1" 34 "diffie-hellman-group1-sha1"
35
36#define KEX_DEFAULT_PK_ALG \
37 "ssh-rsa-cert-v01@openssh.com," \
38 "ssh-dss-cert-v01@openssh.com," \
39 "ssh-rsa-cert-v00@openssh.com," \
40 "ssh-dss-cert-v00@openssh.com," \
41 "ssh-rsa," \
42 "ssh-dss"
35#else 43#else
36# define KEX_DEFAULT_KEX \ 44# define KEX_DEFAULT_KEX \
45 "ecdh-sha2-nistp521," \
46 "ecdh-sha2-nistp256," \
47 "ecdh-sha2-nistp384," \
37 "diffie-hellman-group-exchange-sha256," \ 48 "diffie-hellman-group-exchange-sha256," \
38 "diffie-hellman-group-exchange-sha1," \ 49 "diffie-hellman-group-exchange-sha1," \
39 "diffie-hellman-group14-sha1," \ 50 "diffie-hellman-group14-sha1," \
40 "diffie-hellman-group1-sha1" 51 "diffie-hellman-group1-sha1"
41#endif
42 52
43#define KEX_DEFAULT_PK_ALG \ 53#define KEX_DEFAULT_PK_ALG \
44 "ssh-rsa-cert-v01@openssh.com," \ 54 "ecdsa-sha2-nistp256-cert-v01@openssh.com," \
45 "ssh-dss-cert-v01@openssh.com," \ 55 "ecdsa-sha2-nistp384-cert-v01@openssh.com," \
46 "ssh-rsa-cert-v00@openssh.com," \ 56 "ecdsa-sha2-nistp521-cert-v01@openssh.com," \
47 "ssh-dss-cert-v00@openssh.com," \ 57 "ssh-rsa-cert-v01@openssh.com," \
48 "ssh-rsa,ssh-dss" 58 "ssh-dss-cert-v01@openssh.com," \
59 "ssh-rsa-cert-v00@openssh.com," \
60 "ssh-dss-cert-v00@openssh.com," \
61 "ecdsa-sha2-nistp256," \
62 "ecdsa-sha2-nistp384," \
63 "ecdsa-sha2-nistp521," \
64 "ssh-rsa," \
65 "ssh-dss"
66#endif
49 67
50#define KEX_DEFAULT_ENCRYPT \ 68#define KEX_DEFAULT_ENCRYPT \
51 "aes128-ctr,aes192-ctr,aes256-ctr," \ 69 "aes128-ctr,aes192-ctr,aes256-ctr," \