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.

Sign up for GitHub

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

Jump to bottom

Upstream merge 2024 08 19 #1781

Merged
merged 5 commits into from
Aug 26, 2024
Merged

Upstream merge 2024 08 19 #1781

merged 5 commits into from
Aug 26, 2024

Commits on Aug 26, 2024

  1. Remove remnants of the old Android CMake toolchain 

    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)
    @davidben @skmcgrail
    davidben authored and skmcgrail committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    18c662c View commit details
    Browse the repository at this point in the history

  2. Tweak generate_build_files.py output to pass gn's formatter 

    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)
    @davidben @skmcgrail
    davidben authored and skmcgrail committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    0c5aab6 View commit details
    Browse the repository at this point in the history

  3. Rename <openssl/time.h> to <openssl/posix_time.h> 

    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)
    @skmcgrail
    Bob Beck authored and skmcgrail committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    cb1b6ad View commit details
    Browse the repository at this point in the history

  4. Enable SSE2 intrinsics on MSVC 

    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)
    @davidben @skmcgrail
    davidben authored and skmcgrail committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    d40bbb4 View commit details
    Browse the repository at this point in the history

  5. Rewrite bn_big_endian_to_words to avoid a GCC false positive 

    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)
    @davidben @skmcgrail
    davidben authored and skmcgrail committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    0ea4425 View commit details
    Browse the repository at this point in the history