diff options
| author | Pauli <paul.dale@oracle.com> | 2020-11-04 22:34:52 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-11-12 08:35:47 +1000 |
| commit | c87a7f31a3db97376d764583ad5ee4a76db2cbef (patch) | |
| tree | f600b840e5a7833b24f2047ba87e61618a3dd81b /test | |
| parent | 93c87f745d5694b829d5b52d371d478b063a1fba (diff) | |
apps/passwd: remove the -crypt option.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13313)
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/20-test_passwd.t | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/test/recipes/20-test_passwd.t b/test/recipes/20-test_passwd.t index 65d6e0d25d..9707ecc3f2 100644 --- a/test/recipes/20-test_passwd.t +++ b/test/recipes/20-test_passwd.t @@ -76,12 +76,9 @@ my @sha_tests = expected => '$6$rounds=1000$roundstoolow$kUMsbe306n21p9R.FRkW3IGn.S9NPN0x50YhH1xhLsPuWGsUSklZt58jaTfF4ZEQpyUNGc0dqbpBYYBaHHrsX.' } ); -plan tests => (disabled("des") || disabled('deprecated-3.0') ? 9 : 11) + scalar @sha_tests; +plan tests => 9 + scalar @sha_tests; -ok(compare1stline_re([qw{openssl passwd password}], '^.{13}\R$'), - 'crypt password with random salt') - if !disabled("des") && !disabled('deprecated-3.0'); ok(compare1stline_re([qw{openssl passwd -1 password}], '^\$1\$.{8}\$.{22}\R$'), 'BSD style MD5 password with random salt'); ok(compare1stline_re([qw{openssl passwd -apr1 password}], '^\$apr1\$.{8}\$.{22}\R$'), @@ -91,9 +88,6 @@ ok(compare1stline_re([qw{openssl passwd -5 password}], '^\$5\$.{16}\$.{43}\R$'), ok(compare1stline_re([qw{openssl passwd -6 password}], '^\$6\$.{16}\$.{86}\R$'), 'Apache SHA512 password with random salt'); -ok(compare1stline([qw{openssl passwd -salt xx password}], 'xxj31ZMTZzkVA'), - 'crypt password with salt xx') - if !disabled("des") && !disabled('deprecated-3.0'); ok(compare1stline([qw{openssl passwd -salt xxxxxxxx -1 password}], '$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.'), 'BSD style MD5 password with salt xxxxxxxx'); ok(compare1stline([qw{openssl passwd -salt xxxxxxxx -apr1 password}], '$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0'), |