summaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2019-09-06 14:45:34 +0000
committerDamien Miller <djm@mindrot.org>2019-09-08 14:49:04 +1000
commit91a2135f32acdd6378476c5bae475a6e7811a6a2 (patch)
treeda8ddb5e4236cb12f3c70ab939e3abe674aa8ba4 /kex.c
parentc8bdd2db77ac2369d5cdee237656f266c8f41552 (diff)
upstream: Allow prepending a list of algorithms to the default set
by starting the list with the '^' character, e.g. HostKeyAlgorithms ^ssh-ed25519 Ciphers ^aes128-gcm@openssh.com,aes256-gcm@openssh.com ok djm@ dtucker@ OpenBSD-Commit-ID: 1e1996fac0dc8a4b0d0ff58395135848287f6f97
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/kex.c b/kex.c
index 84f8e2aa9..5a8a03aad 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.c,v 1.153 2019/09/06 01:58:50 djm Exp $ */ 1/* $OpenBSD: kex.c,v 1.154 2019/09/06 14:45:34 naddy Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -213,8 +213,9 @@ kex_names_cat(const char *a, const char *b)
213/* 213/*
214 * Assemble a list of algorithms from a default list and a string from a 214 * Assemble a list of algorithms from a default list and a string from a
215 * configuration file. The user-provided string may begin with '+' to 215 * configuration file. The user-provided string may begin with '+' to
216 * indicate that it should be appended to the default or '-' that the 216 * indicate that it should be appended to the default, '-' that the
217 * specified names should be removed. 217 * specified names should be removed, or '^' that they should be placed
218 * at the head.
218 */ 219 */
219int 220int
220kex_assemble_names(char **listp, const char *def, const char *all) 221kex_assemble_names(char **listp, const char *def, const char *all)
@@ -251,6 +252,14 @@ kex_assemble_names(char **listp, const char *def, const char *all)
251 free(list); 252 free(list);
252 /* filtering has already been done */ 253 /* filtering has already been done */
253 return 0; 254 return 0;
255 } else if (*list == '^') {
256 /* Place names at head of default list */
257 if ((tmp = kex_names_cat(list + 1, def)) == NULL) {
258 r = SSH_ERR_ALLOC_FAIL;
259 goto fail;
260 }
261 free(list);
262 list = tmp;
254 } else { 263 } else {
255 /* Explicit list, overrides default - just use "list" as is */ 264 /* Explicit list, overrides default - just use "list" as is */
256 } 265 }