[openssl] master update

[Dr . Paul Dale]

The branch master has been updated
       via  d5b170a2fcf8b22c67e86a09222dff7ce306c7ad (commit)
      from  a31635613323f7a1c28a96ff47cb360681faf9bd (commit)


- Log -----------------------------------------------------------------
commit d5b170a2fcf8b22c67e86a09222dff7ce306c7ad
Author: ozppupbg <43532395+ozppu...@users.noreply.github.com>
Date:   Mon Jul 13 07:04:28 2020 +0200

    Fixed EVP_MAC_final argument count in example
    
    EVP_MAC_final had only three arguments / the buffer/tag size was missing.
    Fixes #12424
    
    Note, that I didn't try to compile the example to look for other problems.
    
    Reviewed-by: Paul Yang <kaishen...@antfin.com>
    Reviewed-by: Tomas Mraz <tm...@fedoraproject.org>
    Reviewed-by: Dmitry Belyavskiy <beld...@gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/12429)

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

Summary of changes:
 doc/man3/EVP_MAC.pod | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/man3/EVP_MAC.pod b/doc/man3/EVP_MAC.pod
index dc90ee5421..b33af5a670 100644
--- a/doc/man3/EVP_MAC.pod
+++ b/doc/man3/EVP_MAC.pod
@@ -322,7 +322,7 @@ EVP_MAC_do_all_provided() returns nothing at all.
       EVP_MAC_CTX *ctx = NULL;
 
       unsigned char buf[4096];
-      ssize_t read_l;
+      size_t read_l;
       size_t final_l;
 
       size_t i;
@@ -332,12 +332,12 @@ EVP_MAC_do_all_provided() returns nothing at all.
 
       if (cipher != NULL)
           params[params_n++] =
-              OSSL_PARAM_construct_utf8_string("cipher", cipher, 0;
+              OSSL_PARAM_construct_utf8_string("cipher", (char*)cipher, 0);
       if (digest != NULL)
           params[params_n++] =
-              OSSL_PARAM_construct_utf8_string("digest", digest, 0);
+              OSSL_PARAM_construct_utf8_string("digest", (char*)digest, 0);
       params[params_n++] =
-          OSSL_PARAM_construct_octet_string("key", key, strlen(key));
+          OSSL_PARAM_construct_octet_string("key", (void*)key, strlen(key));
       params[params_n] = OSSL_PARAM_construct_end();
 
       if (mac == NULL
@@ -354,7 +354,7 @@ EVP_MAC_do_all_provided() returns nothing at all.
               goto err;
       }
 
-      if (!EVP_MAC_final(ctx, buf, &final_l))
+      if (!EVP_MAC_final(ctx, buf, &final_l, sizeof(buf)))
           goto err;
 
       printf("Result: ");