summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2019-11-12 19:33:08 +0000
committerDamien Miller <djm@mindrot.org>2019-11-13 08:54:09 +1100
commit2c55744a56de0ffc81fe445a1e7fc5cd308712b3 (patch)
tree349cdc436823354aca60031358a6030313b6002d /myproposal.h
parentfd1a3b5e38721b1d69aae2d9de1a1d9155dfa5c7 (diff)
downloadopenssh-git-2c55744a56de0ffc81fe445a1e7fc5cd308712b3.tar.gz
upstream: enable ed25519 support; ok djm
OpenBSD-Commit-ID: 1a399c5b3ef15bd8efb916110cf5a9e0b554ab7e
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/myproposal.h b/myproposal.h
index a22649a2..90bb67bb 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.60 2019/11/01 02:32:05 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.61 2019/11/12 19:33:08 markus Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -149,6 +149,7 @@
"ecdsa-sha2-nistp256-cert-v01@openssh.com," \
"ecdsa-sha2-nistp384-cert-v01@openssh.com," \
"ecdsa-sha2-nistp521-cert-v01@openssh.com," \
+ "sk-ssh-ed25519-cert-v01@openssh.com," \
"ssh-ed25519-cert-v01@openssh.com," \
"rsa-sha2-512-cert-v01@openssh.com," \
"rsa-sha2-256-cert-v01@openssh.com," \
@@ -157,6 +158,7 @@
"ecdsa-sha2-nistp256," \
"ecdsa-sha2-nistp384," \
"ecdsa-sha2-nistp521," \
+ "sk-ssh-ed25519@openssh.com," \
"ssh-ed25519," \
"rsa-sha2-512," \
"rsa-sha2-256," \