[openssl-commits] [openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  cf1698cb9137de7fa4681f5babbdcb464ed1c70d (commit)
      from  47ec2367ebf6082abb103e66e609feb5c128d358 (commit)


- Log -----------------------------------------------------------------
commit cf1698cb9137de7fa4681f5babbdcb464ed1c70d
Author: David Makepeace <david.p.makepeace at oracle.com>
Date:   Wed Nov 28 14:03:15 2018 +1000

    Minor doc fixes for EVP_MAC.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/7716)

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

Summary of changes:
 doc/man3/EVP_MAC.pod      | 2 +-
 doc/man7/EVP_MAC_HMAC.pod | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/man3/EVP_MAC.pod b/doc/man3/EVP_MAC.pod
index 58a3470..0e0d749 100644
--- a/doc/man3/EVP_MAC.pod
+++ b/doc/man3/EVP_MAC.pod
@@ -111,7 +111,7 @@ This functions takes variable arguments, the exact expected arguments
 depend on C<cmd>.
 EVP_MAC_ctrl() can be called both before and after EVP_MAC_init(), but
 the effect will depend on what control is being use.
-See </CONTROLS> below for a description of standard controls.
+See L</CONTROLS> below for a description of standard controls.
 
 EVP_MAC_vctrl() is the variant of EVP_MAC_ctrl() that takes a
 C<va_list> argument instead of variadic arguments.
diff --git a/doc/man7/EVP_MAC_HMAC.pod b/doc/man7/EVP_MAC_HMAC.pod
index b5ae94d..c8aa047 100644
--- a/doc/man7/EVP_MAC_HMAC.pod
+++ b/doc/man7/EVP_MAC_HMAC.pod
@@ -49,7 +49,7 @@ There are no corresponding string control types.
 
 These work as described in L<EVP_MAC(3)/CONTROLS>.
 
-EVP_MAC_ctrl_str() type string for B<EVP_MAC_CTRL_SET_DIGEST>: "digest"
+EVP_MAC_ctrl_str() type string for B<EVP_MAC_CTRL_SET_MD>: "digest"
 
 The value is expected to be the name of a cipher.