On Sat, 7 Mar 2015, Damien Miller wrote:
> On Fri, 6 Mar 2015, Martin Hecht wrote:
>
> > on Ubuntu 14.04 with openssh-SNAP-20150306.tar.gz with gcc, libz-dev,
> > and libssl-dev
> >
> > configure; make; make tests
> >
> > fails at:
> >
> > test_hostkeys:
> > regress/unittests/hostkeys/test_iterate.c:124 test #1 "hostkeys_iterate
> > all with key parse" - entry 5/61, file line 5
> > ASSERT_PTR_EQ(l->key, NULL) failed:
> > l->key = 0x2b14c2d7af80
> > NULL = (nil)
>
> Already fixed in HEAD:
oops, wrong diff - this is the fix for the unit test failure:
commit b44ee0c998fb4c5f3c3281f2398af5ce42840b6f
Author: Damien Miller <djm@xxxxxxxxxxx>
Date: Thu Mar 5 18:39:20 2015 -0800
unbreak hostkeys test for w/ SSH1 case
diff --git regress/unittests/hostkeys/test_iterate.c regress/unittests/hostkeys/test_iterate.c
index fc095ea..5ea576c 100644
--- regress/unittests/hostkeys/test_iterate.c
+++ regress/unittests/hostkeys/test_iterate.c
@@ -141,8 +141,10 @@ prepare_expected(struct expected *expected, size_t n)
for (i = 0; i < n; i++) {
if (expected[i].key_file == NULL)
continue;
+#ifndef WITH_SSH1
if (expected[i].l.keytype == KEY_RSA1)
continue;
+#endif
ASSERT_INT_EQ(sshkey_load_public(
test_data_file(expected[i].key_file), &expected[i].l.key,
NULL), 0);
_______________________________________________
openssh-unix-dev mailing list
openssh-unix-dev@xxxxxxxxxxx
https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev
