[openssl] OpenSSL_1_1_1-stable update

[kaduk at mit.edu]

The branch OpenSSL_1_1_1-stable has been updated
       via  0f1f0bf99aad06008f840e1a5bf93a8745e9a774 (commit)
      from  1ab9298e43b6023f4083609493f20e354aa7faab (commit)


- Log -----------------------------------------------------------------
commit 0f1f0bf99aad06008f840e1a5bf93a8745e9a774
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Wed Apr 1 13:51:40 2020 -0700

    sslapitest: only compile test when it will be used
    
    The test_ccs_change_cipher() test routine is used only when TLS 1.2
    is enabled; to fix the strict-warnings build we should not try to
    compile it when TLS 1.2 is disabled, either.
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11458)
    
    (cherry picked from commit fb121631e702352d47049ac8e2e709b11c3318e4)

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

Summary of changes:
 test/sslapitest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 5c118108ef..b3cd30d9a8 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -590,7 +590,6 @@ end:
 
     return testresult;
 }
-#endif
 
 /*
  * Very focused test to exercise a single case in the server-side state
@@ -702,6 +701,7 @@ end:
 
     return testresult;
 }
+#endif
 
 static int execute_test_large_message(const SSL_METHOD *smeth,
                                       const SSL_METHOD *cmeth,