summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--myproposal.h25
-rw-r--r--servconf.c6
2 files changed, 27 insertions, 4 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"
diff --git a/servconf.c b/servconf.c
index e76f9c39e..e2f44d38d 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.352 2019/09/06 14:45:34 naddy Exp $ */ 2/* $OpenBSD: servconf.c,v 1.353 2019/10/31 21:17:49 djm Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
@@ -210,7 +210,7 @@ assemble_algorithms(ServerOptions *o)
210 ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, all_kex); 210 ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, all_kex);
211 ASSEMBLE(hostkeyalgorithms, KEX_DEFAULT_PK_ALG, all_key); 211 ASSEMBLE(hostkeyalgorithms, KEX_DEFAULT_PK_ALG, all_key);
212 ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, all_key); 212 ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, all_key);
213 ASSEMBLE(pubkey_key_types, KEX_DEFAULT_PK_ALG, all_key); 213 ASSEMBLE(pubkey_key_types, PUBKEY_DEFAULT_PK_ALG, all_key);
214 ASSEMBLE(ca_sign_algorithms, SSH_ALLOWED_CA_SIGALGS, all_sig); 214 ASSEMBLE(ca_sign_algorithms, SSH_ALLOWED_CA_SIGALGS, all_sig);
215#undef ASSEMBLE 215#undef ASSEMBLE
216 free(all_cipher); 216 free(all_cipher);
@@ -2641,7 +2641,7 @@ dump_config(ServerOptions *o)
2641 dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms ? 2641 dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms ?
2642 o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG); 2642 o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG);
2643 dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types ? 2643 dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types ?
2644 o->pubkey_key_types : KEX_DEFAULT_PK_ALG); 2644 o->pubkey_key_types : PUBKEY_DEFAULT_PK_ALG);
2645 dump_cfg_string(sRDomain, o->routing_domain); 2645 dump_cfg_string(sRDomain, o->routing_domain);
2646 2646
2647 /* string arguments requiring a lookup */ 2647 /* string arguments requiring a lookup */