[openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  fb121631e702352d47049ac8e2e709b11c3318e4 (commit)
      from  af0d413654d19acab7c8af0a3f0b3bac0574fe33 (commit)


- Log -----------------------------------------------------------------
commit fb121631e702352d47049ac8e2e709b11c3318e4
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)

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

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 f9349bc59b..779176a0f1 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -659,7 +659,6 @@ end:
 
     return testresult;
 }
-#endif
 
 /*
  * Very focused test to exercise a single case in the server-side state
@@ -771,6 +770,7 @@ end:
 
     return testresult;
 }
+#endif
 
 static int execute_test_large_message(const SSL_METHOD *smeth,
                                       const SSL_METHOD *cmeth,