32 lines
844 B
Diff
32 lines
844 B
Diff
|
# HG changeset patch
|
||
|
|
# Parent cb502e7e796ac9289a571167a97ad9ec91562efb
|
||
|
|
Silent warnings about unsupported KEX algorithms - synchronize behaviour with
|
||
|
|
that of MAC and cipher checking code paths.
|
||
|
|
|
||
|
|
bsc#1006166
|
||
|
|
|
||
|
|
diff --git a/openssh-7.2p2/kex.c b/openssh-7.2p2/kex.c
|
||
|
|
--- a/openssh-7.2p2/kex.c
|
||
|
|
+++ b/openssh-7.2p2/kex.c
|
||
|
|
@@ -192,17 +192,20 @@ kex_names_valid(const char *names)
|
||
|
|
|
||
|
|
if (names == NULL || strcmp(names, "") == 0)
|
||
|
|
return 0;
|
||
|
|
if ((s = cp = strdup(names)) == NULL)
|
||
|
|
return 0;
|
||
|
|
for ((p = strsep(&cp, ",")); p && *p != '\0';
|
||
|
|
(p = strsep(&cp, ","))) {
|
||
|
|
if (kex_alg_by_name(p) == NULL) {
|
||
|
|
+ /* do not complain here - MACs and ciphers checks
|
||
|
|
+ * are silent here
|
||
|
|
error("Unsupported KEX algorithm \"%.100s\"", p);
|
||
|
|
+ */
|
||
|
|
free(s);
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
debug3("kex names ok: [%s]", names);
|
||
|
|
free(s);
|
||
|
|
return 1;
|
||
|
|
}
|