Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust license to clarify the usage within OSS-Fuzz #909

Merged
merged 3 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ software and associated documentation (collectively, the
**Please read all of these Terms;** in many cases, provisions set
forth later in the Terms limit and qualify provisions set forth
earlier in the Terms. If You do not accept these Terms, do not
download, install, use, or copy the Software.
download, install, use, or copy the Software except as a dependency of another
program if you do not use the functionality of the Software."

Definitions
-----------
Expand Down Expand Up @@ -46,9 +47,12 @@ below:
* Perform analysis on the Open Source Codebase but without automated
analysis / fuzzing, CI, or CD.

* Perform analysis on Open Source Codebases, including automated
analysis / fuzzing, CI, or CD only through the OSS-Fuzz Infrastructure
operated by Google (https://github.com/google/oss-fuzz).
* Perform analysis on Open Source Codebases, including automated analysis / fuzzing,
CI, or CD only in the following cases:
(a) through the OSS-Fuzz Infrastructure operated by Google, and/or
(b) Your codebase is listed as an accepted project for OSS-Fuzz by Google, and/or
(c) test contributions to OSS-Fuzz, OSS-Fuzz-Gen & ClusterFuzzLite by Google
to confirm that your modifications work as intended.

License Restrictions
--------------------
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,10 @@ See [the README](https://github.com/bazelbuild/rules_fuzzing#java-fuzzing) for i
[Code Intelligence](https://code-intelligence.com) and Google have teamed up to bring support for Java, Kotlin, and other JVM-based languages to [OSS-Fuzz](https://github.com/google/oss-fuzz), Google's project for large-scale fuzzing of open-source software.
Read [the OSS-Fuzz guide](https://google.github.io/oss-fuzz/getting-started/new-project-guide/jvm-lang/) to learn how to set up a Java project.

**Note**: projects accepted in OSS-Fuzz can use Jazzer for free and benefit from the OSS-Fuzz infrastructure and
licensing for automated analysis and continuous integration.
**Note**: Open source projects can use Jazzer for free and benefit from the
OSS-Fuzz infrastructure, including ClusterFuzzLite and OSS-Fuzz-Gen for
automated analysis and continuous integration. There is no risk of accidental
license violation as long as Jazzer is used for testing open-source code.
serj marked this conversation as resolved.
Show resolved Hide resolved

## Building from source

Expand Down