upstream commit

Allow ssh_config and sshd_config kex parameters options be
 prefixed by a '+' to indicate that the specified items be appended to the
 default rather than replacing it.

approach suggested by dtucker@, feedback dlg@, ok markus@

Upstream-ID: 0f901137298fc17095d5756ff1561a7028e8882a

1 files changed, 18 insertions, 17 deletions

diff --git a/ssh.c b/ssh.c
index 3239108ec..59c1f931c 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.419 2015/07/20 18:42:35 millert Exp $ */
+/* $OpenBSD: ssh.c,v 1.420 2015/07/30 00:01:34 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -108,6 +108,7 @@
 #include "roaming.h"
 #include "version.h"
 #include "ssherr.h"
+#include "myproposal.h"
 
 #ifdef ENABLE_PKCS11
 #include "ssh-pkcs11.h"
@@ -794,26 +795,26 @@ main(int ac, char **av)
                         }
                         break;
                 case 'c':
-                        if (ciphers_valid(optarg)) {
+                        if (ciphers_valid(*optarg == '+' ?
+                            optarg + 1 : optarg)) {
                                 /* SSH2 only */
                                 options.ciphers = xstrdup(optarg);
                                 options.cipher = SSH_CIPHER_INVALID;
-                        } else {
-                                /* SSH1 only */
-                                options.cipher = cipher_number(optarg);
-                                if (options.cipher == -1) {
-                                        fprintf(stderr,
-                                            "Unknown cipher type '%s'\n",
-                                            optarg);
-                                        exit(255);
-                                }
-                                if (options.cipher == SSH_CIPHER_3DES)
-                                        options.ciphers = "3des-cbc";
-                                else if (options.cipher == SSH_CIPHER_BLOWFISH)
-                                        options.ciphers = "blowfish-cbc";
-                                else
-                                        options.ciphers = (char *)-1;
+                                break;
+                        }
+                        /* SSH1 only */
+                        options.cipher = cipher_number(optarg);
+                        if (options.cipher == -1) {
+                                fprintf(stderr, "Unknown cipher type '%s'\n",
+                                    optarg);
+                                exit(255);
                         }
+                        if (options.cipher == SSH_CIPHER_3DES)
+                                options.ciphers = xstrdup("3des-cbc");
+                        else if (options.cipher == SSH_CIPHER_BLOWFISH)
+                                options.ciphers = xstrdup("blowfish-cbc");
+                        else
+                                options.ciphers = xstrdup(KEX_CLIENT_ENCRYPT);
                         break;
                 case 'm':
                         if (mac_valid(optarg))