[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  40dfb8c70514006868344eaabf057aac6a428145 (commit)
      from  d318389eff0fb80d4a88c7af1cc314f185ba94e1 (commit)


- Log -----------------------------------------------------------------
commit 40dfb8c70514006868344eaabf057aac6a428145
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Wed Oct 23 12:48:18 2019 +0200

    20-test_enc_more.t: Replace deprecated -ciphers option with -list
    
    [extended tests]
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/10242)

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

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

diff --git a/test/recipes/20-test_enc_more.t b/test/recipes/20-test_enc_more.t
index 4ebb0e413c..8f37bee250 100644
--- a/test/recipes/20-test_enc_more.t
+++ b/test/recipes/20-test_enc_more.t
@@ -30,14 +30,14 @@ my $ciphersstatus = undef;
 my @ciphers =
     grep(! /wrap|^$|^[^-]/,
          (map { split /\s+/ }
-          run(app([$cmd, "enc", "-ciphers"]),
+          run(app([$cmd, "enc", "-list"]),
               capture => 1, statusvar => \$ciphersstatus)));
 
 plan tests => 2 + scalar @ciphers;
 
 SKIP: {
     skip "Problems getting ciphers...", 1 + scalar(@ciphers)
-        unless ok($ciphersstatus, "Running 'openssl enc -ciphers'");
+        unless ok($ciphersstatus, "Running 'openssl enc -list'");
     unless (ok(copy($testsrc, $plaintext), "Copying $testsrc to $plaintext")) {
         diag($!);
         skip "Not initialized, skipping...", scalar(@ciphers);