From fa79f2c087ceb8fc4033fca68e4e7fc825e429dc Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Tue, 11 May 2021 10:40:37 +0200 Subject: [PATCH 1/5] add aarch64-apple-darwin target --- evercrypt-sys/build.rs | 2 +- evercrypt-sys/hacl-star | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/evercrypt-sys/build.rs b/evercrypt-sys/build.rs index 38b512a..5126c51 100644 --- a/evercrypt-sys/build.rs +++ b/evercrypt-sys/build.rs @@ -304,8 +304,8 @@ fn main() { // Make sure we can build for the given OS and architecture. let build_config = match target.as_str() { - // No 32-bit support on any platform for now. "x86_64-apple-darwin" => cfg.set_cross_config_flags(vec!["-target", "x86_64-apple-darwin"]), + "aarch64-apple-darwin" => cfg.set_cross_config_flags(vec!["-target", "aarch64-apple-darwin"]), "i686-unknown-linux-gnu" => cfg.set_cross_config_flags(vec!["-target", "ia32"]), "x86_64-unknown-linux-gnu" => { cfg.set_cross_config_flags(vec!["-target", "x86_64-unknown-linux-gnu"]) diff --git a/evercrypt-sys/hacl-star b/evercrypt-sys/hacl-star index cd7d6a7..74bb574 160000 --- a/evercrypt-sys/hacl-star +++ b/evercrypt-sys/hacl-star @@ -1 +1 @@ -Subproject commit cd7d6a76d8b4c5dec35d76a5b2b7ac07b525ad3b +Subproject commit 74bb574c5ab6b7b396013cbc1d2c106748ffa592 From f895dd7ea81691efeb15b5bc06d97d8e00124fd2 Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Mon, 17 May 2021 09:24:03 +0200 Subject: [PATCH 2/5] ios target --- .github/workflows/evercrypt-rs.yml | 24 +++++++++++++++++++++++- evercrypt-sys/build.rs | 2 ++ evercrypt-sys/hacl-star | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/evercrypt-rs.yml b/.github/workflows/evercrypt-rs.yml index df6a3f5..c0d6eb6 100644 --- a/.github/workflows/evercrypt-rs.yml +++ b/.github/workflows/evercrypt-rs.yml @@ -28,7 +28,29 @@ jobs: - name: Build run: | cd evercrypt-rs - cargo build --verbose --release + cargo build --verbose --tests + cargo build --verbose --release --tests + - name: Apple Silicon Build + if: matrix.os == 'macos-latest' + run: | + sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* + sudo xcode-select -s /Applications/Xcode_12.4.app + cargo build --target aarch64-apple-darwin --tests --verbose --features rust-crypto-aes + cargo build --release --target aarch64-apple-darwin --tests --verbose --features rust-crypto-aes + - name: iOS aarch64 + if: matrix.os == 'macos-latest' + run: | + sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* + sudo xcode-select -s /Applications/Xcode_12.4.app + cargo build --target aarch64-apple-ios --tests --verbose --features rust-crypto-aes + cargo build --release --target aarch64-apple-ios --tests --verbose --features rust-crypto-aes + # - name: iOS x64 simulator + # if: matrix.os == 'macos-latest' + # run: | + # sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* + # sudo xcode-select -s /Applications/Xcode_12.4.app + # cargo build --target x86_64-apple-ios --tests --verbose --features rust-crypto-aes + # cargo build --release --target x86_64-apple-ios --tests --verbose --features rust-crypto-aes - name: Test evercrypt-sys run: | cd evercrypt-sys diff --git a/evercrypt-sys/build.rs b/evercrypt-sys/build.rs index 5126c51..dcdba35 100644 --- a/evercrypt-sys/build.rs +++ b/evercrypt-sys/build.rs @@ -306,6 +306,8 @@ fn main() { let build_config = match target.as_str() { "x86_64-apple-darwin" => cfg.set_cross_config_flags(vec!["-target", "x86_64-apple-darwin"]), "aarch64-apple-darwin" => cfg.set_cross_config_flags(vec!["-target", "aarch64-apple-darwin"]), + "aarch64-apple-ios" => cfg.set_cross_config_flags(vec!["-target", "aarch64-apple-ios"]), + // "x86_64-apple-ios" => cfg.set_cross_config_flags(vec!["-target", "x86_64-apple-ios-simulator"]), "i686-unknown-linux-gnu" => cfg.set_cross_config_flags(vec!["-target", "ia32"]), "x86_64-unknown-linux-gnu" => { cfg.set_cross_config_flags(vec!["-target", "x86_64-unknown-linux-gnu"]) diff --git a/evercrypt-sys/hacl-star b/evercrypt-sys/hacl-star index 74bb574..f322d28 160000 --- a/evercrypt-sys/hacl-star +++ b/evercrypt-sys/hacl-star @@ -1 +1 @@ -Subproject commit 74bb574c5ab6b7b396013cbc1d2c106748ffa592 +Subproject commit f322d2890490acf7b68628e97f82e2ac8d8c536d From 99ac4a5030c431942d192d8c0e1f61e49b6b98df Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Mon, 17 May 2021 16:52:27 +0200 Subject: [PATCH 3/5] Update evercrypt-rs.yml --- .github/workflows/evercrypt-rs.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/evercrypt-rs.yml b/.github/workflows/evercrypt-rs.yml index c0d6eb6..c0f9057 100644 --- a/.github/workflows/evercrypt-rs.yml +++ b/.github/workflows/evercrypt-rs.yml @@ -24,31 +24,29 @@ jobs: - if: matrix.os == 'ubuntu-latest' run: sudo apt -y install pkg-config - if: matrix.os == 'macos-latest' - run: brew install pkg-config + run: | + brew install pkg-config + sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* + sudo xcode-select -s /Applications/Xcode_12.4.app + rustup target install aarch64-apple-darwin + rustup target install aarch64-apple-ios - name: Build run: | cd evercrypt-rs - cargo build --verbose --tests - cargo build --verbose --release --tests + cargo build --verbose - name: Apple Silicon Build if: matrix.os == 'macos-latest' run: | - sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* - sudo xcode-select -s /Applications/Xcode_12.4.app cargo build --target aarch64-apple-darwin --tests --verbose --features rust-crypto-aes cargo build --release --target aarch64-apple-darwin --tests --verbose --features rust-crypto-aes - name: iOS aarch64 if: matrix.os == 'macos-latest' run: | - sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* - sudo xcode-select -s /Applications/Xcode_12.4.app cargo build --target aarch64-apple-ios --tests --verbose --features rust-crypto-aes cargo build --release --target aarch64-apple-ios --tests --verbose --features rust-crypto-aes # - name: iOS x64 simulator # if: matrix.os == 'macos-latest' # run: | - # sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* - # sudo xcode-select -s /Applications/Xcode_12.4.app # cargo build --target x86_64-apple-ios --tests --verbose --features rust-crypto-aes # cargo build --release --target x86_64-apple-ios --tests --verbose --features rust-crypto-aes - name: Test evercrypt-sys @@ -77,6 +75,11 @@ jobs: run: | cd evercrypt-rs cargo test --verbose --all-features + - name: Release (all-features) + run: | + cd evercrypt-rs + cargo clean + cargo test --release --verbose --all-features - name: Benchmark (rust-crypto-aes) run: | cd evercrypt-rs From 2d2c88408b7fc4bbc0951539f55c57f773cb6669 Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Mon, 17 May 2021 20:25:42 +0200 Subject: [PATCH 4/5] disable evercrypt-sys build --- .github/workflows/evercrypt-rs.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/evercrypt-rs.yml b/.github/workflows/evercrypt-rs.yml index c0f9057..058a5e9 100644 --- a/.github/workflows/evercrypt-rs.yml +++ b/.github/workflows/evercrypt-rs.yml @@ -49,10 +49,10 @@ jobs: # run: | # cargo build --target x86_64-apple-ios --tests --verbose --features rust-crypto-aes # cargo build --release --target x86_64-apple-ios --tests --verbose --features rust-crypto-aes - - name: Test evercrypt-sys - run: | - cd evercrypt-sys - cargo test --verbose +# - name: Test evercrypt-sys +# run: | +# cd evercrypt-sys +# cargo test --verbose - if: matrix.os == 'ubuntu-latest' name: Test evercrypt-rs run: | From 047e27ec71a97eb4539cddeb2b0b2c143836a2c1 Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Wed, 19 May 2021 13:40:16 +0200 Subject: [PATCH 5/5] remove x86_64-apple-ios for now --- .github/workflows/evercrypt-rs.yml | 13 +------------ evercrypt-sys/build.rs | 1 - 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/evercrypt-rs.yml b/.github/workflows/evercrypt-rs.yml index 058a5e9..4b6f170 100644 --- a/.github/workflows/evercrypt-rs.yml +++ b/.github/workflows/evercrypt-rs.yml @@ -31,9 +31,7 @@ jobs: rustup target install aarch64-apple-darwin rustup target install aarch64-apple-ios - name: Build - run: | - cd evercrypt-rs - cargo build --verbose + run: cargo build --verbose - name: Apple Silicon Build if: matrix.os == 'macos-latest' run: | @@ -44,15 +42,6 @@ jobs: run: | cargo build --target aarch64-apple-ios --tests --verbose --features rust-crypto-aes cargo build --release --target aarch64-apple-ios --tests --verbose --features rust-crypto-aes - # - name: iOS x64 simulator - # if: matrix.os == 'macos-latest' - # run: | - # cargo build --target x86_64-apple-ios --tests --verbose --features rust-crypto-aes - # cargo build --release --target x86_64-apple-ios --tests --verbose --features rust-crypto-aes -# - name: Test evercrypt-sys -# run: | -# cd evercrypt-sys -# cargo test --verbose - if: matrix.os == 'ubuntu-latest' name: Test evercrypt-rs run: | diff --git a/evercrypt-sys/build.rs b/evercrypt-sys/build.rs index 085d5f2..d05bfd6 100644 --- a/evercrypt-sys/build.rs +++ b/evercrypt-sys/build.rs @@ -307,7 +307,6 @@ fn main() { "x86_64-apple-darwin" => cfg.set_cross_config_flags(vec!["-target", "x86_64-apple-darwin"]), "aarch64-apple-darwin" => cfg.set_cross_config_flags(vec!["-target", "aarch64-apple-darwin"]), "aarch64-apple-ios" => cfg.set_cross_config_flags(vec!["-target", "aarch64-apple-ios"]), - // "x86_64-apple-ios" => cfg.set_cross_config_flags(vec!["-target", "x86_64-apple-ios-simulator"]), "i686-unknown-linux-gnu" => cfg.set_cross_config_flags(vec!["-target", "ia32"]), "x86_64-unknown-linux-gnu" => { cfg.set_cross_config_flags(vec!["-target", "x86_64-unknown-linux-gnu"])