[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  04bc70d7373300d378aa9c075289d1ee404ec528 (commit)
      from  8d242823ed2270e2907914fb09004ae30263fb00 (commit)


- Log -----------------------------------------------------------------
commit 04bc70d7373300d378aa9c075289d1ee404ec528
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jan 31 10:08:33 2020 +0000

    Don't complain about documented symbols with find-doc-nits -d -o
    
    find-doc-nits can give a list of symbols that were added since 1.1.1 and
    are undocumented (using -o). To do this it uses the missingcrypto111.txt
    and missingssl111.txt files which give a snapshot of the undocumented
    symbols at the time of the 1.1.1 release. Currently it complains about
    symbols that are in those files that have subsequently been documented.
    This isn't particularly helpful so we suppress that feature when "-o"
    is being used.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10981)

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

Summary of changes:
 util/find-doc-nits | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/find-doc-nits b/util/find-doc-nits
index 293f603b79..901e34f384 100755
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -607,7 +607,7 @@ sub loadmissing($)
 
     for (@missing) {
         err("$missingfile:", "$_ is documented in $name_map{$_}")
-            if exists $name_map{$_} && defined $name_map{$_};
+            if !$opt_o && exists $name_map{$_} && defined $name_map{$_};
     }
 
     return @missing;