[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  0345f9eccc25eee39c22a09325510ef791de631c (commit)
      from  75dbc66e609d78f62e7a6e4c41d580ccb7f340ac (commit)


- Log -----------------------------------------------------------------
commit 0345f9eccc25eee39c22a09325510ef791de631c
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Apr 20 12:27:59 2020 +0100

    Fix no-ec
    
    This was missed by Travis because, although it has a no-ec build, the test
    that failed only runs in a debug build. The Travis job with no-ec is not
    a debug build and so the test was skipped.
    
    Reviewed-by: David von Oheimb <david.von.oheimb at siemens.com>
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/11581)

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

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

diff --git a/test/recipes/65-test_cmp_client.t b/test/recipes/65-test_cmp_client.t
index 52019942f6..3766a6955e 100644
--- a/test/recipes/65-test_cmp_client.t
+++ b/test/recipes/65-test_cmp_client.t
@@ -14,8 +14,8 @@ use OpenSSL::Test::Utils;
 
 setup("test_cmp_client");
 
-plan skip_all => "This test is not supported in a no-cmp build"
-    if disabled("cmp");
+plan skip_all => "This test is not supported in a no-cmp or no-ec build"
+    if disabled("cmp") || disabled("ec");
 
 plan tests => 1;