diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 98ab144fa..a719a7b13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -244,14 +244,14 @@ jobs: - name: Install Rust (rustup) run: rustup update stable --no-self-update && rustup default stable shell: bash - - name: Install Clang-12 + - name: Install Clang-14 uses: KyleMayes/install-llvm-action@v1 with: - version: "12.0.0" + version: "14.0.6" directory: ${{ runner.temp }}/llvm - - name: Add clang++-12 link + - name: Add clang++-14 link working-directory: ${{ runner.temp }}/llvm/bin - run: ln -s clang clang++-12 + run: ln -s clang clang++-14 - name: Run tests run: cargo test --features fips - name: Test boring-sys cargo publish (FIPS) @@ -305,14 +305,14 @@ jobs: - name: Install Rust (rustup) run: rustup update stable --no-self-update && rustup default stable && rustup target add ${{ matrix.target }} shell: bash - - name: Install Clang-12 + - name: Install Clang-14 uses: KyleMayes/install-llvm-action@v1 with: - version: "12.0.0" + version: "14.0.6" directory: ${{ runner.temp }}/llvm - - name: Add clang++-12 link + - name: Add clang++-14 link working-directory: ${{ runner.temp }}/llvm/bin - run: ln -s clang clang++-12 + run: ln -s clang clang++-14 - name: Install ${{ matrix.target }} toolchain run: brew tap messense/macos-cross-toolchains && brew install ${{ matrix.target }} - name: Set BORING_BSSL_FIPS_COMPILER_EXTERNAL_TOOLCHAIN diff --git a/boring-sys/build/main.rs b/boring-sys/build/main.rs index b2ed72f65..982856041 100644 --- a/boring-sys/build/main.rs +++ b/boring-sys/build/main.rs @@ -198,6 +198,7 @@ fn get_boringssl_platform_output_path(config: &Config) -> String { fn get_boringssl_cmake_config(config: &Config) -> cmake::Config { let src_path = get_boringssl_source_path(config); let mut boringssl_cmake = cmake::Config::new(src_path); + boringssl_cmake.generator("Ninja"); if config.host == config.target { return boringssl_cmake; @@ -350,9 +351,9 @@ fn verify_fips_clang_version() -> (&'static str, &'static str) { Some(output.lines().next().expect("empty output").to_string()) } - const REQUIRED_CLANG_VERSION: &str = "12.0.0"; + const REQUIRED_CLANG_VERSION: &str = "14.0.6"; for (cc, cxx) in [ - ("clang-12", "clang++-12"), + ("clang-14", "clang++-14"), ("clang", "clang++"), ("cc", "c++"), ] { diff --git a/boring-sys/deps/boringssl-fips b/boring-sys/deps/boringssl-fips index 853ca1ea1..0c6f40132 160000 --- a/boring-sys/deps/boringssl-fips +++ b/boring-sys/deps/boringssl-fips @@ -1 +1 @@ -Subproject commit 853ca1ea1168dff08011e5d42d94609cc0ca2e27 +Subproject commit 0c6f40132b828e92ba365c6b7680e32820c63fa7