diff options
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/myproposal.h b/myproposal.h index 45db30e5b..5f528e4e1 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.58 2019/02/23 08:20:43 djm Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.59 2019/10/31 21:17:49 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -144,6 +144,24 @@ | |||
144 | "rsa-sha2-256," \ | 144 | "rsa-sha2-256," \ |
145 | "ssh-rsa" | 145 | "ssh-rsa" |
146 | 146 | ||
147 | #define PUBKEY_DEFAULT_PK_ALG \ | ||
148 | "sk-ecdsa-sha2-nistp256-cert-v01@openssh.com," \ | ||
149 | "ecdsa-sha2-nistp256-cert-v01@openssh.com," \ | ||
150 | "ecdsa-sha2-nistp384-cert-v01@openssh.com," \ | ||
151 | "ecdsa-sha2-nistp521-cert-v01@openssh.com," \ | ||
152 | "ssh-ed25519-cert-v01@openssh.com," \ | ||
153 | "rsa-sha2-512-cert-v01@openssh.com," \ | ||
154 | "rsa-sha2-256-cert-v01@openssh.com," \ | ||
155 | "ssh-rsa-cert-v01@openssh.com," \ | ||
156 | "sk-ecdsa-sha2-nistp256@openssh.com," \ | ||
157 | "ecdsa-sha2-nistp256," \ | ||
158 | "ecdsa-sha2-nistp384," \ | ||
159 | "ecdsa-sha2-nistp521," \ | ||
160 | "ssh-ed25519," \ | ||
161 | "rsa-sha2-512," \ | ||
162 | "rsa-sha2-256," \ | ||
163 | "ssh-rsa" | ||
164 | |||
147 | #else /* WITH_OPENSSL */ | 165 | #else /* WITH_OPENSSL */ |
148 | 166 | ||
149 | #define KEX_SERVER_KEX \ | 167 | #define KEX_SERVER_KEX \ |
@@ -152,6 +170,7 @@ | |||
152 | #define KEX_DEFAULT_PK_ALG \ | 170 | #define KEX_DEFAULT_PK_ALG \ |
153 | "ssh-ed25519-cert-v01@openssh.com," \ | 171 | "ssh-ed25519-cert-v01@openssh.com," \ |
154 | "ssh-ed25519" | 172 | "ssh-ed25519" |
173 | #define PUBKEY_DEFAULT_PK_ALG KEX_DEFAULT_PK_ALG | ||
155 | #define KEX_SERVER_ENCRYPT \ | 174 | #define KEX_SERVER_ENCRYPT \ |
156 | "chacha20-poly1305@openssh.com," \ | 175 | "chacha20-poly1305@openssh.com," \ |
157 | "aes128-ctr,aes192-ctr,aes256-ctr" | 176 | "aes128-ctr,aes192-ctr,aes256-ctr" |
@@ -173,6 +192,10 @@ | |||
173 | 192 | ||
174 | #define SSH_ALLOWED_CA_SIGALGS "ssh-ed25519" | 193 | #define SSH_ALLOWED_CA_SIGALGS "ssh-ed25519" |
175 | 194 | ||
195 | #define PUBKEY_DEFAULT_PK_ALG \ | ||
196 | "ssh-ed25519-cert-v01@openssh.com," \ | ||
197 | "ssh-ed25519" | ||
198 | |||
176 | #endif /* WITH_OPENSSL */ | 199 | #endif /* WITH_OPENSSL */ |
177 | 200 | ||
178 | #define KEX_DEFAULT_COMP "none,zlib@openssh.com" | 201 | #define KEX_DEFAULT_COMP "none,zlib@openssh.com" |