diff options
author | markus@openbsd.org <markus@openbsd.org> | 2019-11-12 19:33:08 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-13 08:54:09 +1100 |
commit | 2c55744a56de0ffc81fe445a1e7fc5cd308712b3 (patch) | |
tree | 349cdc436823354aca60031358a6030313b6002d /myproposal.h | |
parent | fd1a3b5e38721b1d69aae2d9de1a1d9155dfa5c7 (diff) |
upstream: enable ed25519 support; ok djm
OpenBSD-Commit-ID: 1a399c5b3ef15bd8efb916110cf5a9e0b554ab7e
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/myproposal.h b/myproposal.h index a22649a2e..90bb67bb3 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.60 2019/11/01 02:32:05 djm Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.61 2019/11/12 19:33:08 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -149,6 +149,7 @@ | |||
149 | "ecdsa-sha2-nistp256-cert-v01@openssh.com," \ | 149 | "ecdsa-sha2-nistp256-cert-v01@openssh.com," \ |
150 | "ecdsa-sha2-nistp384-cert-v01@openssh.com," \ | 150 | "ecdsa-sha2-nistp384-cert-v01@openssh.com," \ |
151 | "ecdsa-sha2-nistp521-cert-v01@openssh.com," \ | 151 | "ecdsa-sha2-nistp521-cert-v01@openssh.com," \ |
152 | "sk-ssh-ed25519-cert-v01@openssh.com," \ | ||
152 | "ssh-ed25519-cert-v01@openssh.com," \ | 153 | "ssh-ed25519-cert-v01@openssh.com," \ |
153 | "rsa-sha2-512-cert-v01@openssh.com," \ | 154 | "rsa-sha2-512-cert-v01@openssh.com," \ |
154 | "rsa-sha2-256-cert-v01@openssh.com," \ | 155 | "rsa-sha2-256-cert-v01@openssh.com," \ |
@@ -157,6 +158,7 @@ | |||
157 | "ecdsa-sha2-nistp256," \ | 158 | "ecdsa-sha2-nistp256," \ |
158 | "ecdsa-sha2-nistp384," \ | 159 | "ecdsa-sha2-nistp384," \ |
159 | "ecdsa-sha2-nistp521," \ | 160 | "ecdsa-sha2-nistp521," \ |
161 | "sk-ssh-ed25519@openssh.com," \ | ||
160 | "ssh-ed25519," \ | 162 | "ssh-ed25519," \ |
161 | "rsa-sha2-512," \ | 163 | "rsa-sha2-512," \ |
162 | "rsa-sha2-256," \ | 164 | "rsa-sha2-256," \ |