[web] master update
Richard Levitte
levitte at openssl.org
Tue Sep 7 12:11:31 UTC 2021
The branch master has been updated
via 69a1d25579c6a8a5787ac30969caf9f69909c89f (commit)
from d0614db41e68ab5e2a739cf01436a01ea3f96d7a (commit)
- Log -----------------------------------------------------------------
commit 69a1d25579c6a8a5787ac30969caf9f69909c89f
Author: Matt Caswell <matt at openssl.org>
Date: Thu Sep 2 14:05:19 2021 +0100
Miscellaneous updates for the 3.0 release
Update various pieces of text on the website to refer to 3.0 correctly.
Reviewed-by: Paul Dale <pauli at openssl.org>
(Merged from https://github.com/openssl/web/pull/257)
-----------------------------------------------------------------------
Summary of changes:
docs/fips.html | 15 +++++-----
docs/index.html | 79 +++++++++++++++++++++++++----------------------------
docs/sidebar.shtml | 2 +-
source/index.html | 36 +++++++++++++-----------
source/license.html | 6 ++--
5 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/docs/fips.html b/docs/fips.html
index 7bbce9c..1a8cd38 100644
--- a/docs/fips.html
+++ b/docs/fips.html
@@ -10,8 +10,13 @@
<header><h2>FIPS-140</h2></header>
<div class="entry-content">
- <p>The current validation of a cryptographic
- module (Module) compatible with the OpenSSL 1.0.2
+ <p>Note that this page contains historic information about our legacy
+ OpenSSL FIPS Object Module (FOM) 2.0. For information about the OpenSSL
+ FOM 3.0 refer to
+ <a href="https://www.openssl.org/docs/man3.0/man7/fips_module.html">the FIPS module manual page</a>
+ </p>
+ <p>The most recent validation of a cryptographic
+ module (Module) compatible with OpenSSL 1.0.2
is v2.0.16, FIPS 140-2 certificate <a
href="https://csrc.nist.gov/projects/cryptographic-module-validation-program/Certificate/1747">#1747</a>.
This Module is documented in the
@@ -32,10 +37,6 @@
The OpenSSL project is no longer maintaining either the 1747
or the 2398 module. This includes adding platforms to those
validations.
- We are starting work on a new validation, after the 1.1.1
- release completes.
- That module will have a small set of validated operational
- environments.
The OpenSSL project is no longer involved in private label
validations nor adding platforms to the existing certificates.
</p>
@@ -69,7 +70,7 @@
API can be converted to use validated cryptography with minimal
effort.</li>
- <li>The OpenSSL FIPS Object Module validation is "delivered" in
+ <li>The OpenSSL FIPS Object Module 2.0 validation is "delivered" in
source code form, meaning that if you can use it exactly as is
and can build it (according to the very specific documented
instructions) for your platform, then you can use it as
diff --git a/docs/index.html b/docs/index.html
index 16b7bf4..501b1fb 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -8,48 +8,43 @@
<div id="main">
<div id="content">
<div class="blog-index">
- <article>
- <header><h2>Documentation<h2></header>
- <div class="entry-content">
- <p>
- We have a
- <a href="OpenSSLStrategicArchitecture.html">Strategic
- Architecture</a> for the development of OpenSSL from
- 3.0.0 and going forward, as well as a
- <a href="OpenSSL300Design.html">design for 3.0.0 (draft)</a>
- specifically.
- </p>
-
- <p>The
- <a href="faq.html">frequently-asked questions (FAQ)</a>
- is available.</p>
-
- <p>Information about the first-ever open source
- <a href="fips.html">FIPS-140 validation</a> is also
- available.</p>
-
- <p>The <a href="manpages.html">manual pages</a> for all
- supported
- releases are available. There are still problems with some
- of the links; thanks for your understanding.</p>
-
- <p>Ivan Ristić, the creator of
- <a href="https://ssllabs.com">https://ssllabs.com</a>,
- has a free download of his <em>OpenSSL Cookbook</em>
- that covers the most frequently used OpenSSL features
- and commands. It is updated often, and is available
- at
- <a
- href="https://www.feistyduck.com/books/openssl-cookbook/">https://www.feistyduck.com/books/openssl-cookbook/</a>.
- It is highly recommended.
- </p>
- </div>
- <footer>
- You are here: <a href="/">Home</a>
- : <a href=".">Documentation</a>
- <br/><a href="/sitemap.txt">Sitemap</a>
- </footer>
- </article>
+ <article>
+ <header><h2>Documentation<h2></header>
+ <div class="entry-content">
+ <p>The
+ <a href="faq.html">frequently-asked questions (FAQ)</a> page is
+ available.</p>
+
+ <p>A good starting point for understanding some of the key
+ concepts in OpenSSL 3.0 is the libcrypto
+ <a href="https://www.openssl.org/docs/man3.0/man7/crypto.html">manual page</a>.
+ Information and notes about migrating existing applications to OpenSSL
+ 3.0 are available in the
+ <a href="https://www.openssl.org/docs/man3.0/man7/migration_guide.html">OpenSSL 3.0 Migration Guide</a></p>
+
+ <p>The <a href="manpages.html">manual pages</a> for all supported
+ releases are available.</p>
+
+ <p>Ivan Ristić, the creator of
+ <a href="https://ssllabs.com">https://ssllabs.com</a>,
+ has a free download of his <em>OpenSSL Cookbook</em>
+ that covers the most frequently used OpenSSL features
+ and commands. It is updated often, and is available
+ at
+ <a
+ href="https://www.feistyduck.com/books/openssl-cookbook/">https://www.feistyduck.com/books/openssl-cookbook/</a>.
+ It is highly recommended.
+ </p>
+
+ <p>Historic information about our legacy OpenSSL FIPS Object Module (FOM) 2.0
+ <a href="fips.html">FIPS 140-2 validation</a> is also available.</p>
+ </div>
+ <footer>
+ You are here: <a href="/">Home</a>
+ : <a href=".">Documentation</a>
+ <br/><a href="/sitemap.txt">Sitemap</a>
+ </footer>
+ </article>
</div>
<!--#include virtual="sidebar.shtml" -->
</div>
diff --git a/docs/sidebar.shtml b/docs/sidebar.shtml
index a603a43..b87c91c 100644
--- a/docs/sidebar.shtml
+++ b/docs/sidebar.shtml
@@ -10,7 +10,7 @@
<a href="manpages.html">Manpages</a>
</li>
<li>
- <a href="fips.html">FIPS-140 Validation</a>
+ <a href="fips.html">Legacy FIPS-140 Validation</a>
</li>
</ul>
</section>
diff --git a/source/index.html b/source/index.html
index bde4983..e8477e1 100644
--- a/source/index.html
+++ b/source/index.html
@@ -30,28 +30,32 @@
A list of mirror sites can be found <a href="mirror.html">here</a>.
</p>
- <p><em>Note:</em> The latest stable version is the 1.1.1 series. This is
- also our Long Term Support (LTS) version, supported until 11th September
- 2023. All older versions (including 1.1.0, 1.0.2, 1.0.0 and 0.9.8) are
- now out of support and should not be used. Users of these older versions
- are encouraged to upgrade to 1.1.1 as soon as possible. Extended support
+ <p><em>Note:</em> The latest stable version is the 3.0 series. Also
+ available is the 1.1.1 series which is our Long Term Support (LTS)
+ version, supported until 11th September 2023. All older versions
+ (including 1.1.0, 1.0.2, 1.0.0 and 0.9.8) are now out of support and
+ should not be used. Users of these older versions are encouraged to
+ upgrade to 3.0 or 1.1.1 as soon as possible. Extended support
for 1.0.2 to gain access to security fixes for that version is
<a href="/support/contracts.html">available</a>.</p>
- <p>The OpenSSL FIPS Object Module 2.0 (FOM) is also available for
- download. It is no longer receiving updates. It must be used in
- conjunction with a FIPS capable version of OpenSSL (1.0.2 series). A
- new FIPS module is currently in development.</p>
+ <p>OpenSSL 3.0 is the latest major version of OpenSSL. The OpenSSL FIPS
+ Object Module (FOM) 3.0 is an integrated part of the OpenSSL 3.0
+ download. You do not need to download the 3.0 FOM separately. Refer to
+ the installation instructions inside the download, and use the
+ "enable-fips" compile time configuration option to build it.</p>
- <p>OpenSSL 3.0 is the next major version of OpenSSL that is currently
- in development and includes the new FIPS Object Module. A pre-release
- version of this is available below. This is for testing only. It should
- not be used in production. For an overview of some of the key concepts
- in OpenSSL 3.0 see the libcrypto
- <a href="https://www.openssl.org/docs/manmaster/man7/crypto.html">manual page</a>.
+ <p>For an overview of some of the key concepts in OpenSSL 3.0 see the
+ libcrypto
+ <a href="https://www.openssl.org/docs/man3.0/man7/crypto.html">manual page</a>.
Information and notes about migrating existing applications to OpenSSL
3.0 are available in the
- <a href="https://www.openssl.org/docs/manmaster/man7/migration_guide.html">OpenSSL 3.0 Migration Guide</a></p>
+ <a href="https://www.openssl.org/docs/man3.0/man7/migration_guide.html">OpenSSL 3.0 Migration Guide</a></p>
+
+ <p>The OpenSSL FIPS Object Module (FOM) 2.0 is also available for
+ download. It is no longer receiving updates. It must be used in
+ conjunction with a FIPS capable version of OpenSSL (1.0.2 series).</p>
+
<table>
<tr>
<td>KBytes </td>
diff --git a/source/license.html b/source/license.html
index 643045e..ec6ea5d 100644
--- a/source/license.html
+++ b/source/license.html
@@ -18,13 +18,13 @@
Copies can also be found here.
</p>
<p>
- For the 3.0.0 release, and later releases derived from that,
+ For the 3.0 release, and later releases derived from that,
<a href="apache-license-2.0.txt">the Apache License v2</a>
applies.
This also applies to the git "master" branch.
</p>
<p>
- For any release made before OpenSSL 3.0.0 (namely
+ For any release made before OpenSSL 3.0 (namely
the 1.1.1, 1.1.0, 1.0.2, and all prior releases including
those not currently supported),
<a href="license-openssl-ssleay.txt">the dual OpenSSL and SSLeay
@@ -34,7 +34,7 @@
releases -- the "letter suffix" -- no matter when they are made.
It also applies to the git branches for all those
releases, and to any public forks that have not rebased to
- master (or 3.0.0).
+ master (or 3.0).
</p>
</div>
<footer>
More information about the openssl-commits
mailing list