diff options
| author | Renato Botelho <renato@netgate.com> | 2015-12-10 17:01:14 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-12-10 17:01:14 -0200 |
| commit | a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82 (patch) | |
| tree | 71acee51f11c433be4c4a51635ce1ea4302ca4b6 /contrib/netbsd-tests/lib/libcrypt/t_crypt.c | |
| parent | 54cf5d1b6607c1e6f2cbf32784c33720517bce49 (diff) | |
| parent | 3bc7f4d78d27696df85e118c07aa5a2630188922 (diff) | |
| download | FreeBSD-src-a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82.zip FreeBSD-src-a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'contrib/netbsd-tests/lib/libcrypt/t_crypt.c')
| -rw-r--r-- | contrib/netbsd-tests/lib/libcrypt/t_crypt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/netbsd-tests/lib/libcrypt/t_crypt.c b/contrib/netbsd-tests/lib/libcrypt/t_crypt.c index a5a4dcb..9b47692 100644 --- a/contrib/netbsd-tests/lib/libcrypt/t_crypt.c +++ b/contrib/netbsd-tests/lib/libcrypt/t_crypt.c @@ -124,11 +124,13 @@ ATF_TC_HEAD(crypt_salts, tc) ATF_TC_BODY(crypt_salts, tc) { for (size_t i = 0; tests[i].hash; i++) { + char *hash = crypt(tests[i].pw, tests[i].hash); #if defined(__FreeBSD__) - if (22 <= i) + if (i >= 22 && i != 24 && i != 25) atf_tc_expect_fail("Old-style/bad inputs fail on FreeBSD"); + else + atf_tc_expect_pass(); #endif - char *hash = crypt(tests[i].pw, tests[i].hash); if (!hash) { ATF_CHECK_MSG(0, "Test %zu NULL\n", i); continue; |
