Skip to content

Commit 1513331

Browse files
levittelevitte
committed
Change license to the Apache License v2.0
This applies to the 'master' git branch and OpenSSL version 3.0.0 and up. Pre-3.0.0 versions retain the previous license. The boilerplate will change in increments after this change. Reviewed-by: Matt Caswell <[email protected]> (Merged from openssl#7764)
1 parent 389c09f commit 1513331

File tree

4 files changed

+184
-128
lines changed

4 files changed

+184
-128
lines changed

‎CHANGES

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
Changes between 1.1.1 and 3.0.0 [xx XXX xxxx]
1111

12+
*) Change the license to the Apache License v2.0.
13+
[Richard Levitte]
14+
1215
*) Change the possible version information given with OPENSSL_API_COMPAT.
1316
It may be a pre-3.0.0 style numerical version number as it was defined
1417
in 1.1.0, and it may also simply take the major version number.

‎CONTRIBUTING

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ guidelines:
2828

2929
Copyright 20xx-20yy The OpenSSL Project Authors. All Rights Reserved.
3030

31-
Licensed under the OpenSSL license (the "License"). You may not use
31+
Licensed under the Apache License 2.0 (the "License"). You may not use
3232
this file except in compliance with the License. You can obtain a copy
3333
in the file LICENSE in the source distribution or at
3434
https://www.openssl.org/source/license.html

‎LICENSE

+175-123
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,177 @@
11

2-
LICENSE ISSUES
3-
==============
4-
5-
The OpenSSL toolkit stays under a double license, i.e. both the conditions of
6-
the OpenSSL License and the original SSLeay license apply to the toolkit.
7-
See below for the actual license texts.
8-
9-
OpenSSL License
10-
---------------
11-
12-
/* ====================================================================
13-
* Copyright (c) 1998-2018 The OpenSSL Project. All rights reserved.
14-
*
15-
* Redistribution and use in source and binary forms, with or without
16-
* modification, are permitted provided that the following conditions
17-
* are met:
18-
*
19-
* 1. Redistributions of source code must retain the above copyright
20-
* notice, this list of conditions and the following disclaimer.
21-
*
22-
* 2. Redistributions in binary form must reproduce the above copyright
23-
* notice, this list of conditions and the following disclaimer in
24-
* the documentation and/or other materials provided with the
25-
* distribution.
26-
*
27-
* 3. All advertising materials mentioning features or use of this
28-
* software must display the following acknowledgment:
29-
* "This product includes software developed by the OpenSSL Project
30-
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
31-
*
32-
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
33-
* endorse or promote products derived from this software without
34-
* prior written permission. For written permission, please contact
35-
* [email protected].
36-
*
37-
* 5. Products derived from this software may not be called "OpenSSL"
38-
* nor may "OpenSSL" appear in their names without prior written
39-
* permission of the OpenSSL Project.
40-
*
41-
* 6. Redistributions of any form whatsoever must retain the following
42-
* acknowledgment:
43-
* "This product includes software developed by the OpenSSL Project
44-
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
45-
*
46-
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
47-
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
48-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
49-
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
50-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
51-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
52-
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
53-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
54-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
55-
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
56-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
57-
* OF THE POSSIBILITY OF SUCH DAMAGE.
58-
* ====================================================================
59-
*
60-
* This product includes cryptographic software written by Eric Young
61-
* ([email protected]). This product includes software written by Tim
62-
* Hudson ([email protected]).
63-
*
64-
*/
65-
66-
Original SSLeay License
67-
-----------------------
68-
69-
/* Copyright (C) 1995-1998 Eric Young ([email protected])
70-
* All rights reserved.
71-
*
72-
* This package is an SSL implementation written
73-
* by Eric Young ([email protected]).
74-
* The implementation was written so as to conform with Netscapes SSL.
75-
*
76-
* This library is free for commercial and non-commercial use as long as
77-
* the following conditions are aheared to. The following conditions
78-
* apply to all code found in this distribution, be it the RC4, RSA,
79-
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
80-
* included with this distribution is covered by the same copyright terms
81-
* except that the holder is Tim Hudson ([email protected]).
82-
*
83-
* Copyright remains Eric Young's, and as such any Copyright notices in
84-
* the code are not to be removed.
85-
* If this package is used in a product, Eric Young should be given attribution
86-
* as the author of the parts of the library used.
87-
* This can be in the form of a textual message at program startup or
88-
* in documentation (online or textual) provided with the package.
89-
*
90-
* Redistribution and use in source and binary forms, with or without
91-
* modification, are permitted provided that the following conditions
92-
* are met:
93-
* 1. Redistributions of source code must retain the copyright
94-
* notice, this list of conditions and the following disclaimer.
95-
* 2. Redistributions in binary form must reproduce the above copyright
96-
* notice, this list of conditions and the following disclaimer in the
97-
* documentation and/or other materials provided with the distribution.
98-
* 3. All advertising materials mentioning features or use of this software
99-
* must display the following acknowledgement:
100-
* "This product includes cryptographic software written by
101-
* Eric Young ([email protected])"
102-
* The word 'cryptographic' can be left out if the rouines from the library
103-
* being used are not cryptographic related :-).
104-
* 4. If you include any Windows specific code (or a derivative thereof) from
105-
* the apps directory (application code) you must include an acknowledgement:
106-
* "This product includes software written by Tim Hudson ([email protected])"
107-
*
108-
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
109-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
110-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
111-
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
112-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
113-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
114-
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
115-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
116-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
117-
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
118-
* SUCH DAMAGE.
119-
*
120-
* The licence and distribution terms for any publically available version or
121-
* derivative of this code cannot be changed. i.e. this code cannot simply be
122-
* copied and put under another distribution licence
123-
* [including the GNU Public Licence.]
124-
*/
2+
Apache License
3+
Version 2.0, January 2004
4+
https://www.apache.org/licenses/
1255

6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS

‎README

+5-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
full-strength general purpose cryptographic library.
1515

1616
OpenSSL is descended from the SSLeay library developed by Eric A. Young
17-
and Tim J. Hudson. The OpenSSL toolkit is licensed under a dual-license (the
18-
OpenSSL license plus the SSLeay license), which means that you are free to
19-
get and use it for commercial and non-commercial purposes as long as you
20-
fulfill the conditions of both licenses.
17+
and Tim J. Hudson.
18+
19+
The OpenSSL toolkit is licensed under the Apache License 2.0, which means
20+
that you are free to get and use it for commercial and non-commercial
21+
purposes as long as you fulfill its conditions.
2122

2223
OVERVIEW
2324
--------

0 commit comments

Comments
 (0)