Upstream merge 2024 08 19 #1781
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
skmcgrail
force-pushed
the
upstream-merge-2024-08-19
branch
from
6ba8d18
to
7f90ecf
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1781 +/- ##
=======================================
Coverage 78.33% 78.33%
=======================================
Files 581 581
Lines 97335 97337 +2
Branches 13958 13957 -1
=======================================
+ Hits 76244 76246 +2
- Misses 20469 20471 +2
+ Partials 622 620 -2 ☔ View full report in Codecov by Sentry. |
skmcgrail
force-pushed
the
upstream-merge-2024-08-19
branch
3 times, most recently
from
71317eb
to
c31d1e2
Compare
torben-hansen
approved these changes
Aug 23, 2024
justsmth
approved these changes
Aug 23, 2024
The PATH-related workarounds for the old third-party Android toolchain don't seem to apply to the official NDK one, so just remove them. The official one does define the ANDROID variable, but only in an "android-legacy.toolchain.cmake". I think the standard way to do this is CMAKE_SYSTEM_NAME so switch to that. Change-Id: I3f3fa69d482893c333ae06f54ac39434c3c6a56c Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65670 Reviewed-by: Bob Beck <bbe@google.com> Commit-Queue: David Benjamin <davidben@google.com> (cherry picked from commit 8378dad8af30bc825518ef38098c4a50cfa99728)
Chromium's presubmits check for files to be correctly formatted. While this is automatically generated, the tooling doesn't know this. Just output in the format it expects, which is that length 0 and length one lists are formatted differently. Change-Id: I3c5bec884db302f780c5c53429dfe26cb4731d58 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65828 Reviewed-by: Bob Beck <bbe@google.com> Auto-Submit: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: David Benjamin <davidben@google.com> (cherry picked from commit 625f68bf35248c9f47c964ce782567aafa4e2f55)
There's a desire to upstream this in a compatible way to other projects so they can use the same public API as us, however for some C based build systems having an include file potentially on the include path that can end up being picked up when you include <time.h> is problematic and annoying, so let's just avoid the unnecessary pain. Update-Note: <openssl/time.h> has moved to <openssl/posix_time.h> Change-Id: I7c6aa92e95a10ff65275851fcf596b06e4848789 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65847 Commit-Queue: Bob Beck <bbe@google.com> Auto-Submit: Bob Beck <bbe@google.com> Reviewed-by: David Benjamin <davidben@google.com> (cherry picked from commit db7308de87ea138e7bbcbbb00dfc9b841774ba2f)
MSVC uses different defines than everyone else for SSE2 Change-Id: I3402b5cc1d06cf5be096b0fcc8c87426d77d361c Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65876 Auto-Submit: David Benjamin <davidben@google.com> Reviewed-by: Bob Beck <bbe@google.com> Commit-Queue: Bob Beck <bbe@google.com> (cherry picked from commit f58aa24e661d528e07f7c59574926aebb4e92c14)
I got a -Wstringop-overflow warning in GCC 12.2.0, targetting 32-bit Arm. It's a false positive, but rewriting the function this way seems a bit clearer. (Previously, I tried to write it in a way that truncated if the bounds were wrong. Just make it a BSSL_CHECK.) Change-Id: Iaa3955f08f320f2c376ca66703e4dd29481128fd Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65867 Reviewed-by: Bob Beck <bbe@google.com> Commit-Queue: David Benjamin <davidben@google.com> Auto-Submit: David Benjamin <davidben@google.com> (cherry picked from commit 15a76eb224ec4eff94d00565ee7d13b1f5a3a6cc)
skmcgrail
force-pushed
the
upstream-merge-2024-08-19
branch
from
8c387c6
to
0ea4425
Compare
smittals2
added a commit
that referenced
this pull request
Sep 17, 2024
## What's Changed * Use OPENSSL_STATIC_ASSERT which handles all the platform/compiler/C s… by @andrewhop in #1791 * ML-KEM refactor by @dkostic in #1763 * ML-KEM-IPD to ML-KEM as defined in FIPS 203 by @dkostic in #1796 * Add KDA OneStep testing to ACVP by @skmcgrail in #1792 * Updating erroneous documentation for BIO_get_mem_data and subsequent usage by @smittals2 in #1752 * No-op impls for several EVP_PKEY_CTX functions by @justsmth in #1759 * Drop "ipd" suffix from ML-KEM related code by @dkostic in #1797 * Upstream merge 2024 08 19 by @skmcgrail in #1781 * ML-KEM move to the FIPS module by @dkostic in #1802 * Reduce collision probability for variable names by @torben-hansen in #1804 * Refactor ENGINE API and memory around METHOD structs by @smittals2 in #1776 * bn: Move x86-64 argument-based dispatching of bn_mul_mont to C. by @justsmth in #1795 * Check at runtime that the tool is loading the same libcrypto it was built with by @andrewhop in #1716 * Avoid matching prefixes of a symbol as arm registers by @torben-hansen in #1807 * Add CI for FreeBSD by @justsmth in #1787 * Move curve25519 implementations to fips module except spake25519 by @torben-hansen in #1809 * Add CAST for SP 800-56Cr2 One-Step function by @skmcgrail in #1803 * Remove custom PKCS7 ASN1 functions, add new structs by @WillChilds-Klein in #1726 * NASM use default debug format by @justsmth in #1747 * Add KDF in counter mode ACVP Testing by @skmcgrail in #1810 * add support for OCSP_request_verify by @samuel40791765 in #1778 * Fix GitHub/CodeBuild Purge Lambda by @justsmth in #1808 * KBKDF_ctr_hmac FIPS Service Indicator by @skmcgrail in #1798 * Update x509 tool to write all output to common BIO which is a file or stdout by @andrewhop in #1800 * Add ML-KEM to speed.cc, bump AWSLC_API_VERSION to 30 by @andrewhop in #1817 * Add EVP_PKEY_asn1_* functions by @justsmth in #1751 * Improve portability of CI integration script by @torben-hansen in #1815 * Upstream merge 2024 08 23 by @justsmth in #1799 * Replace ECDSA_METHOD with EC_KEY_METHOD and add the associated API by @smittals2 in #1785 * Cherrypick "Add some barebones support for DH in EVP" by @samuel40791765 in #1813 * Add KDA OneStep (SSKDF_digest and SSKDF_hmac) to FIPS indicator by @skmcgrail in #1793 * Add EVP_Digest one-shot test XOFs by @WillChilds-Klein in #1820 * Wire-up ACVP Testing for SHA3 Signatures with RSA by @skmcgrail in #1805 * Make SHA3 (not SHAKE) Approved for EVP_DigestSign/Verify, RSA and ECDSA. by @nebeid in #1821 * Begin tracking RelWithDebInfo library statistics by @andrewhop in #1822 * Move EVP ed25519 function table under FIPS module by @torben-hansen in #1826 * Avoid C11 Atomics on Windows by @justsmth in #1824 * Improve pre-sandbox setup by @torben-hansen in #1825 * Add OCSP round trip integration test with minor fixes by @samuel40791765 in #1811 * Add various PKCS7 getters and setters by @WillChilds-Klein in #1780 * Run clang-format on pkcs7 code by @WillChilds-Klein in #1830 * Move KEM API and ML-KEM definitions to FIPS module by @torben-hansen in #1828 * fix socat integration CI by @samuel40791765 in #1833 * Retire out-of-module KEM folder by @torben-hansen in #1832 * Refactor RSA_METHOD and expand API by @smittals2 in #1790 * Update benchmark documentation in tool/readme.md by @andrewhop in #1812 * Pre jail unit test by @torben-hansen in #1835 * Move EVP KEM implementation to in-module and correct OID by @torben-hansen in #1838 * More minor symbols Ruby depends on by @samuel40791765 in #1837 * ED25519 Power-on Self Test / CAST / KAT by @skmcgrail in #1834 * ACVP ML-KEM testing by @skmcgrail in #1840 * ACVP ECDSA SHA3 Digest Testing by @skmcgrail in #1819 * ML-KEM Service Indicator for EVP_PKEY_keygen, EVP_PKEY_encapsulate, EVP_PKEY_decapsulate by @skmcgrail in #1844 * Add ML-KEM CAST for KeyGen, Encaps, and Decaps by @skmcgrail in #1846 * ED25519 Service Indicator by @skmcgrail in #1829 * Update Allowed RSA KeySize Generation to FIPS 186-5 specification by @skmcgrail in #1823 * Add ED25519 ACVP Testing by @skmcgrail in #1818 * Make EDDSA/Ed25519 POST lazy initalized by @skmcgrail in #1848 * add support for PEM Parameters without ASN1 hooks by @samuel40791765 in #1831 * Add OpenVPN tip of main to CI by @smittals2 in #1843 * Ensure SSE2 is enabled when using optimized assembly for 32-bit x86 by @graebm in #1841 * Add support for `EVP_PKEY_CTX_ctrl_str` - Step #1 by @justsmth in #1842 * Added SHA3/SHAKE XOF functionality by @jakemas in #1839 * Migrated ML-KEM SHA3/SHAKE usage to fipsmodule by @jakemas in #1851 * AVX-512 support for RSA Signing by @pittma in #1273
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See internal documentation.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.