diff options
| author |   djm <djm@openbsd.org> | 2015-03-31 22:59:01 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-03-31 22:59:01 +0000 |
| commit | 2375db8321e118b26d82cbd34743aca3c1de9709 (patch) | |
| tree | f595b24873cc87bd228e4ff437a56a59bda6233a | |
| parent | split SSH1 and OPENSSL build options like src/usr.bin/ssh and (diff) | |
| download | wireguard-openbsd-2375db8321e118b26d82cbd34743aca3c1de9709.tar.xz wireguard-openbsd-2375db8321e118b26d82cbd34743aca3c1de9709.zip | |
adapt to recent hostfile.c change: when parsing known_hosts without
fully parsing the keys therein, hostkeys_foreach() will now correctly
identify KEY_RSA1 keys; ok markus@ miod@
| -rw-r--r-- | regress/usr.bin/ssh/unittests/hostkeys/test_iterate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/usr.bin/ssh/unittests/hostkeys/test_iterate.c b/regress/usr.bin/ssh/unittests/hostkeys/test_iterate.c index d23c852e22e..ecf95d05b15 100644 --- a/regress/usr.bin/ssh/unittests/hostkeys/test_iterate.c +++ b/regress/usr.bin/ssh/unittests/hostkeys/test_iterate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: test_iterate.c,v 1.3 2015/03/07 04:41:48 djm Exp $ */ +/* $OpenBSD: test_iterate.c,v 1.4 2015/03/31 22:59:01 djm Exp $ */ /* * Regress test for hostfile.h hostkeys_foreach() * @@ -87,8 +87,8 @@ check(struct hostkey_foreach_line *l, void *_ctx) expected->l.keytype : expected->no_parse_keytype; #ifndef WITH_SSH1 - if (expected->l.keytype == KEY_RSA1 || - expected->no_parse_keytype == KEY_RSA1) { + if (parse_key && (expected->l.keytype == KEY_RSA1 || + expected->no_parse_keytype == KEY_RSA1)) { expected_status = HKF_STATUS_INVALID; expected_keytype = KEY_UNSPEC; parse_key = 0; |