summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/myproposal.h b/myproposal.h
index 08782dd30..27b4a15a1 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: myproposal.h,v 1.56 2018/07/03 11:39:54 djm Exp $ */ 1/* $OpenBSD: myproposal.h,v 1.57 2018/09/12 01:34:02 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -139,6 +139,16 @@
139 139
140#define KEX_CLIENT_MAC KEX_SERVER_MAC 140#define KEX_CLIENT_MAC KEX_SERVER_MAC
141 141
142/* Not a KEX value, but here so all the algorithm defaults are together */
143#define SSH_ALLOWED_CA_SIGALGS \
144 "ecdsa-sha2-nistp256," \
145 "ecdsa-sha2-nistp384," \
146 "ecdsa-sha2-nistp521," \
147 "ssh-ed25519," \
148 "rsa-sha2-512," \
149 "rsa-sha2-256," \
150 "ssh-rsa"
151
142#else /* WITH_OPENSSL */ 152#else /* WITH_OPENSSL */
143 153
144#define KEX_SERVER_KEX \ 154#define KEX_SERVER_KEX \
@@ -166,6 +176,8 @@
166#define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT 176#define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT
167#define KEX_CLIENT_MAC KEX_SERVER_MAC 177#define KEX_CLIENT_MAC KEX_SERVER_MAC
168 178
179#define SSH_ALLOWED_CA_SIGALGS "ssh-ed25519"
180
169#endif /* WITH_OPENSSL */ 181#endif /* WITH_OPENSSL */
170 182
171#define KEX_DEFAULT_COMP "none,zlib@openssh.com" 183#define KEX_DEFAULT_COMP "none,zlib@openssh.com"