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

Clarify Oracle's license #3663

Closed
wants to merge 1 commit into from
Closed

Conversation

kroeckx
Copy link
Member

@kroeckx kroeckx commented Jun 12, 2017

@paulidale: Do you agree that this clarifies the situation and that we can merge this?

@paulidale
Copy link
Contributor

I'll pass on the changed version to legal and see what they think.

@kroeckx kroeckx force-pushed the oracle_copyright branch from 2773ab7 to eda6c09 Compare June 13, 2017 03:29
@kroeckx
Copy link
Member Author

kroeckx commented Jun 13, 2017

So my understanding is that we have the needed legal papers from Oracle to put it either under the existing OpenSSL license or the apache2 license. If legal has a problem with putting it like that, we could also just repeat the license text.

In either case, I think the current situation seems to indicate that there is no license, while we clearly do have one.

@richsalz
Copy link
Contributor

Yes.

@paulidale
Copy link
Contributor

I've heard back from legal, the location isn't an issue. The only thing raised was the formatting of the copyright note itself. The approved format is:

Copyright © [year,] year, Oracle and/or its affiliates. All rights reserved.

Where the first year is the first release and the second is the year of the most recent revision. In this case it differs from what I added by including a single additional comma. The © can be replaced by (C) or (c). Thus the correct text would be:

Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.

I.e. adding a comma after the 2017.

With this proviso, I approve.

@paulidale
Copy link
Contributor

I've taken the liberty of making the comma change in #3684. I've also addressed this in all files.

@paulidale
Copy link
Contributor

I forget to mention, this PR can be closed since the changes are in the other PR.

@t-j-h
Copy link
Member

t-j-h commented Jun 15, 2017

Closing as this is covered in #3684 now

@t-j-h t-j-h closed this Jun 15, 2017
davidben added a commit to google/boringssl that referenced this pull request Jan 4, 2025
This imports the following changes from OpenSSL:

* openssl/openssl@aa8f3d7
* openssl/openssl@5aba2b6
* openssl/openssl@c80149d

See the following links for some related discussion in OpenSSL's
repository:

* openssl/openssl#3663
* openssl/openssl#3684
* openssl/openssl#3585 (comment)
* openssl/openssl#3685

The copyright_summary script may be used to compare this CL. Note there
is one change to ecdsa_test.cc to align with OpenSSL. See
go/openssl-copyright-consolidation-comparison (internal-only).

Bug: 364634028
Change-Id: I987c4e145d2ccd0c32bbf9e7bb2cc69e89019d35
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/74712
Reviewed-by: Adam Langley <[email protected]>
Commit-Queue: David Benjamin <[email protected]>
pi-314159 pushed a commit to open-quantum-safe/boringssl that referenced this pull request Jan 20, 2025
This imports the following changes from OpenSSL:

* openssl/openssl@aa8f3d7
* openssl/openssl@5aba2b6
* openssl/openssl@c80149d

See the following links for some related discussion in OpenSSL's
repository:

* openssl/openssl#3663
* openssl/openssl#3684
* openssl/openssl#3585 (comment)
* openssl/openssl#3685

The copyright_summary script may be used to compare this CL. Note there
is one change to ecdsa_test.cc to align with OpenSSL. See
go/openssl-copyright-consolidation-comparison (internal-only).

Bug: 364634028
Change-Id: I987c4e145d2ccd0c32bbf9e7bb2cc69e89019d35
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/74712
Reviewed-by: Adam Langley <[email protected]>
Commit-Queue: David Benjamin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants