summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/myproposal.h
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2013-12-06 13:39:50 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2013-12-06 13:39:50 +0000
commita290ddcba332424443fa2507428cf4bdfd415bac (patch)
tree77d1dc09898f6b40a269e48d8520cffd5bb31dc0 /usr.bin/ssh/myproposal.h
parent4b5b44f5080b9b0bd2e297236bde454a7b1d32aa (diff)
support ed25519 keys (hostkeys and user identities) using the public domain
ed25519 reference code from SUPERCOP, see http://ed25519.cr.yp.to/software.html feedback, help & ok djm@
Diffstat (limited to 'usr.bin/ssh/myproposal.h')
-rw-r--r--usr.bin/ssh/myproposal.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/myproposal.h b/usr.bin/ssh/myproposal.h
index 850ebf6918a..30061aea0ed 100644
--- a/usr.bin/ssh/myproposal.h
+++ b/usr.bin/ssh/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.34 2013/11/21 00:45:44 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.35 2013/12/06 13:39:49 markus Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -38,6 +38,7 @@
"ecdsa-sha2-nistp256-cert-v01@openssh.com," \
"ecdsa-sha2-nistp384-cert-v01@openssh.com," \
"ecdsa-sha2-nistp521-cert-v01@openssh.com," \
+ "ssh-ed25519-cert-v01@openssh.com," \
"ssh-rsa-cert-v01@openssh.com," \
"ssh-dss-cert-v01@openssh.com," \
"ssh-rsa-cert-v00@openssh.com," \
@@ -45,6 +46,7 @@
"ecdsa-sha2-nistp256," \
"ecdsa-sha2-nistp384," \
"ecdsa-sha2-nistp521," \
+ "ssh-ed25519," \
"ssh-rsa," \
"ssh-dss"