[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  833f7c8c55c3c8a572db2112a5c2eac92c8262b8 (commit)
      from  89e5aaa1d72058404d3ea06bfaeff5334aba202d (commit)


- Log -----------------------------------------------------------------
commit 833f7c8c55c3c8a572db2112a5c2eac92c8262b8
Author: Rich Salz <rsalz at akamai.com>
Date:   Wed Oct 2 15:40:42 2019 -0400

    Also mention -- flag and ignore if undocumented
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10077)

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

Summary of changes:
 apps/list.c        | 2 ++
 util/find-doc-nits | 1 +
 2 files changed, 3 insertions(+)

diff --git a/apps/list.c b/apps/list.c
index d7c46906aa..77fd20e1e1 100644
--- a/apps/list.c
+++ b/apps/list.c
@@ -337,6 +337,8 @@ static void list_options_for_command(const char *command)
             continue;
         BIO_printf(bio_out, "%s %c\n", o->name, o->valtype);
     }
+    /* Always output the -- marker since it is sometimes documented. */
+    BIO_printf(bio_out, "- -\n");
 }
 
 static void list_type(FUNC_TYPE ft, int one)
diff --git a/util/find-doc-nits b/util/find-doc-nits
index c1e33fcfe4..ea5254b729 100755
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -809,6 +809,7 @@ sub checkflags {
     }
     if ( scalar @undocced > 0 ) {
         foreach ( @undocced ) {
+            next if /-/; # Skip the -- end-of-flags marker
             err("$doc: undocumented option -$_");
         }
     }