[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Ben Laurie]

The branch OpenSSL_1_1_0-stable has been updated
       via  dc2a7e42a2df59a344804d5cb23e5893b4842aa3 (commit)
      from  08a78f8c444cd8a66f847f250ee0974774d3e0e4 (commit)


- Log -----------------------------------------------------------------
commit dc2a7e42a2df59a344804d5cb23e5893b4842aa3
Author: Ben Laurie <ben at links.org>
Date:   Sat Oct 1 15:00:16 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 68169ac..cf9c2cc 100644
--- a/test/recipes/20-test_passwd.t
+++ b/test/recipes/20-test_passwd.t
@@ -11,19 +11,20 @@ use strict;
 use warnings;
 
 use OpenSSL::Test;
+use OpenSSL::Test::Utils;
 
 setup("test_passwd");
 
-plan tests => 6;
+plan tests => disabled("des") ? 4 : 6;
 
 ok(compare1stline([qw{openssl passwd password}], '^.{13}\R$'),
-   'crypt password with random salt');
+   'crypt password with random salt') if !disabled("des");
 ok(compare1stline([qw{openssl passwd -1 password}], '^\$1\$.{8}\$.{22}\R$'),
    'BSD style MD5 password with random salt');
 ok(compare1stline([qw{openssl passwd -apr1 password}], '^\$apr1\$.{8}\$.{22}\R$'),
    'Apache style MD5 password with random salt');
 ok(compare1stline([qw{openssl passwd -salt xx password}], '^xxj31ZMTZzkVA\R$'),
-   '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\.\R$'),
    'BSD style MD5 password with salt xxxxxxxx');
 ok(compare1stline([qw{openssl passwd -salt xxxxxxxx -apr1 password}], '^\$apr1\$xxxxxxxx\$dxHfLAsjHkDRmG83UXe8K0\R$'),