[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  e9147bd408db3c1fe262688dc3debe372c42fa24 (commit)
      from  3c90534830fdb0cc0e790dd1d5fa2a90e1375e87 (commit)


- Log -----------------------------------------------------------------
commit e9147bd408db3c1fe262688dc3debe372c42fa24
Author: Pauli <paul.dale at oracle.com>
Date:   Thu Sep 12 18:12:47 2019 +1000

    Define the MAC parameter types without using C type names to avoid confusion.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9875)

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

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

diff --git a/doc/man3/EVP_MAC.pod b/doc/man3/EVP_MAC.pod
index 4d3b223934..cf851354e7 100644
--- a/doc/man3/EVP_MAC.pod
+++ b/doc/man3/EVP_MAC.pod
@@ -199,24 +199,24 @@ empty string.
 
 This option is used by BLAKE2 MAC.
 
-=item B<OSSL_MAC_PARAM_XOF> ("xof") <int>
+=item B<OSSL_MAC_PARAM_XOF> ("xof") <integer>
 
 It's a simple flag, the value 0 or 1 are expected.
 
 This option is used by KMAC.
 
-=item B<OSSL_MAC_PARAM_FLAGS> ("flags") <int>
+=item B<OSSL_MAC_PARAM_FLAGS> ("flags") <integer>
 
 These will set the MAC flags to the given numbers.
 Some MACs do not support this option.
 
-=item B<OSSL_MAC_PARAM_ENGINE> ("engine") <utf8string>
+=item B<OSSL_MAC_PARAM_ENGINE> ("engine") <utf8 string>
 
-=item B<OSSL_MAC_PARAM_PROPERTIES> ("properties") <utf8string>
+=item B<OSSL_MAC_PARAM_PROPERTIES> ("properties") <utf8 string>
 
-=item B<OSSL_MAC_PARAM_DIGEST> ("digest") <utf8string>
+=item B<OSSL_MAC_PARAM_DIGEST> ("digest") <utf8 string>
 
-=item B<OSSL_MAC_PARAM_CIPHER> ("cipher") <utf8string>
+=item B<OSSL_MAC_PARAM_CIPHER> ("cipher") <utf8 string>
 
 For MAC implementations that use an underlying computation cipher or
 digest, these parameters set what the algorithm should be, and the
@@ -230,7 +230,7 @@ Note that not all algorithms may support all digests.
 HMAC does not support variable output length digests such as SHAKE128
 or SHAKE256.
 
-=item B<OSSL_MAC_PARAM_SIZE> ("size") <unsigned int>
+=item B<OSSL_MAC_PARAM_SIZE> ("size") <unsigned integer>
 
 For MAC implementations that support it, set the output size that
 EVP_MAC_final() should produce.