[openssl-commits] [openssl] master update

[Ben Laurie]

The branch master has been updated
       via  c1eba83fa0069feeb3513e537837b1458dd2b359 (commit)
      from  eb67172ae53da63a6ff5189dfde2af8f98309ce3 (commit)


- Log -----------------------------------------------------------------
commit c1eba83fa0069feeb3513e537837b1458dd2b359
Author: Ben Laurie <ben at links.org>
Date:   Sun Oct 2 11:19:29 2016 +0100

    Don't use DES when disabled.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/20-test_passwd.t | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/recipes/20-test_passwd.t b/test/recipes/20-test_passwd.t
index f6bcef8..5b69f88 100644
--- a/test/recipes/20-test_passwd.t
+++ b/test/recipes/20-test_passwd.t
@@ -11,6 +11,7 @@ use strict;
 use warnings;
 
 use OpenSSL::Test;
+use OpenSSL::Test::Utils;
 
 setup("test_passwd");
 
@@ -75,11 +76,11 @@ my @sha_tests =
        expected => '$6$rounds=1000$roundstoolow$kUMsbe306n21p9R.FRkW3IGn.S9NPN0x50YhH1xhLsPuWGsUSklZt58jaTfF4ZEQpyUNGc0dqbpBYYBaHHrsX.' }
     );
 
-plan tests => 10 + scalar @sha_tests;
+plan tests => (disabled("des") ? 8 : 10) + scalar @sha_tests;
 
 
 ok(compare1stline_re([qw{openssl passwd password}], '^.{13}\R$'),
-   'crypt password with random salt');
+   'crypt password with random salt') if !disabled("des");
 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$'),
@@ -90,7 +91,7 @@ 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');
+   'crypt password with salt xx') if !disabled("des");
 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'),