The branch master has been updated
via 3028310b6b3d3eb66b052f2fb5d065e783cafe76 (commit)
from e31df12862d63ba8ad09ec18461fb37c1698cd4b (commit)
- Log -----------------------------------------------------------------
commit 3028310b6b3d3eb66b052f2fb5d065e783cafe76
Author: Steve Marquess <[email protected]>
Date: Wed Aug 5 11:45:11 2015 -0400
Sort out legal entity references (long overdue!)
-----------------------------------------------------------------------
Summary of changes:
about/contacts.wml | 69 +++++++++++++++++++++++++++++++------
about/openssl-contact.wml | 22 ++++++++++++
docs/fips/fipsnotes.wml | 2 +-
docs/fips/fipsvalidation.wml | 6 ++--
docs/fips/privatelabel.wml | 6 ++--
docs/index.wml | 2 +-
support/acknowledgments.wml | 2 +-
support/consulting.wml | 2 +-
support/donations-cn.wml | 2 +-
support/donations.wml | 8 ++---
support/funding/contract.wml | 2 +-
support/funding/support-contact.wml | 12 +++----
12 files changed, 102 insertions(+), 33 deletions(-)
create mode 100644 about/openssl-contact.wml
diff --git a/about/contacts.wml b/about/contacts.wml
index e8d72db..658aa8d 100644
--- a/about/contacts.wml
+++ b/about/contacts.wml
@@ -20,36 +20,83 @@ to dispose of. You may <i>request</i> support, but it's
the contact's
responsability and freedom alone to decide if he wants to give any support
or not, regardless of who makes the request.</p>
+<p>The <i>OpenSSL Software Foundation</i> represents the OpenSSL project in
most capacities including contributor license
+agreements, managing donations, etc.</p>
+</p>
+
<table>
<tr><td><b id=sf>Address</b></td><td><b id=sf>Area covered</b></td></tr>
<tr><td><hr noshade size=1></td><td><hr noshade size=1></td></tr>
<tr><td>
-OpenSSL SE<br>
-c/o Richard Levitte<br>
-Nordingrågatan 20<br>
-S-162 53 Vällingby<br>
-Sweden<br>
-<i>E-mail:</i> <a
href="mailto:[email protected]";>[email protected]</a>
+OpenSSL Software Foundation<br>
+20-22 Wenlock Road<br>
+London<br>
+N1 7GU<br>
+United Kingdom<br>
++44 1785508015 (UK)<br>
++1 877-OPENSSL(6775) (US toll free)<br>
++1 301-956-2281 (US)<br>
+<i>E-mail:</i> <a
href="mailto:[email protected]";>[email protected]</a>
</td><td valign=top>
-Sweden only
+Worldwide
</td></tr>
</table>
-<p>The <i>OpenSSL Software Foundation</i> represents the OpenSSL project in
some capacities, such as providing formal support contracts, brokering
consulting contracts for OpenSSL team members, and disbursing dontations.</p>
+<p><i>OpenSSL Software Services</i> represents the OpenSSL project for
selected commercial or quasi-commercial contexts, such
+as providing formal support contracts and brokering consulting contracts for
OpenSSL team members</p>
</p>
<table>
<tr><td><b id=sf>Address</b></td><td><b id=sf>Area covered</b></td></tr>
<tr><td><hr noshade size=1></td><td><hr noshade size=1></td></tr>
<tr><td>
-OpenSSL Software Foundation<br>
+OpenSSL Software Services Inc.<br>
+40 E Main St, Suite 744<br>
+Newark DE 19711<br>
+USA<br>
++1 240-215-3103<br>
+<i>E-mail:</i> <a
href="mailto:[email protected]";>[email protected]</a>
+</td><td valign=top>
+Worldwide
+</td></tr>
+</table>
+
+<p>
+Commercial activities specific to FIPS 140-2 validations and the OpenSSL FIPS
Object Module are handled by <i>OpenSSL Validation Services</i>:
+</p>
+
+<table>
+<tr><td><b id=sf>Address</b></td><td><b id=sf>Area covered</b></td></tr>
+<tr><td><hr noshade size=1></td><td><hr noshade size=1></td></tr>
+<tr><td>
+OpenSSL Validation Services Inc.<br>
1829 Mount Ephraim Road<br>
Adamstown, MD 21710<br>
USA<br>
-+1 877 673 6775
-<i>E-mail:</i> <a
href="mailto:[email protected]";>[email protected]</a>
++1 301-874-2571<br>
+<i>E-mail:</i> <a href="mailto:[email protected]";>[email protected]</a>
</td><td valign=top>
Worldwide
</td></tr>
</table>
+<p>
+<p>
+Some OpenSSL team members are available for selected consulting engagements:
+<p>
+
+<table>
+<tr><td><b id=sf>Address</b></td><td><b id=sf>Area covered</b></td></tr>
+<tr><td><hr noshade size=1></td><td><hr noshade size=1></td></tr>
+<tr><td>
+OpenSSL SE<br>
+c/o Richard Levitte<br>
+Nordingrågatan 20<br>
+S-162 53 Vällingby<br>
+Sweden<br>
+<i>E-mail:</i> <a
href="mailto:[email protected]";>[email protected]</a>
+</td><td valign=top>
+Sweden only
+</td></tr>
+</table>
+
diff --git a/about/openssl-contact.wml b/about/openssl-contact.wml
new file mode 100644
index 0000000..8b9c590
--- /dev/null
+++ b/about/openssl-contact.wml
@@ -0,0 +1,22 @@
+
+#use wml::openssl area=funding page=index
+
+<title>OpenSSL Software Foundation Contact Info</title>
+
+<h1>OpenSSL Software Foundation Queries</h1>
+
+Direct queries concerning any non-commercial activites or issues to:<br>
+<br>
+OpenSSL Software Foundation<br>
+20-22 Wenlock Road<br>
+London<br>
+N1 7GU<br>
+United Kingdom<br>
++44 1785508015 (UK)<br>
++1 877-OPENSSL(6775) (US toll free)<br>
++1 301-956-2281 (US)<br>
+<a href="mailto:[email protected]";>[email protected]</a>
+<p>
+You will probably wind up talking to Steve Marquess who currently handles
OpenSSL commercial contracting, he is
+reachable directly at <a
href="mailto:[email protected]";>[email protected]</a>
or
+the telephone numbers above.
diff --git a/docs/fips/fipsnotes.wml b/docs/fips/fipsnotes.wml
index 5ce62c8..ef2b234 100644
--- a/docs/fips/fipsnotes.wml
+++ b/docs/fips/fipsnotes.wml
@@ -84,7 +84,7 @@ no longer a suitable model for private label validations in
its current form pas
<h2>Upcoming Validations</h2>
<p>
-No new validations are currently planned. The <a
href="http://www.opensslfoundation.com/fips/ig95.html";>I.G. 9.5</a>
+No new validations are currently planned. The <a
href="http://www.openssl.com/fips/ig95.html";>I.G. 9.5</a>
issue has effectively precluded consideration of new validations for much of
2013, but with the July 25 2013 update of the
<a
href="http://csrc.nist.gov/groups/STM/cmvp/documents/fips140-2/FIPS1402IG.pdf";>Implementation
Guidance</a>
(I.G.) document such validations appear to be feasible again. We will be happy
to discuss our current understanding of
diff --git a/docs/fips/fipsvalidation.wml b/docs/fips/fipsvalidation.wml
index f910477..b75ffb7 100644
--- a/docs/fips/fipsvalidation.wml
+++ b/docs/fips/fipsvalidation.wml
@@ -15,7 +15,7 @@ is documented in the <a href="UserGuide-1.2.pdf">1.2 User
Guide</a>.
<p>
<font color="#cc3333">Important Note:</font>
Due to new requirements introduced in 2013 the current v2.0 Module is no
longer suitable as a
-reference for private label validations; see the <a
href="http://www.opensslfoundation.com/fips/ig95.html";>I.G. 9.5 FAQ</a>.
+reference for private label validations; see the <a
href="http://www.openssl.com/fips/ig95.html";>I.G. 9.5 FAQ</a>.
Due to earlier changes in the FIPS 140-2 validation
requirements the v1.2 Module is no longer be a suitable model for private
label validations
in its current form past the year 2010; see the NIST
@@ -83,7 +83,7 @@ remain valid for the platforms tested at the time those
revisions were approved.
<a name="sponsors">
<h2>Sponsors</h2>
</a>
-The OpenSSL Software Foundation receives support from multiple sources for each
+The OpenSSL FIPS Object Module validations receive support from multiple
sources for each
validation effort; however only those sponsors who have elected to be
recognised
for their contribution to OpenSSL are listed below.
<ul>
@@ -151,7 +151,7 @@ Directorate-sponsored Homeland Open Security Technology
(HOST) program</a>, algo
</ul>
<p>
If you have an interest in sponsoring any changes or additions to this
validation
-please contact the <a
href="http://openssl.org/support/funding/support-contact.html";>OSF</a>.
+please contact <a href="http://openssl.com/fips";>OpenSSL Validation
Services</a>.
<p>
Some commercial software vendors ask us "what do we gain from sponsoring a
validation
that our competition can also use?". Our answer is "nothing, if you think in
terms of
diff --git a/docs/fips/privatelabel.wml b/docs/fips/privatelabel.wml
index 81d2e0c..19a4f6e 100644
--- a/docs/fips/privatelabel.wml
+++ b/docs/fips/privatelabel.wml
@@ -21,8 +21,8 @@ The rest of this page is of historical interest only.
<h2>What It Is</h2>
-We have found that one of the most popular commercial services offered by the
-OpenSSL Software Foundation is the <a
href="fipsnotes.html#privatelabel">private label validation</a>. It's not a
+We have found that one of the most popular commercial services offered by the
OpenSSL team
+is the <a href="fipsnotes.html#privatelabel">private label validation</a>.
It's not a
business we ever planned to be in, but as the originators of the source code
based
OpenSSL FIPS Object Module validations, and with lots of practice, we've
gotten pretty good at it.
The revenue we earn from these validations supports the OpenSSL project, and
for some
@@ -95,4 +95,4 @@ Note minor software modifications can often be accommodated
in a change letter m
<p>
<hr>
-Interested? Contact the <a
href="/support/funding/support-contact.html">OSF</a>.
+Interested? Contact <a href="http://openssl.com/fips";>OpenSSL Software
Services</a>.
diff --git a/docs/index.wml b/docs/index.wml
index bda3dc9..3ad49e6 100644
--- a/docs/index.wml
+++ b/docs/index.wml
@@ -31,7 +31,7 @@ features which are not present in other releases.
HOWTO documents to introduce concepts or explain them in a way that is not
possible in the manuals.
<p>
<li><a href="http://wiki.openssl.org/";><font id=sfl>WIKI</font></a><br>
- A wiki providing information and guidance about openssl. Operated by the
OpenSSL foundation.
+ A wiki providing information and guidance about openssl. Operated by the
OpenSSL Software Foundation.
<p>
<li><a href="fips/"><font id=sfl>FIPS140</font></a>:<br>
Data and documentation related to the FIPS140 validation support in OpenSSL
diff --git a/support/acknowledgments.wml b/support/acknowledgments.wml
index ca8345e..151c2fe 100644
--- a/support/acknowledgments.wml
+++ b/support/acknowledgments.wml
@@ -189,4 +189,4 @@ Please note that we ask permission to identify sponsors and
that some sponsors w
inclusion here have requested to remain anonymous.
<p>
Additional sponsorship or financial support of any kind is always welcome; for
more information please
-contact the <a href="funding/support-contact.html">OpenSSL Software
Foundation</a>
+contact the <a href="../about/openssl-contact.html">OpenSSL Software
Foundation</a>
diff --git a/support/consulting.wml b/support/consulting.wml
index c0fb199..12e773d 100644
--- a/support/consulting.wml
+++ b/support/consulting.wml
@@ -64,5 +64,5 @@ several formats such as our
in mailing list announcements.
<p>
-For further information please contact the <a
href="funding/support-contact.html">OpenSSL Software Foundation</a>.
+For further information please contact our consulting organization, <a
href="funding/support-contact.html">OpenSSL Software Services</a>.
diff --git a/support/donations-cn.wml b/support/donations-cn.wml
index 5cad838..eef9802 100644
--- a/support/donations-cn.wml
+++ b/support/donations-cn.wml
@@ -116,4 +116,4 @@ We really appreciate your support of the OpenSSL project!
<br>
<br>
As noted above these donations are currently <em>not</em> tax-deductible!<br>
-For further information please contact the <a
href="funding/support-contact.html">OpenSSL Software Foundation</a>.
+For further information please contact the <a
href="about/openssl-contact.html">OpenSSL Software Foundation</a>.
diff --git a/support/donations.wml b/support/donations.wml
index 88c48e8..33f0662 100644
--- a/support/donations.wml
+++ b/support/donations.wml
@@ -8,10 +8,10 @@
<p>Your donation to the OpenSSL team will support the ongoing development
activities of the team members.
</p>
-<p>Please note that the <a href="funding/support-contact.html">OpenSSL
-Software Foundation</a> (OSF) is incorporated in the the state of Delware,
+<p>Please note that the <a href="../about/openssl-contact.html">OpenSSL
+Software Foundation</a> (OSF) is incorporated in the the state of Delaware,
United States, as a non-profit corporation. It does not qualify as
-a charitable organisation under Section 501(c)(3) of the U.S. Internal
+a tax-exempt charitable organisation under Section 501(c)(3) of the U.S.
Internal
Revenue Code. We looked into it and concluded that 501(c)(3) status
would require more of an investment in time and money than we can justify
at present. This means that, for individuals within the U.S., donations
@@ -103,4 +103,4 @@ We also accept donations in any amount via credit card or
PayPal:
<br>
<br>
As noted above these donations are currently <em>not</em> tax-deductible!<br>
-For further information please contact the <a
href="funding/support-contact.html">OpenSSL Software Foundation</a>.
+For further information please contact the <a
href="../about/openssl-contact.html">OpenSSL Software Foundation</a>.
diff --git a/support/funding/contract.wml b/support/funding/contract.wml
index cd5c214..d45b6b1 100644
--- a/support/funding/contract.wml
+++ b/support/funding/contract.wml
@@ -33,5 +33,5 @@ custom arrangements.
Per-incident support.
<p>
</ul>
-For further information please contact the <a
href="support-contact.html">OSF</a>.
+For further information please contact <a href="support-contact.html">OpenSSL
Software Services</a>.
diff --git a/support/funding/support-contact.wml
b/support/funding/support-contact.wml
index b6fbd07..b66b75a 100644
--- a/support/funding/support-contact.wml
+++ b/support/funding/support-contact.wml
@@ -7,13 +7,13 @@
Direct queries concerning support contracts, donations or consulting services
to:<br>
<br>
-The OpenSSL Software Foundation<br>
-1829 Mount Ephraim Road<br>
-Adamstown, MD 21710<br>
+OpenSSL Software Services, Inc.<br>
+40 E Main St, Suite 744<br>
+Newark DE 19711<br>
USA<br>
-+1 877-OPENSSL (+1 877 673 6775)<br>
-<a href="mailto:[email protected]";>[email protected]</a>
++1 240-215-3103<br>
+<a href="mailto:[email protected]";>[email protected]</a>
<p>
You will probably wind up talking to Steve Marquess who currently handles
OpenSSL commercial contracting, he is
-reachable directly at <a
href="mailto:[email protected]";>[email protected]</a>
or
+reachable directly at <a
href="mailto:[email protected]";>[email protected]</a> or
the telephone number above.
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
