Skip to content

Commit a488eb3

Browse files
briansmithbriansmith
authored
Merge pull request #2402 from briansmith/b/bm-7-8
Merge BoringSSL 33d1049: Switch the license to Apache 2.0, matching OpenSSL upstream
2 parents d22bf87 + 0d80ad5 commit a488eb3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1134
-1762
lines changed

‎Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ categories = ["cryptography", "no-std"]
55
description = "Safe, fast, small crypto using Rust."
66
edition = "2021"
77
keywords = ["crypto", "cryptography", "rand", "ECC", "RSA"]
8-
license-file = "LICENSE"
8+
license = "Apache-2.0 AND ISC"
99
name = "ring"
1010
repository = "https://github.com/briansmith/ring"
1111

@@ -25,6 +25,10 @@ links = "ring_core_0_17_9_"
2525

2626
include = [
2727
"LICENSE",
28+
"LICENSE-BoringSSL",
29+
"src/polyfill/once_cell/LICENSE-APACHE",
30+
"src/polyfill/once_cell/LICENSE-MIT",
31+
2832
"Cargo.toml",
2933

3034
"pregenerated/*",

‎LICENSE

Lines changed: 6 additions & 189 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
Note that it is easy for this file to get out of sync with the licenses in the
2-
source code files. It's recommended to compare the licenses in the source code
3-
with what's mentioned here.
1+
*ring* uses an ISC-style license like BoringSSL for code in files that
2+
originate in this project:
43

5-
*ring* is derived from BoringSSL, so the licensing situation in *ring* is
6-
similar to BoringSSL.
7-
8-
*ring* uses an ISC-style license like BoringSSL for code in new files,
9-
including in particular all the Rust code:
10-
11-
Copyright 2015-2016 Brian Smith.
4+
Copyright 2015-2025 Brian Smith.
125

136
Permission to use, copy, modify, and/or distribute this software for any
147
purpose with or without fee is hereby granted, provided that the above
@@ -22,183 +15,7 @@ including in particular all the Rust code:
2215
OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
2316
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2417

25-
BoringSSL is a fork of OpenSSL. As such, large parts of it fall under OpenSSL
26-
licensing. Files that are completely new have a Google copyright and an ISC
27-
license. This license is reproduced at the bottom of this file.
28-
29-
Contributors to BoringSSL are required to follow the CLA rules for Chromium:
30-
https://cla.developers.google.com/clas
31-
32-
Files in third_party/ have their own licenses, as described therein. The MIT
33-
license, for third_party/fiat, which, unlike other third_party directories, is
34-
compiled into non-test libraries, is included below.
35-
36-
The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the
37-
OpenSSL License and the original SSLeay license apply to the toolkit. See below
38-
for the actual license texts. Actually both licenses are BSD-style Open Source
39-
licenses. In case of any license issues related to OpenSSL please contact
40-
openssl-core@openssl.org.
41-
42-
The following are Google-internal bug numbers where explicit permission from
43-
some authors is recorded for use of their work:
44-
27287199
45-
27287880
46-
27287883
47-
48-
OpenSSL License
49-
---------------
50-
51-
/* ====================================================================
52-
* Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved.
53-
*
54-
* Redistribution and use in source and binary forms, with or without
55-
* modification, are permitted provided that the following conditions
56-
* are met:
57-
*
58-
* 1. Redistributions of source code must retain the above copyright
59-
* notice, this list of conditions and the following disclaimer.
60-
*
61-
* 2. Redistributions in binary form must reproduce the above copyright
62-
* notice, this list of conditions and the following disclaimer in
63-
* the documentation and/or other materials provided with the
64-
* distribution.
65-
*
66-
* 3. All advertising materials mentioning features or use of this
67-
* software must display the following acknowledgment:
68-
* "This product includes software developed by the OpenSSL Project
69-
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
70-
*
71-
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
72-
* endorse or promote products derived from this software without
73-
* prior written permission. For written permission, please contact
74-
* openssl-core@openssl.org.
75-
*
76-
* 5. Products derived from this software may not be called "OpenSSL"
77-
* nor may "OpenSSL" appear in their names without prior written
78-
* permission of the OpenSSL Project.
79-
*
80-
* 6. Redistributions of any form whatsoever must retain the following
81-
* acknowledgment:
82-
* "This product includes software developed by the OpenSSL Project
83-
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
84-
*
85-
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
86-
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
87-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
88-
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
89-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
90-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
91-
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
92-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
93-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
94-
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
95-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
96-
* OF THE POSSIBILITY OF SUCH DAMAGE.
97-
* ====================================================================
98-
*
99-
* This product includes cryptographic software written by Eric Young
100-
* (eay@cryptsoft.com). This product includes software written by Tim
101-
* Hudson (tjh@cryptsoft.com).
102-
*
103-
*/
104-
105-
Original SSLeay License
106-
-----------------------
107-
108-
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
109-
* All rights reserved.
110-
*
111-
* This package is an SSL implementation written
112-
* by Eric Young (eay@cryptsoft.com).
113-
* The implementation was written so as to conform with Netscapes SSL.
114-
*
115-
* This library is free for commercial and non-commercial use as long as
116-
* the following conditions are aheared to. The following conditions
117-
* apply to all code found in this distribution, be it the RC4, RSA,
118-
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
119-
* included with this distribution is covered by the same copyright terms
120-
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
121-
*
122-
* Copyright remains Eric Young's, and as such any Copyright notices in
123-
* the code are not to be removed.
124-
* If this package is used in a product, Eric Young should be given attribution
125-
* as the author of the parts of the library used.
126-
* This can be in the form of a textual message at program startup or
127-
* in documentation (online or textual) provided with the package.
128-
*
129-
* Redistribution and use in source and binary forms, with or without
130-
* modification, are permitted provided that the following conditions
131-
* are met:
132-
* 1. Redistributions of source code must retain the copyright
133-
* notice, this list of conditions and the following disclaimer.
134-
* 2. Redistributions in binary form must reproduce the above copyright
135-
* notice, this list of conditions and the following disclaimer in the
136-
* documentation and/or other materials provided with the distribution.
137-
* 3. All advertising materials mentioning features or use of this software
138-
* must display the following acknowledgement:
139-
* "This product includes cryptographic software written by
140-
* Eric Young (eay@cryptsoft.com)"
141-
* The word 'cryptographic' can be left out if the rouines from the library
142-
* being used are not cryptographic related :-).
143-
* 4. If you include any Windows specific code (or a derivative thereof) from
144-
* the apps directory (application code) you must include an acknowledgement:
145-
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
146-
*
147-
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
148-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
149-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
150-
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
151-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
152-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
153-
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
154-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
155-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
156-
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
157-
* SUCH DAMAGE.
158-
*
159-
* The licence and distribution terms for any publically available version or
160-
* derivative of this code cannot be changed. i.e. this code cannot simply be
161-
* copied and put under another distribution licence
162-
* [including the GNU Public Licence.]
163-
*/
164-
165-
166-
ISC license used for completely new code in BoringSSL:
167-
168-
/* Copyright (c) 2015, Google Inc.
169-
*
170-
* Permission to use, copy, modify, and/or distribute this software for any
171-
* purpose with or without fee is hereby granted, provided that the above
172-
* copyright notice and this permission notice appear in all copies.
173-
*
174-
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
175-
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
176-
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
177-
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
178-
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
179-
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
180-
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
181-
182-
183-
The code in third_party/fiat carries the MIT license:
184-
185-
Copyright (c) 2015-2016 the fiat-crypto authors (see
186-
https://github.com/mit-plv/fiat-crypto/blob/master/AUTHORS).
187-
188-
Permission is hereby granted, free of charge, to any person obtaining a copy
189-
of this software and associated documentation files (the "Software"), to deal
190-
in the Software without restriction, including without limitation the rights
191-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
192-
copies of the Software, and to permit persons to whom the Software is
193-
furnished to do so, subject to the following conditions:
194-
195-
The above copyright notice and this permission notice shall be included in all
196-
copies or substantial portions of the Software.
18+
See LICENSE-BoringSSL for code that was sourced from BoringSSL.
19719

198-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
199-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
200-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
201-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
202-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
203-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
204-
SOFTWARE.
20+
See src/polyfill/once_cell/LICENSE-APACHE and src/polyfill/once_cell/LICENSE-MIT
21+
for the license to code that was sourced from the once_cell project.

0 commit comments

Comments
 (0)