[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4df0d37ff6cc399b93f9ef2524d087c2d67d41b5 (commit)
      from  90ef39f43ad5bf4e85c56a79d0b56fb590b3c7f7 (commit)


- Log -----------------------------------------------------------------
commit 4df0d37ff6cc399b93f9ef2524d087c2d67d41b5
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Aug 7 04:44:06 2020 +0200

    PROV: Fix MSBLOB / PVK deserializer
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12601)

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

Summary of changes:
 providers/implementations/serializers/deserialize_ms2key.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/providers/implementations/serializers/deserialize_ms2key.c b/providers/implementations/serializers/deserialize_ms2key.c
index 73d462e41e..8b9ddec6a0 100644
--- a/providers/implementations/serializers/deserialize_ms2key.c
+++ b/providers/implementations/serializers/deserialize_ms2key.c
@@ -77,7 +77,7 @@ static void ms2key_freectx(void *vctx)
     OPENSSL_free(ctx);
 }
 
-static const OSSL_PARAM *ms2key_gettable_params(void)
+static const OSSL_PARAM *ms2key_gettable_params(ossl_unused void *provctx)
 {
     static const OSSL_PARAM gettables[] = {
         { OSSL_DESERIALIZER_PARAM_INPUT_TYPE, OSSL_PARAM_UTF8_PTR, NULL, 0, 0 },