[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  1269a9a1d1d4ef9051a0965ba2b6ac850460531e (commit)
      from  2d3e6d41165ca2f225d500cfbc7dff8714f37f95 (commit)


- Log -----------------------------------------------------------------
commit 1269a9a1d1d4ef9051a0965ba2b6ac850460531e
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Apr 20 14:32:21 2020 +0100

    Fix no-deprecated tests where the GOST engine is present
    
    The GOST test only runs if it detects that the GOST engine is present.
    This is the case for the run-checker environment. The GOST engine uses
    some deprecated functions, so we disable that test in a no-deprecated
    build.
    
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/11583)

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

Summary of changes:
 test/recipes/90-test_gost.t | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/recipes/90-test_gost.t b/test/recipes/90-test_gost.t
index f2010967a2..fc91340223 100644
--- a/test/recipes/90-test_gost.t
+++ b/test/recipes/90-test_gost.t
@@ -24,6 +24,9 @@ plan skip_all => "TLSv1.3 or TLSv1.2 are disabled in this OpenSSL build"
 plan skip_all => "EC is disabled in this OpenSSL build"
     if disabled("ec");
 
+#Gost engine uses some deprecated functions
+plan skip_all => "Deprecated functions are disabled in this OpenSSL build"
+    if disabled("deprecated");
 
 plan skip_all => "No test GOST engine found"
     if !$ENV{OPENSSL_GOST_ENGINE_SO};