[web] master update

[Mark J. Cox]

The branch master has been updated
       via  23af72984b104ab0407873cd01c885be9635cb81 (commit)
       via  d357e46dce040f602bd150afa23c68d80a58abfa (commit)
       via  5ad619db6417b3405b9932e0d514112a60beb875 (commit)
       via  78cdcfd517424f1b95f8d8e195e5cbdd822a631e (commit)
      from  ba98fa477470b023d70a080fad35dd406b573f3f (commit)


- Log -----------------------------------------------------------------
commit 23af72984b104ab0407873cd01c885be9635cb81
Merge: d357e46 78cdcfd
Author: Mark J. Cox <mark at openssl.org>
Date:   Fri Jan 3 12:13:39 2020 +0000

    Merge pull request #148 from mattcaswell/remove-110-additional
    
    Remove an additional 1.1.0 reference

commit d357e46dce040f602bd150afa23c68d80a58abfa
Merge: ba98fa4 5ad619d
Author: Mark J. Cox <mark at openssl.org>
Date:   Fri Jan 3 12:13:07 2020 +0000

    Merge pull request #151 from iamamoose/eolstatements
    
    Allow a default statement if our page is not for a specific base version

commit 5ad619db6417b3405b9932e0d514112a60beb875
Author: Mark J. Cox <mark at awe.com>
Date:   Fri Jan 3 11:48:09 2020 +0000

    Allow a default statement if our page is not for a specific base version
    also clean up the HTML we closed the p tag in the wrong place.  Add a
    statement on all the versions out of support.

commit 78cdcfd517424f1b95f8d8e195e5cbdd822a631e
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Dec 17 14:26:51 2019 +0000

    Remove an additional 1.1.0 reference
    
    We previously removed references to 1.1.0 as a current release. There is
    one remaining spot that was missed, so we update that too.

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

Summary of changes:
 bin/mk-cvepage           | 11 ++++++-----
 inc/mansidebar.shtml     |  1 -
 news/vulnerabilities.xml |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/mk-cvepage b/bin/mk-cvepage
index 83333ab..abed8b4 100755
--- a/bin/mk-cvepage
+++ b/bin/mk-cvepage
@@ -138,12 +138,13 @@ for base in allyourbase(dom):
         bases.append( "<a href=\"vulnerabilities-%s.html\">%s</a>" %(base,base))
 preface += "<p>Show issues fixed only in OpenSSL " + ", ".join(bases)
 if options.base:
-    preface += ", or <a href=\"vulnerabilities.html\">all versions</a>"
+    preface += ", or <a href=\"vulnerabilities.html\">all versions</a></p>"
     preface += "<h2>Fixed in OpenSSL %s</h2>" %(options.base)
-    for statement in dom.getElementsByTagName('statement'):
-        if (statement.getAttribute("base") in options.base):
-            preface += statement.firstChild.data.strip()
-preface += "</p>"
+else:
+    preface += "</p>"
+for statement in dom.getElementsByTagName('statement'):
+    if (statement.getAttribute("base") in (options.base or "none")):
+        preface += "<p>"+statement.firstChild.data.strip()+"</p>"
 if len(allyears)>1: # If only vulns in this year no need for the year table of contents
     preface += "<p><a name=\"toc\">Jump to year: </a>" + ", ".join( "<a href=\"#y%s\">%s</a>" %(year,year) for year in allyears)
 preface += "</p>"
diff --git a/inc/mansidebar.shtml b/inc/mansidebar.shtml
index c794b16..5ec8083 100644
--- a/inc/mansidebar.shtml
+++ b/inc/mansidebar.shtml
@@ -5,7 +5,6 @@
     <ul>
       <li><a href="/docs/manmaster">master</a></li>
       <li><a href="/docs/man1.1.1">1.1.1</a></li>
-      <li><a href="/docs/man1.1.0">1.1.0</a></li>
       <li><a href="/docs/man1.0.2">1.0.2</a></li>
     </ul>
   </section>
diff --git a/news/vulnerabilities.xml b/news/vulnerabilities.xml
index 0378674..60bfd33 100644
--- a/news/vulnerabilities.xml
+++ b/news/vulnerabilities.xml
@@ -7336,6 +7336,7 @@ default and not common.</description>
   <advisory url="/news/secadv/20140605.txt"/>
 </issue>
 
+  <statement base="none">Note: All OpenSSL versions before 1.1.1 are out of support and no longer receiving updates.  Extended support is available for 1.0.2 from OpenSSL Software Services for premium support customers.</statement>
   <statement base="0.9.6">OpenSSL 0.9.6 is out of support and no longer receiving updates.</statement>
   <statement base="0.9.7">OpenSSL 0.9.7 is out of support and no longer receiving updates.</statement>
   <statement base="0.9.8">OpenSSL 0.9.8 is out of support since 1st January 2016 and no longer receiving updates.</statement>