[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  19d15f97b3932d14e17d0b61115b664169ca6159 (commit)
      from  42fa3e66697baa121220b4eacf03607280e4ff89 (commit)


- Log -----------------------------------------------------------------
commit 19d15f97b3932d14e17d0b61115b664169ca6159
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Jun 3 18:42:36 2020 +1000

    ossl_shim: const cast the param arguments to avoid errors
    
    [extended tests]
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12022)

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

Summary of changes:
 test/ossl_shim/ossl_shim.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/ossl_shim/ossl_shim.cc b/test/ossl_shim/ossl_shim.cc
index e7c1dfe09f..aeaea100ad 100644
--- a/test/ossl_shim/ossl_shim.cc
+++ b/test/ossl_shim/ossl_shim.cc
@@ -394,8 +394,10 @@ static int TicketKeyCallback(SSL *ssl, uint8_t *key_name, uint8_t *iv,
     return 0;
   }
 
-  *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, "SHA256", 0);
-  *p++ = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, kZeros,
+  *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
+                                          const_cast<char *>("SHA256"), 0);
+  *p++ = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
+                                           (void *)kZeros,
                                            sizeof(kZeros));
   *p = OSSL_PARAM_construct_end();