diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-03-31 22:59:01 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-04-01 10:03:05 +1100 |
commit | 7da2be0cb9601ed25460c83aa4d44052b967ba0f (patch) | |
tree | c65f7dd116a210c7a53a5e933032c926bc95fb19 /regress/unittests/hostkeys/test_iterate.c | |
parent | 9e1777a0d1c706714b055811c12ab8cc21033e4a (diff) |
upstream commit
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@
Diffstat (limited to 'regress/unittests/hostkeys/test_iterate.c')
-rw-r--r-- | regress/unittests/hostkeys/test_iterate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/unittests/hostkeys/test_iterate.c b/regress/unittests/hostkeys/test_iterate.c index d81291b68..2eaaf063a 100644 --- a/regress/unittests/hostkeys/test_iterate.c +++ b/regress/unittests/hostkeys/test_iterate.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: test_iterate.c,v 1.3 2015/03/07 04:41:48 djm Exp $ */ | 1 | /* $OpenBSD: test_iterate.c,v 1.4 2015/03/31 22:59:01 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Regress test for hostfile.h hostkeys_foreach() | 3 | * Regress test for hostfile.h hostkeys_foreach() |
4 | * | 4 | * |
@@ -91,8 +91,8 @@ check(struct hostkey_foreach_line *l, void *_ctx) | |||
91 | expected->l.keytype : expected->no_parse_keytype; | 91 | expected->l.keytype : expected->no_parse_keytype; |
92 | 92 | ||
93 | #ifndef WITH_SSH1 | 93 | #ifndef WITH_SSH1 |
94 | if (expected->l.keytype == KEY_RSA1 || | 94 | if (parse_key && (expected->l.keytype == KEY_RSA1 || |
95 | expected->no_parse_keytype == KEY_RSA1) { | 95 | expected->no_parse_keytype == KEY_RSA1)) { |
96 | expected_status = HKF_STATUS_INVALID; | 96 | expected_status = HKF_STATUS_INVALID; |
97 | expected_keytype = KEY_UNSPEC; | 97 | expected_keytype = KEY_UNSPEC; |
98 | parse_key = 0; | 98 | parse_key = 0; |