summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-01-24 11:46:57 +0000
committerColin Watson <cjwatson@debian.org>2011-01-24 11:46:57 +0000
commit0970072c89b079b022538e3c366fbfa2c53fc821 (patch)
treeb7024712d74234bb5a8b036ccbc9109e2e211296 /monitor.c
parent4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 (diff)
parent478ff799463ca926a8dfbabf058f4e84aaffc65a (diff)
merge 5.7p1
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/monitor.c b/monitor.c
index 517acf3dc..73702d174 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.108 2010/07/13 23:13:16 djm Exp $ */ 1/* $OpenBSD: monitor.c,v 1.110 2010/09/09 10:45:45 djm Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -607,10 +607,10 @@ mm_answer_sign(int sock, Buffer *m)
607 p = buffer_get_string(m, &datlen); 607 p = buffer_get_string(m, &datlen);
608 608
609 /* 609 /*
610 * Supported KEX types will only return SHA1 (20 byte) or 610 * Supported KEX types use SHA1 (20 bytes), SHA256 (32 bytes),
611 * SHA256 (32 byte) hashes 611 * SHA384 (48 bytes) and SHA512 (64 bytes).
612 */ 612 */
613 if (datlen != 20 && datlen != 32) 613 if (datlen != 20 && datlen != 32 && datlen != 48 && datlen != 64)
614 fatal("%s: data length incorrect: %u", __func__, datlen); 614 fatal("%s: data length incorrect: %u", __func__, datlen);
615 615
616 /* save session id, it will be passed on the first call */ 616 /* save session id, it will be passed on the first call */
@@ -1708,6 +1708,7 @@ mm_get_kex(Buffer *m)
1708 kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; 1708 kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
1709 kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; 1709 kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
1710 kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; 1710 kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
1711 kex->kex[KEX_ECDH_SHA2] = kexecdh_server;
1711#ifdef GSSAPI 1712#ifdef GSSAPI
1712 if (options.gss_keyex) { 1713 if (options.gss_keyex) {
1713 kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; 1714 kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;