[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  1242f3c798db340397186e178023f1a9fe297df0 (commit)
      from  0081ce9b0201417cf2b35792a2a199e36acadcf2 (commit)


- Log -----------------------------------------------------------------
commit 1242f3c798db340397186e178023f1a9fe297df0
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Sun Sep 22 09:19:05 2019 +1000

    Fix KMAC docs
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/9970)

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

Summary of changes:
 doc/man1/openssl-mac.pod  | 4 ++--
 doc/man7/EVP_MAC-KMAC.pod | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/man1/openssl-mac.pod b/doc/man1/openssl-mac.pod
index f5be58bcb2..e5ec76395e 100644
--- a/doc/man1/openssl-mac.pod
+++ b/doc/man1/openssl-mac.pod
@@ -87,7 +87,7 @@ printable characters only).
 
 Used by GMAC to specify an IV in hexadecimal form (two hex digits per byte).
 
-=item B<outlen:>I<int>
+=item B<size:>I<int>
 
 Used by KMAC128 or KMAC256 to specify an output length.
 The default sizes are 32 or 64 bytes respectively.
@@ -127,7 +127,7 @@ To create a hex-encoded CMAC-AES-128-CBC MAC from a file:\
 To create a hex-encoded KMAC128 MAC from a file with a Customisation String
 'Tag' and output length of 16: \
  openssl mac -macopt custom:Tag -macopt hexkey:40414243444546 \
-         -macopt outlen:16 -in msg.bin KMAC128
+         -macopt size:16 -in msg.bin KMAC128
 
 To create a hex-encoded GMAC-AES-128-GCM with a IV from a file: \
  openssl mac -macopt cipher:AES-128-GCM -macopt hexiv:E0E00F19FED7BA0136A797F3 \
diff --git a/doc/man7/EVP_MAC-KMAC.pod b/doc/man7/EVP_MAC-KMAC.pod
index 43c10262ee..ac5dddfa41 100644
--- a/doc/man7/EVP_MAC-KMAC.pod
+++ b/doc/man7/EVP_MAC-KMAC.pod
@@ -44,8 +44,8 @@ The length of the "size" parameter should not exceed that of a B<size_t>.
 
 =back
 
-The "xof" parameter value is exptect to be 1 or 0. Use 1 to enable XOF
-mode. If XOF is enabled then the output len that is encoded as part of
+The "xof" parameter value is expected to be 1 or 0. Use 1 to enable XOF
+mode. If XOF is enabled then the output length that is encoded as part of
 the input stream is set to zero.
 
 =head1 SEE ALSO