[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  1ce6044206a371680ea44219ea63dae2a1bba3d1 (commit)
      from  2710e8a88809c54a654baa5594b7a474ce07a8e7 (commit)


- Log -----------------------------------------------------------------
commit 1ce6044206a371680ea44219ea63dae2a1bba3d1
Author: Pauli <paul.dale at oracle.com>
Date:   Mon Sep 16 13:22:56 2019 +1000

    Avoid mentioning ctrl_str in the MAC documentation.
    
    Change to mentioning params instead.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9908)

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

Summary of changes:
 doc/man1/openssl-mac.pod | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/man1/openssl-mac.pod b/doc/man1/openssl-mac.pod
index abfbb560ec..d2e6c7f262 100644
--- a/doc/man1/openssl-mac.pod
+++ b/doc/man1/openssl-mac.pod
@@ -49,7 +49,7 @@ Output the MAC in binary form. Uses hexadecimal text format if not specified.
 Passes options to the MAC algorithm.
 A comprehensive list of controls can be found in the EVP_MAC implementation
 documentation.
-Common control strings used by EVP_MAC_ctrl_str() are:
+Common parameter names used by EVP_MAC_CTX_get_params() are:
 
 =over 4
 
@@ -144,12 +144,12 @@ The B<list -mac-algorithms> command can be used to list them.
 
 L<openssl(1)>,
 L<EVP_MAC(3)>,
-L<EVP_MAC_CMAC(7)>,
-L<EVP_MAC_GMAC(7)>,
-L<EVP_MAC_HMAC(7)>,
-L<EVP_MAC_KMAC(7)>,
-L<EVP_MAC_SIPHASH(7)>,
-L<EVP_MAC_POLY1305(7)>
+L<EVP_MAC-CMAC(7)>,
+L<EVP_MAC-GMAC(7)>,
+L<EVP_MAC-HMAC(7)>,
+L<EVP_MAC-KMAC(7)>,
+L<EVP_MAC-SIPHASH(7)>,
+L<EVP_MAC-POLY1305(7)>
 
 =head1 COPYRIGHT