Skip to content

Commit 902c79a

Browse files
committed
Multi-license under MIT OR Apache-2.0 OR BSD-1-Clause
Hopefully this will satisfy the Go team and might come closer to getting us into OpenSSL. We follow https://github.com/rust-lang/rust/tree/e0bc267512fc0cb49c86978192857e8187017f0b#license and https://github.com/rust-lang/rust/blob/e0bc267512fc0cb49c86978192857e8187017f0b/COPYRIGHT for wording.
1 parent ac4da36 commit 902c79a

File tree

12 files changed

+109
-6
lines changed

12 files changed

+109
-6
lines changed

COPYRIGHT

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
SPDX-License-Identifier: MIT OR Apache-2.0 OR BSD-1-Clause
2+
3+
Fiat Cryptography is licensed under the MIT License <LICENSE-MIT> or
4+
<http://opensource.org/licenses/MIT>, the Apache License, Version 2.0
5+
<LICENSE-APACHE> or <http://www.apache.org/licenses/LICENSE-2.0>, or
6+
the BSD 1-Clause License <LICENSE-BSD-1> or
7+
<https://spdx.org/licenses/BSD-1-Clause.html>, at your option.

LICENSE-APACHE

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
The Apache License, Version 2.0 (Apache-2.0)
2+
3+
Copyright 2015-2020 the fiat-crypto authors (see the AUTHORS file)
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.

LICENSE-BSD-1

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
The BSD 1-Clause License (BSD-1-Clause)
2+
3+
Copyright (c) 2015-2020 the fiat-crypto authors (see the AUTHORS file)
4+
All rights reserved.
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions are
8+
met:
9+
10+
1. Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
13+
THIS SOFTWARE IS PROVIDED BY the fiat-crypto authors "AS IS"
14+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Berkeley Software Design,
17+
Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
21+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
22+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
23+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE renamed to LICENSE-MIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015-2019 the fiat-crypto authors (see the AUTHORS file).
3+
Copyright (c) 2015-2020 the fiat-crypto authors (see the AUTHORS file).
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,10 @@ SOME_EARLY_VOFILES := \
102102
COPY_TO_FIAT_RUST := \
103103
AUTHORS \
104104
CONTRIBUTORS \
105-
LICENSE
105+
COPYRIGHT \
106+
LICENSE-MIT \
107+
LICENSE-APACHE \
108+
LICENSE-BSD-1
106109

107110
# computing the vo_reverse_closure is slow, so we only do it if we're
108111
# asked to make the lite target

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Package Manager | Command Line Invocation |
2929
Aptitude (Ubuntu / Debian) | `apt install coq ocaml-findlib libcoq-ocaml-dev` |
3030
Homebrew (OS X) | `brew install coq ocaml-findlib ocaml-num` |
3131
Pacman (Archlinux) | `pacman -S coq ocaml-findlib ocaml-num` |
32-
32+
3333
You can clone this repository with
3434

3535
git clone --recursive https://github.com/mit-plv/fiat-crypto.git
@@ -141,6 +141,14 @@ Here are some examples of ways to invoke the binaries (from the directories that
141141

142142
You can find more examples in the `Makefile`.
143143

144+
License
145+
-------
146+
147+
Fiat-Crypto is distributed under the terms of the MIT License, the Apache License (Version 2.0), and the BSD 1-Clause License; users may pick which license to apply.
148+
149+
See [`COPYRIGHT`](./COPYRIGHT), [`LICENSE-MIT`](./LICENSE-MIT), [`LICENSE-APACHE`](./LICENSE-APACHE), and [`LICENSE-BSD-1`](./LICENSE-BSD-1) for details.
150+
151+
144152
Extended Build Instructions
145153
---------------------------
146154

fiat-rust/COPYRIGHT

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
SPDX-License-Identifier: MIT OR Apache-2.0 OR BSD-1-Clause
2+
3+
Fiat Cryptography is licensed under the MIT License <LICENSE-MIT> or
4+
<http://opensource.org/licenses/MIT>, the Apache License, Version 2.0
5+
<LICENSE-APACHE> or <http://www.apache.org/licenses/LICENSE-2.0>, or
6+
the BSD 1-Clause License <LICENSE-BSD-1> or
7+
<https://spdx.org/licenses/BSD-1-Clause.html>, at your option.

fiat-rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description = "Fiat-crypto generated Rust"
77
homepage = "https://github.com/mit-plv/fiat-crypto"
88
repository = "https://github.com/mit-plv/fiat-crypto"
99
readme = "README.md"
10-
license = "MIT"
10+
license = "MIT OR Apache-2.0 OR BSD-1-Clause"
1111

1212
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1313

fiat-rust/LICENSE-APACHE

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
The Apache License, Version 2.0 (Apache-2.0)
2+
3+
Copyright 2015-2020 the fiat-crypto authors (see the AUTHORS file)
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.

fiat-rust/LICENSE-BSD-1

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
The BSD 1-Clause License (BSD-1-Clause)
2+
3+
Copyright (c) 2015-2020 the fiat-crypto authors (see the AUTHORS file)
4+
All rights reserved.
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions are
8+
met:
9+
10+
1. Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
13+
THIS SOFTWARE IS PROVIDED BY the fiat-crypto authors "AS IS"
14+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Berkeley Software Design,
17+
Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
21+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
22+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
23+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)