[openssl-commits] [web] master update

[Mark J. Cox]

The branch master has been updated
       via  e803b1e8aa04dde1595450e785bcb7b63f1ac7b5 (commit)
       via  fc3a76a7b2d8cfa3de18408ce1428785f4a9678e (commit)
      from  0fdc26a3da6206efb38025e5f2d94a97760f0614 (commit)


- Log -----------------------------------------------------------------
commit e803b1e8aa04dde1595450e785bcb7b63f1ac7b5
Merge: 0fdc26a fc3a76a
Author: Mark J. Cox <markcox at gmail.com>
Date:   Sat Oct 13 10:26:44 2018 +0100

    Merge pull request #88 from iamamoose/fipscd
    
    Link to KeyPair arrangement for FIPS CD provision

commit fc3a76a7b2d8cfa3de18408ce1428785f4a9678e
Author: Mark J. Cox <mark at awe.com>
Date:   Sat Oct 13 09:35:14 2018 +0100

    Link to KeyPair arrangement for FIPS CD provision

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

Summary of changes:
 docs/fips/verifycd.html | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/fips/verifycd.html b/docs/fips/verifycd.html
index a30a9c1..da76889 100644
--- a/docs/fips/verifycd.html
+++ b/docs/fips/verifycd.html
@@ -40,20 +40,20 @@
     The requirement for this verification with an independently acquired
     FIPS 140-2 validated cryptographic module does not apply when the
     distribution file is distributed using a "secure" means. Distribution
-    on physical media is considered secure in this context, so as a
-    convenience a copy of the distribution files can be obtained from
-    <a href="/community/contacts.html">OSS</a> as a CD-ROM disks via postal mail.</p>
-
-    <p>The fee for this is $100 in US Dollars. At this time we are only able
-      to accept US wire transfers.
-    Email us at <a href="mailto:osf-contact at openssl.org">osf-contact at openssl.org</a>
-    and we will send you our ABA and account information.
-    <b>We cannot do credit cards, purchase orders, or anything other
-      than a US-based bank transfer at this time.</b>
-    We can mail internationally (the CD contains only open source code
-    and so may be exported under the TSU exception of EAR ECCN 5D002).
-    It will take a week or two to process your order.</p>
+    on physical media is considered secure in this context so you can
+    verify by obtaining a copy of the distribution files on CD-ROM disks via
+    postal mail.</p>
 
+    <p>OpenSSL are not providing disks directly at this time.  However we have
+    an arrangement with KeyPair Consulting who will
+    <a href="https://keypair.us/2018/05/cd/">send a disk to you at no
+      charge</a>.</p>
+    
+    <blockquote>Important Disclaimer: The listing of these third party products does not
+      imply any endorsement by the OpenSSL project, and these organizations are not
+      affiliated in any way with OpenSSL other than by the reference to their
+      independent web sites here.</blockquote>
+    
     <p>Note that the files you will receive on these CDs will be
     <em>identical</em> in every respect (except for formal FIPS 140-2
     compliance) with the files you can download from <a