diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:20:57 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:20:57 +0000 |
| commit | d1667913ba37d7f61712e06dd6dd4919fe36a053 (patch) | |
| tree | 3b79bcd5316ce3cc395ffa0275b54faded8b2b92 /regress/unittests/hostkeys/test_iterate.c | |
| parent | Releasing progress-linux version 1:9.6p1-5~progress7.99u1. (diff) | |
| download | openssh-d1667913ba37d7f61712e06dd6dd4919fe36a053.tar.xz openssh-d1667913ba37d7f61712e06dd6dd4919fe36a053.zip | |
Merging upstream version 1:9.7p1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'regress/unittests/hostkeys/test_iterate.c')
| -rw-r--r-- | regress/unittests/hostkeys/test_iterate.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/regress/unittests/hostkeys/test_iterate.c b/regress/unittests/hostkeys/test_iterate.c index 84f26b5..7efb8e1 100644 --- a/regress/unittests/hostkeys/test_iterate.c +++ b/regress/unittests/hostkeys/test_iterate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: test_iterate.c,v 1.8 2021/12/14 21:25:27 deraadt Exp $ */ +/* $OpenBSD: test_iterate.c,v 1.9 2024/01/11 01:45:58 djm Exp $ */ /* * Regress test for hostfile.h hostkeys_foreach() * @@ -94,6 +94,11 @@ check(struct hostkey_foreach_line *l, void *_ctx) expected->no_parse_keytype == KEY_ECDSA) skip = 1; #endif /* OPENSSL_HAS_ECC */ +#ifndef WITH_DSA + if (expected->l.keytype == KEY_DSA || + expected->no_parse_keytype == KEY_DSA) + skip = 1; +#endif #ifndef WITH_OPENSSL if (expected->l.keytype == KEY_DSA || expected->no_parse_keytype == KEY_DSA || @@ -155,6 +160,10 @@ prepare_expected(struct expected *expected, size_t n) if (expected[i].l.keytype == KEY_ECDSA) continue; #endif /* OPENSSL_HAS_ECC */ +#ifndef WITH_DSA + if (expected[i].l.keytype == KEY_DSA) + continue; +#endif #ifndef WITH_OPENSSL switch (expected[i].l.keytype) { case KEY_RSA: |