[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  823a113574451ea2e050bee7ce35861948ad55ca (commit)
      from  02e14a65fd6cc63204b43a79d510e95a63bdd901 (commit)


- Log -----------------------------------------------------------------
commit 823a113574451ea2e050bee7ce35861948ad55ca
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Mon Jul 20 11:18:24 2020 +1000

    Fix API rename issue in shim layer that calls EVP_MAC_CTX_set_params
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12483)

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

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

diff --git a/test/ossl_shim/ossl_shim.cc b/test/ossl_shim/ossl_shim.cc
index d4d7cf1454..1d32073f84 100644
--- a/test/ossl_shim/ossl_shim.cc
+++ b/test/ossl_shim/ossl_shim.cc
@@ -403,7 +403,7 @@ static int TicketKeyCallback(SSL *ssl, uint8_t *key_name, uint8_t *iv,
 
   if (!EVP_CipherInit_ex(ctx, EVP_aes_128_cbc(), NULL, kZeros, iv, encrypt)
       || !EVP_MAC_init(hmac_ctx)
-      || !EVP_MAC_set_ctx_params(hmac_ctx, params)) {
+      || !EVP_MAC_CTX_set_params(hmac_ctx, params)) {
     return -1;
   }