Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
92cfabc
aead: require &mut self for seal/open and add TLS AEAD variants
janrueth Jun 25, 2026
c270a40
Semver compat for nonce mutability issue
kornelski Aug 14, 2026
f44b7f6
refresh expired tls test certificates
gumpt Aug 12, 2026
c73f272
update tests for renewed tls fixtures
gumpt Aug 12, 2026
a0c2ff2
Update test cert digests
kornelski Aug 15, 2026
91ca11c
Refresh test certs
kornelski Aug 15, 2026
dbdeb8b
Clippy
kornelski Aug 15, 2026
02c0298
Add native HKDF bindings
punkeel Sep 22, 2026
41655b1
RTG-5132 Bump BoringSSL
bwesterb Aug 20, 2026
d285a1e
RTG-5132 Enable X25519MLKEM768 in FIPS compliance profile
Lekensteyn Aug 28, 2026
672ba86
Update to boringssl 0.20260929.0
Lekensteyn Sep 30, 2026
45512aa
Fix tests failures related to upstream X509_V_FLAG_TRUSTED_FIRST change
Lekensteyn Sep 30, 2026
8a26706
ci: use latest GitHub Actions versions to fix Node.js 20 warnings
Lekensteyn Oct 8, 2026
cdbe9c8
ci: use newer clang version on Windows, fix Test job name
Lekensteyn Oct 8, 2026
09da1de
ci: update to Go 1.27, skip Go installation unless needed
Lekensteyn Oct 8, 2026
9c57211
boring-sys: exclude non-BoringSSL symbols from bindings
Lekensteyn Oct 9, 2026
5d4dd6a
Add X509Ref::check_host_with_flags (fixes #530)
nox Oct 14, 2026
c89f532
Clippy
kornelski Aug 14, 2026
71746e9
ptr casts
kornelski Aug 14, 2026
9ffd5d6
Back-compat shims for v4
kornelski Oct 14, 2026
a46d256
Add action-aware certificate selection callbacks
nox Oct 14, 2026
2bea824
Release 5.3.0
kornelski Oct 14, 2026
f2535a7
Merge tag 'v5.3.0'
jrose-signal Oct 20, 2026
b518db8
Use prettyplease for bindgen formatting
marc-signal Oct 27, 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
59 changes: 22 additions & 37 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
name: rustfmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Install Rustfmt
run: rustup default stable && rustup component add rustfmt
- name: Check formatting
Expand All @@ -34,7 +34,7 @@ jobs:
env:
CARGO_HOME: ${{ github.workspace }}/.cache/cargo
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
submodules: 'recursive'
- name: Install Rust
Expand All @@ -45,7 +45,7 @@ jobs:
run: |
echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
- name: Cache cargo index
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: |
.cache/cargo/registry/index
Expand All @@ -55,12 +55,12 @@ jobs:
- name: Fetch dependencies
run: cargo fetch
- name: Cache target directory
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: target
key: clippy-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
- name: Cache cargo index (save)
uses: actions/cache/save@v4
uses: actions/cache/save@v6
with:
path: |
.cache/cargo/registry/index
Expand Down Expand Up @@ -109,6 +109,7 @@ jobs:
- x86_64-mingw
- i686-msvc
- x86_64-msvc
- x86_64-msvc-static
include:
- check_only: false
- extra_test_args: ''
Expand Down Expand Up @@ -263,7 +264,7 @@ jobs:
CARGO_HOME: ${{ github.workspace }}/.cache/cargo
CARGO_BUILD_BUILD_DIR: ${{ github.workspace }}/.cache/build-dir
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
submodules: 'recursive'
- name: Install Rust (rustup)
Expand All @@ -274,18 +275,10 @@ jobs:
shell: bash
run: |
echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
- name: Install golang
uses: actions/setup-go@v5
with:
go-version: '>=1.22.0'
- name: Install target-specific APT dependencies
if: "matrix.apt_packages != ''"
run: sudo apt update && sudo apt install -y ${{ matrix.apt_packages }}
shell: bash
- name: Install nasm
if: startsWith(matrix.os, 'windows')
run: choco install nasm
shell: cmd
- name: Setup 32-bit MSYS2
if: matrix.thing == 'i686-mingw'
uses: msys2/setup-msys2@v2
Expand All @@ -312,20 +305,14 @@ jobs:
echo >> $GITHUB_ENV BINDGEN_EXTRA_CLANG_ARGS="-mlong-double-64 -I$MSYS_ROOT\\mingw32\\include"
echo >> $GITHUB_ENV LIBRARY_PATH="$MSYS_ROOT\\mingw32\\lib"
echo >> $GITHUB_ENV LDFLAGS="-L$MSYS_ROOT\\mingw32\\lib"
- name: Install LLVM and Clang
if: startsWith(matrix.os, 'windows')
uses: KyleMayes/install-llvm-action@v1
with:
version: "11.0"
directory: ${{ runner.temp }}/llvm
- name: Set LIBCLANG_PATH
if: startsWith(matrix.os, 'windows')
run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
run: echo "LIBCLANG_PATH=C:\Program Files\LLVM\bin" >> $env:GITHUB_ENV
- name: Set Android Linker path
if: endsWith(matrix.thing, '-android')
run: echo "CARGO_TARGET_$(echo ${{ matrix.target }} | tr \\-a-z _A-Z)_LINKER=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/$(echo ${{ matrix.target }} | sed s/armv7/armv7a/)21-clang++" >> "$GITHUB_ENV"
- name: Prepopulate cargo index
uses: actions/cache/restore@v4
uses: actions/cache/restore@v6
with:
path: |
.cache/cargo/registry/index
Expand All @@ -339,7 +326,7 @@ jobs:
# Windows builds are the slowest
- name: Cache deps in Windows tests
if: startsWith(matrix.os, 'windows')
uses: actions/cache/restore@v4
uses: actions/cache/restore@v6
id: test-cache-restore
with:
path: .cache/build-dir
Expand All @@ -352,7 +339,7 @@ jobs:
# By default it'd be saved after later cargo calls, which already invalidated the cache
- name: Cache deps in Windows tests
if: startsWith(matrix.os, 'windows')
uses: actions/cache/save@v4
uses: actions/cache/save@v6
with:
path: .cache/build-dir
key: ${{ steps.test-cache-restore.outputs.cache-primary-key }}
Expand Down Expand Up @@ -381,16 +368,17 @@ jobs:
name: Test FIPS integration
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
submodules: 'recursive'
- name: Install Rust (rustup)
run: rustup update stable --no-self-update && rustup default stable
shell: bash
- name: Install golang
uses: actions/setup-go@v5
uses: actions/setup-go@v7
with:
go-version: '>=1.22.0'
go-version: '>=1.27.0'
cache: false
- name: Run tests
run: cargo test --features fips
- name: Test boring-sys cargo publish (FIPS)
Expand All @@ -410,13 +398,14 @@ jobs:
name: Test BoringSSL upstream test suite
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
submodules: 'recursive'
- name: Install golang
uses: actions/setup-go@v5
uses: actions/setup-go@v7
with:
go-version: '>=1.22.0'
go-version: '>=1.27.0'
cache: false
- name: Install build tools (ninja, cmake)
run: sudo apt-get update && sudo apt-get install -y ninja-build cmake
- name: Apply boring-sys patches
Expand Down Expand Up @@ -447,16 +436,12 @@ jobs:
include:
- target: x86_64-unknown-linux-gnu
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
submodules: 'recursive'
- name: Install Rust (rustup)
run: rustup toolchain install stable --no-self-update --profile minimal --target ${{ matrix.target }} && rustup default stable
shell: bash
- name: Install golang
uses: actions/setup-go@v5
with:
go-version: '>=1.22.0'
- name: Install ${{ matrix.target }} toolchain
run: brew tap messense/macos-cross-toolchains && brew trust messense/macos-cross-toolchains && brew install ${{ matrix.target }}
- name: Set BORING_BSSL_SYSROOT
Expand All @@ -476,7 +461,7 @@ jobs:
env:
CARGO_INCREMENTAL: 1
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
submodules: 'recursive'
- name: Install Rust (rustup)
Expand All @@ -493,4 +478,4 @@ jobs:
- run: cargo test --features rpk,underscore-wildcards
name: Run `rpk,underscore-wildcards` tests
- run: cargo test --features rpk,underscore-wildcards,mlkem,mldsa
name: Run `rpk,underscore-wildcards` tests
name: Run `rpk,underscore-wildcards,mlkem,mldsa` tests
4 changes: 2 additions & 2 deletions .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
name: semgrep-oss
runs-on: ubuntu-slim
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v7
with:
fetch-depth: 1
- id: cache-semgrep
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: ~/.local
key: semgrep-1.160.0-${{ runner.os }}
Expand Down
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ members = [
resolver = "2"

[workspace.package]
version = "5.2.0"
version = "5.3.0"
rust-version = "1.85"
repository = "https://github.com/cloudflare/boring"
edition = "2021"
Expand All @@ -20,11 +20,11 @@ tag-prefix = ""
publish = false

[workspace.dependencies]
boring-sys = { version = "5.2.0", path = "./boring-sys", default-features = false }
boring = { version = "5.2.0", path = "./boring", default-features = false }
tokio-boring = { version = "5.2.0", path = "./tokio-boring", default-features = false }
boring-sys = { version = "5.3.0", path = "./boring-sys", default-features = false }
boring = { version = "5.3.0", path = "./boring", default-features = false }
tokio-boring = { version = "5.3.0", path = "./tokio-boring", default-features = false }

bindgen = { version = "0.72.0", default-features = false, features = ["runtime"] }
bindgen = { version = "0.72.0", default-features = false, features = ["runtime", "prettyplease"] }
bitflags = "2.9"
brotli = "8.0"
bytes = "1"
Expand Down
2 changes: 1 addition & 1 deletion RELEASE_NOTES
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
5.2.0
- 2026-10-14 Add action-aware certificate selection callbacks, including ECH fallback
- 2026-05-21 Export `DEP_BORINGSSL_VERSION_MAJOR` var
- 2026-04-27 Expose DTLS version constants in SslVersion

Expand Down Expand Up @@ -2495,4 +2496,3 @@
- 2011-12-15 Add manifest for rust-pkg.
- 2011-12-15 Initial commit.


10 changes: 6 additions & 4 deletions boring-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ rpk = []
# Require mlkem.h
mlkem = []

# Violate RFC 5280 5.1.2.1 and allow certs with CRL extensions in X.509 version 1.
# Violate RFC 5280 5.1.2.1 and allow extensions on X.509 version 1 CRLs.
# This feature is not guaranteed to be supported in future minor releases.
allow-crl-extensions-bad-version = []

Expand All @@ -80,9 +80,11 @@ underscore-wildcards = []
# 19 (see `include/openssl/base.h`) changed `enforce_rsa_key_usage` to
# `true`, making a client-side RSA leaf whose keyUsage does not include the
# bit required by the negotiated cipher suite a fatal handshake error
# (KEY_USAGE_BIT_INCORRECT). Enabling this feature applies a build-time
# patch that sets the default back to `false`, so RSA keyUsage mismatches
# are non-fatal. Non-RSA keyUsage enforcement is unaffected.
# (KEY_USAGE_BIT_INCORRECT). Upstream later removed the
# `enforce_rsa_key_usage` config field entirely, so enabling this feature
# applies a build-time patch that restores the conditional the flag used to
# guard, hardwired to the relaxed behaviour, making RSA keyUsage mismatches
# non-fatal again. Non-RSA keyUsage enforcement is unaffected.
relax-cert-validation = []

[build-dependencies]
Expand Down
5 changes: 3 additions & 2 deletions boring-sys/build/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ fn ensure_patches_applied(config: &Config) -> io::Result<()> {

if config.features.allow_crl_extensions_bad_version {
println!(
"cargo:warning=applying the patch for disabling cert version \
"cargo:warning=applying the patch for disabling CRL version \
validation for extensions"
);
apply_patch(config, "bad-cert-verification.patch")?;
Expand Down Expand Up @@ -786,7 +786,8 @@ fn generate_bindings(config: &Config) -> Result<PathBuf, Box<dyn std::error::Err
.opaque_type("FILE")
.clang_args(get_extra_clang_args_for_bindgen(config))
.clang_arg("-I")
.clang_arg(include_path.display().to_string());
.clang_arg(include_path.display().to_string())
.formatter(bindgen::Formatter::Prettyplease);

if let Some(sysroot) = &config.env.sysroot {
builder = builder
Expand Down
2 changes: 1 addition & 1 deletion boring-sys/deps/boringssl
Submodule boringssl updated 1106 files
39 changes: 18 additions & 21 deletions boring-sys/patches/bad-cert-verification.patch
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
From fe0b517fa34063990a83268edf7a3cd9ba0b2362 Mon Sep 17 00:00:00 2001
From: Yuchen Wu <yuchen@cloudflare.com>
Date: Mon, 13 Mar 2023 14:28:10 -0700
Subject: [PATCH] PINGORA-474: disable cert version check for openssl
Subject: [PATCH] PINGORA-474: disable CRL version check for openssl
compatibility

Some free customers use badly crafted cert (with verification off).
Openssl allows these cert but boring does't.
Some free customers use badly crafted CRLs (with verification off).
Openssl allows these CRLs but boring does't.
---
crypto/x509/x509_test.cc | 4 ++--
crypto/x509/x509_test.cc | 4 +---
crypto/x509/x_crl.cc | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/x509/x509_test.cc b/crypto/x509/x509_test.cc
index aa5bfda5d..15c1c73ee 100644
index f98aa26cc..c881a4199 100644
--- a/crypto/x509/x509_test.cc
+++ b/crypto/x509/x509_test.cc
@@ -3859,8 +3859,8 @@ TEST(X509Test, InvalidVersion) {
EXPECT_FALSE(CertFromPEM(kNegativeVersionPEM));
EXPECT_FALSE(CertFromPEM(kFutureVersionPEM));
EXPECT_FALSE(CertFromPEM(kOverflowVersionPEM));
- EXPECT_FALSE(CertFromPEM(kV1WithExtensionsPEM));
- EXPECT_FALSE(CertFromPEM(kV2WithExtensionsPEM));
+ ASSERT_TRUE(CertFromPEM(kV1WithExtensionsPEM));
+ ASSERT_TRUE(CertFromPEM(kV2WithExtensionsPEM));
EXPECT_FALSE(CertFromPEM(kV1WithIssuerUniqueIDPEM));
@@ -4473,9 +4473,7 @@ TEST(X509Test, InvalidVersion) {
EXPECT_TRUE(ErrorsAreAndClear({{ERR_LIB_ASN1, ASN1_R_DECODE_ERROR}}));
EXPECT_FALSE(CertFromPEM(kV1WithSubjectUniqueIDPEM));
EXPECT_FALSE(CRLFromPEM(kV1CRLWithExtensionsPEM));
EXPECT_TRUE(ErrorsAreAndClear({{ERR_LIB_ASN1, ASN1_R_DECODE_ERROR}}));
- EXPECT_FALSE(CRLFromPEM(kV1CRLWithExtensionsPEM));
- EXPECT_TRUE(
- ErrorsAreAndClear({{ERR_LIB_X509, X509_R_INVALID_FIELD_FOR_VERSION}}));
+ EXPECT_TRUE(CRLFromPEM(kV1CRLWithExtensionsPEM));
EXPECT_FALSE(CRLFromPEM(kV1CRLWithEntryExtensionsPEM));
EXPECT_TRUE(ErrorsAreAndClear({{ERR_LIB_X509, X509_R_INVALID_VERSION}}));
EXPECT_FALSE(CRLFromPEM(kV3CRLPEM));
diff --git a/crypto/x509/x_crl.cc b/crypto/x509/x_crl.cc
index 1d22ed638..4f50bc03f 100644
index d30c17253..5af682ca9 100644
--- a/crypto/x509/x_crl.cc
+++ b/crypto/x509/x_crl.cc
@@ -148,10 +148,12 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
@@ -157,10 +157,12 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
}

// Per RFC 5280, section 5.1.2.1, extensions require v2.
Expand All @@ -43,6 +43,3 @@ index 1d22ed638..4f50bc03f 100644

// Extensions is a SEQUENCE SIZE (1..MAX), so it cannot be empty. An empty
// extensions list is encoded by omitting the OPTIONAL field.
--
2.39.5

Loading
Loading