upstream commit

fix bug in previous; was printing incorrect string for
 failed host key algorithms negotiation

Upstream-ID: 22c0dc6bc61930513065d92e11f0753adc4c6e6e

diff --git a/kex.c b/kex.c
index 5e8b51394222db5c4db0a327a1ff2ec3bc2e996c..af2a41cca63a643c8252ddb70ed938ab6d0e94e8 100644 (file)
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.107 2015/07/29 04:43:06 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.108 2015/07/29 08:34:54 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -661,8 +661,8 @@ kex_choose_conf(struct ssh *ssh)
        }
        if ((r = choose_hostkeyalg(kex, cprop[PROPOSAL_SERVER_HOST_KEY_ALGS],
            sprop[PROPOSAL_SERVER_HOST_KEY_ALGS])) != 0) {
-               kex->failed_choice = cprop[PROPOSAL_SERVER_HOST_KEY_ALGS];
-               cprop[PROPOSAL_SERVER_HOST_KEY_ALGS] = NULL;
+               kex->failed_choice = peer[PROPOSAL_SERVER_HOST_KEY_ALGS];
+               peer[PROPOSAL_SERVER_HOST_KEY_ALGS] = NULL;
                goto out;
        }
        need = dh_need = 0;