summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index c261dfd18..68d56d020 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.135 2004/03/05 10:53:58 markus Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.138 2004/06/13 12:53:24 djm Exp $");
27 27
28#include "openbsd-compat/sys-queue.h" 28#include "openbsd-compat/sys-queue.h"
29 29
@@ -43,7 +43,7 @@ RCSID("$OpenBSD: sshconnect2.c,v 1.135 2004/03/05 10:53:58 markus Exp $");
43#include "authfd.h" 43#include "authfd.h"
44#include "log.h" 44#include "log.h"
45#include "readconf.h" 45#include "readconf.h"
46#include "readpass.h" 46#include "misc.h"
47#include "match.h" 47#include "match.h"
48#include "dispatch.h" 48#include "dispatch.h"
49#include "canohost.h" 49#include "canohost.h"
@@ -120,6 +120,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
120 /* start key exchange */ 120 /* start key exchange */
121 kex = kex_setup(myproposal); 121 kex = kex_setup(myproposal);
122 kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; 122 kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;
123 kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;
123 kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; 124 kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
124 kex->client_version_string=client_version_string; 125 kex->client_version_string=client_version_string;
125 kex->server_version_string=server_version_string; 126 kex->server_version_string=server_version_string;
@@ -458,7 +459,7 @@ input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt)
458 * moved to the end of the queue. this also avoids confusion by 459 * moved to the end of the queue. this also avoids confusion by
459 * duplicate keys 460 * duplicate keys
460 */ 461 */
461 TAILQ_FOREACH_REVERSE(id, &authctxt->keys, next, idlist) { 462 TAILQ_FOREACH_REVERSE(id, &authctxt->keys, idlist, next) {
462 if (key_equal(key, id->key)) { 463 if (key_equal(key, id->key)) {
463 sent = sign_and_send_pubkey(authctxt, id); 464 sent = sign_and_send_pubkey(authctxt, id);
464 break; 465 break;