Skip to content

Fix entropy source selection for Apple cross-compilation targets #3113

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

Merged
justsmth merged 3 commits into from
Mar 26, 2026
Merged

Fix entropy source selection for Apple cross-compilation targets #3113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
238e531
Fix entropy source selection for Apple cross-compilation targets
justsmth Mar 20, 2026
23af6b2
Add CI job
justsmth Mar 20, 2026
102bf44
Per PR feedback; ensure CI uses Homebrew clang
justsmth Mar 23, 2026
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
29 changes: 29 additions & 0 deletions .github/workflows/aws-lc-rs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,35 @@ jobs:
cargo test -p aws-lc-sys
cargo test -p aws-lc-rs

# iOS cross-compilation build test (aarch64-apple-ios)
aws-lc-rs-ios-aarch64:
if: github.repository_owner == 'aws'
name: aws-lc-rs iOS aarch64 cross-compilation
runs-on: macos-14
steps:
- uses: actions/checkout@v4
with:
repository: aws/aws-lc-rs
path: ./aws-lc-rs
submodules: 'recursive'
- name: Remove aws-lc submodule from crate directory
working-directory: ./aws-lc-rs/aws-lc-sys
shell: bash
run: rm -rf aws-lc
- uses: actions/checkout@v4
with:
path: ./aws-lc-rs/aws-lc-sys/aws-lc
- run: brew install llvm
- uses: dtolnay/rust-toolchain@stable
with:
target: aarch64-apple-ios
- name: Build for aarch64-apple-ios
working-directory: ./aws-lc-rs
env:
CC: /opt/homebrew/opt/llvm/bin/clang
CXX: /opt/homebrew/opt/llvm/bin/clang++
run: cargo build -p aws-lc-rs --target aarch64-apple-ios --features bindgen

# Full bindings pre-generation test on Windows (x86_64-pc-windows-msvc)
aws-lc-rs-windows:
if: github.repository_owner == 'aws'
Expand Down
4 changes: 3 additions & 1 deletion crypto/rand_extra/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
defined(OPENSSL_SOLARIS) || defined(OPENSSL_WASM) || \
(defined(OPENSSL_LINUX) && !defined(HAVE_LINUX_RANDOM_H))
#define OPENSSL_RAND_GETENTROPY
#elif defined(OPENSSL_IOS)
// OPENSSL_APPLE is always defined when OPENSSL_MACOS is defined, so this
// branch must come after the OPENSSL_MACOS branch above.
#elif defined(OPENSSL_APPLE)
Comment thread
justsmth marked this conversation as resolved.
#define OPENSSL_RAND_CCRANDOMGENERATEBYTES
#else
#define OPENSSL_RAND_URANDOM
Expand Down
Loading