diff options
author | Damien Miller <djm@cvs.openbsd.org> | 2015-05-04 06:10:49 +0000 |
---|---|---|
committer | Damien Miller <djm@cvs.openbsd.org> | 2015-05-04 06:10:49 +0000 |
commit | 7c60c12802d497e1d9c92a59ad2acfff12123b97 (patch) | |
tree | adc56f670e95f7dcf8f3a3de8516f527f42db9c6 /usr.bin/ssh/clientloop.c | |
parent | 181720c1534f47160478b185bc9faa1de1072982 (diff) |
Remove pattern length argument from match_pattern_list(),
we only ever use it for strlen(pattern).
Prompted by hanno AT hboeck.de pointing an out-of-bound read
error caused by an incorrect pattern length found using AFL
and his own tools.
ok markus@
Diffstat (limited to 'usr.bin/ssh/clientloop.c')
-rw-r--r-- | usr.bin/ssh/clientloop.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index f48da4f34c6..878c8c6aee0 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.272 2015/02/25 19:54:02 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.273 2015/05/04 06:10:48 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2334,8 +2334,7 @@ client_input_hostkeys(void) /* Check that the key is accepted in HostkeyAlgorithms */ if (options.hostkeyalgorithms != NULL && match_pattern_list(sshkey_ssh_name(key), - options.hostkeyalgorithms, - strlen(options.hostkeyalgorithms), 0) != 1) { + options.hostkeyalgorithms, 0) != 1) { debug3("%s: %s key not permitted by HostkeyAlgorithms", __func__, sshkey_ssh_name(key)); continue; |