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

1 files changed, 2 insertions, 2 deletions

diff --git a/ssh.c b/ssh.c
index 654376981..cb321bcf3 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.505 2019/06/28 13:35:04 deraadt Exp $ */
+/* $OpenBSD: ssh.c,v 1.506 2019/09/06 14:45:34 naddy Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -877,7 +877,7 @@ main(int ac, char **av)
                         }
                         break;
                 case 'c':
-                        if (!ciphers_valid(*optarg == '+' ?
+                        if (!ciphers_valid(*optarg == '+' || *optarg == '^' ?
                             optarg + 1 : optarg)) {
                                 fprintf(stderr, "Unknown cipher type '%s'\n",
                                     optarg);