[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  d2b194d78f16493d2eb12bcce285537fcb538bfb (commit)
      from  dc7aa029007da3849a04291a4c258587228daac8 (commit)


- Log -----------------------------------------------------------------
commit d2b194d78f16493d2eb12bcce285537fcb538bfb
Author: Rich Salz <rsalz at akamai.com>
Date:   Sat Oct 5 18:14:30 2019 -0400

    Various missing-link fixes
    
    Also, turn missing L<foo(3)> into foo(3)
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/10104)

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

Summary of changes:
 doc/internal/man3/ossl_algorithm_do_all.pod | 4 ++--
 doc/man1/openssl-cmds.pod                   | 2 ++
 doc/man7/EVP_KDF-KB.pod                     | 2 --
 doc/man7/provider.pod                       | 2 +-
 util/find-doc-nits                          | 7 +++----
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/doc/internal/man3/ossl_algorithm_do_all.pod b/doc/internal/man3/ossl_algorithm_do_all.pod
index 6ef85a7259..ce925d3295 100644
--- a/doc/internal/man3/ossl_algorithm_do_all.pod
+++ b/doc/internal/man3/ossl_algorithm_do_all.pod
@@ -41,11 +41,11 @@ The function described here are mainly useful for discovery, and
 possibly display of what has been discovered, for example an
 application that wants to display the loaded providers and what they
 may offer, but also for constructors, such as
-L<ossl_construct_method(3)>.
+L<ossl_method_construct(3)>.
 
 =head1 SEE ALSO
 
-L<ossl_construct_method(3)>, L<EVP_MAC_do_all(3)>
+L<ossl_method_construct(3)>, L<EVP_MAC_do_all_provided(3)>
 
 =head1 HISTORY
 
diff --git a/doc/man1/openssl-cmds.pod b/doc/man1/openssl-cmds.pod
index 9f7d6c654d..3d3520059c 100644
--- a/doc/man1/openssl-cmds.pod
+++ b/doc/man1/openssl-cmds.pod
@@ -53,6 +53,8 @@ version,
 x509
 - OpenSSL application commands
 
+=for comment foreign manuals: apropos(1)
+
 =head1 SYNOPSIS
 
 =for openssl generic
diff --git a/doc/man7/EVP_KDF-KB.pod b/doc/man7/EVP_KDF-KB.pod
index 8b1b350759..8a84a3d044 100644
--- a/doc/man7/EVP_KDF-KB.pod
+++ b/doc/man7/EVP_KDF-KB.pod
@@ -136,9 +136,7 @@ NIST SP800-108, IETF RFC 6803, IETF RFC 8009.
 =head1 SEE ALSO
 
 L<EVP_KDF(3)>,
-L<EVP_KDF_CTX_new_id(3)>,
 L<EVP_KDF_CTX_free(3)>,
-L<EVP_KDF_ctrl(3)>,
 L<EVP_KDF_size(3)>,
 L<EVP_KDF_derive(3)>,
 L<EVP_KDF(3)/PARAMETERS>
diff --git a/doc/man7/provider.pod b/doc/man7/provider.pod
index b6c5e49f50..0e9019960d 100644
--- a/doc/man7/provider.pod
+++ b/doc/man7/provider.pod
@@ -218,7 +218,7 @@ L<EVP_CipherInit_ex(3)>, the actual implementation to be used is
 fetched implicitly using default search criteria.
 
 Implicit fetching can also occur with functions such as
-L<EVP_PKEY_CTX_derive_init_ex(3)> where a NULL algorithm parameter is
+L<EVP_PKEY_derive_init_ex(3)> where a NULL algorithm parameter is
 supplied.
 In this case an algorithm implementation is implicitly fetched using
 default search criteria and an algorithm name that is consistent with
diff --git a/util/find-doc-nits b/util/find-doc-nits
index 34eb514a1f..91e232376e 100755
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -727,14 +727,13 @@ sub collectnames {
         map { s/^\s+//g; s/\s+$//g; $_ } # Trim prefix and suffix blanks
         split(/,/, $tmp);
     unless ( grep { $simplename eq $_ } @names ) {
-        err($id, "missing $simplename");
+        err($id, "$simplename not in NAME section");
         push @names, $simplename;
     }
     foreach my $name (@names) {
         next if $name eq "";
-        if ( $name =~ /\s/ ) {
-            err($id, "'$name' contains white space")
-        }
+        err($id, "'$name' contains white space")
+            if $name =~ /\s/;
         my $name_sec = "$name($section)";
         if ( !exists $name_map{$name_sec} ) {
             $name_map{$name_sec} = $filename;