| commit | 4854ec106f98a09abd3245c2acaa48822a0493a0 | [log] [tgz] |
|---|---|---|
| author | David Benjamin <davidben@google.com> | Thu Dec 19 17:33:20 2024 -0500 |
| committer | Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> | Fri Jan 03 13:56:35 2025 -0800 |
| tree | 72cca4a642f0bd1976524af1020be8bc45721ddc | |
| parent | f285326824e51232c8e87485267831f3c7b0a20c [diff] |
Apply OpenSSL's "copyright consolidation" changes This applies the OpenSSL "copyright consolidation" process from the following upstream changes: * https://github.com/openssl/openssl/commit/e0a651945cb5a70a2abd9902c0fd3e9759d35867 * https://github.com/openssl/openssl/commit/3fb2cf1ad19feaf6f7c571b49bd9e320eb4daf31 * https://github.com/openssl/openssl/commit/ac3d0e13777a0f0533792ed8fdd7de485675a3a2 * https://github.com/openssl/openssl/commit/c2f312f5c2379e1dcb6b3678bda27f7544508ee6 * https://github.com/openssl/openssl/commit/596d6b7e1ca5aa24700098e262cb1625f256343f * https://github.com/openssl/openssl/commit/e18cf66aaf44b4d476625b2416386b051007d495 * https://github.com/openssl/openssl/commit/846e33c729311169d9c988ceba29484b3783f244 * https://github.com/openssl/openssl/commit/440e5d805f449d662520313b33fd90aeee86980b * https://github.com/openssl/openssl/commit/21dcbebc6e35419f1842f39a125374ea1ba45693 * https://github.com/openssl/openssl/commit/6286757141a8c6e14d647ec733634ae0c83d9887 * https://github.com/openssl/openssl/commit/4f22f40507fea3f272637eb8e00cadf1f34b10d9 * https://github.com/openssl/openssl/commit/d2e9e320186f0917cc940f46bdf1a7e4120da9b0 * https://github.com/openssl/openssl/commit/2039c421b0e5b75ffcf6a88e39cc09089b4303dc * https://github.com/openssl/openssl/commit/b1322259d93cf6b6286f9febcd468b6a9f577d91 * https://github.com/openssl/openssl/commit/aa6bb1352b1026b20a23b49da4efdcf171926eb0 * https://github.com/openssl/openssl/commit/b6cff313cbb1d0381b329fe4f6a8f009cdb270e4 * https://github.com/openssl/openssl/commit/9e20068958b8c1772067299dda7df0b8a82283b4 * https://github.com/openssl/openssl/commit/6aa36e8e5a062e31543e7796f0351ff9628832ce * https://github.com/openssl/openssl/commit/44c8a5e2b9af8909844cc002c53049311634b314 This was mostly automated, but partially manual. The automated portion can be reproduced by checking OpenSSL to commit 44c8a5e2b9af8909844cc002c53049311634b314, and running the following: git grep -l -E 'Copyright remains Eric Young|Copyright.*The OpenSSL Project\.|Written by.*for the OpenSSL Project' crypto/ decrepit/ include/ ssl/ | grep -v objects.go > files.txt cat files.txt | xargs -n1 perl -i ./util/copyright.pl From there, some years were fixed up manually according to go/openssl-copyright-consolidation-comparison (internal-only). Three files required additional manual fixing: - crypto/ecdh_extra/ecdh_extra.cc - crypto/fipsmodule/ecdh/ecdh.cc.inc - include/openssl/ecdh.h These files have an OpenSSL header, but *after* a different header, so the script does not correctly detect the now redundant OpenSSL header. They were manually modified to remove it. This matches what seems to have been done to crypto/ec/ecdh_ossl.c in OpenSSL's 4f22f40507fea3f272637eb8e00cadf1f34b10d9. Bug: 364634028 Change-Id: I79a559a409ebe2476f2cb8a48a488ac5dd77c90a Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/74710 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
BoringSSL is a fork of OpenSSL that is designed to meet Google's needs.
Although BoringSSL is an open source project, it is not intended for general use, as OpenSSL is. We don't recommend that third parties depend upon it. Doing so is likely to be frustrating because there are no guarantees of API or ABI stability.
Programs ship their own copies of BoringSSL when they use it and we update everything as needed when deciding to make API changes. This allows us to mostly avoid compromises in the name of compatibility. It works for us, but it may not work for you.
BoringSSL arose because Google used OpenSSL for many years in various ways and, over time, built up a large number of patches that were maintained while tracking upstream OpenSSL. As Google's product portfolio became more complex, more copies of OpenSSL sprung up and the effort involved in maintaining all these patches in multiple places was growing steadily.
Currently BoringSSL is the SSL library in Chrome/Chromium, Android (but it's not part of the NDK) and a number of other apps/programs.
Project links:
To file a security issue, use the Chromium process and mention in the report this is for BoringSSL. You can ignore the parts of the process that are specific to Chromium/Chrome.
There are other files in this directory which might be helpful: