Skip to content

Commit dac3653

Browse files
pyca-boringbot[bot]pyca-boringbot[bot]
andauthored
Bump BoringSSL, OpenSSL, AWS-LC in CI (#13123)
Co-authored-by: pyca-boringbot[bot] <pyca-boringbot[bot][email protected]>
1 parent ab1a3bc commit dac3653

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ jobs:
4040
- {VERSION: "3.13", NOXSESSION: "tests-ssh", OPENSSL: {TYPE: "openssl", VERSION: "3.5.0"}}
4141
- {VERSION: "3.13", NOXSESSION: "rust,tests", OPENSSL: {TYPE: "libressl", VERSION: "4.0.0"}}
4242
- {VERSION: "3.13", NOXSESSION: "rust,tests", OPENSSL: {TYPE: "libressl", VERSION: "4.1.0"}}
43-
# Latest commit on the BoringSSL main branch, as of Jun 26, 2025.
44-
- {VERSION: "3.13", NOXSESSION: "rust,tests", OPENSSL: {TYPE: "boringssl", VERSION: "78b48c1f2a973ff0a4ed18b9618d533101bd4144"}}
43+
# Latest commit on the BoringSSL main branch, as of Jul 01, 2025.
44+
- {VERSION: "3.13", NOXSESSION: "rust,tests", OPENSSL: {TYPE: "boringssl", VERSION: "db421c2d800f6d2e164366af6a28bc52b2dafbf7"}}
4545
# Latest tag of AWS-LC main branch, as of Jun 28, 2025.
4646
- {VERSION: "3.13", NOXSESSION: "rust,tests", OPENSSL: {TYPE: "aws-lc", VERSION: "v1.54.0"}}
47-
# Latest commit on the OpenSSL master branch, as of Jun 27, 2025.
48-
- {VERSION: "3.13", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "7bdc0d13d2b9ce1c1d0ec1f89dacc16e5d045314"}}
47+
# Latest commit on the OpenSSL master branch, as of Jul 01, 2025.
48+
- {VERSION: "3.13", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "b3161bd9a9329be3d6bf6b29a06835e2721898bb"}}
4949
# Builds with various Rust versions. Includes MSRV and next
5050
# potential future MSRV.
5151
# - 1.77: offset_of! in std (for pyo3), c"str" literals (replace cstr_from_literal)

src/rust/src/backend/rsa.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,8 @@ fn setup_signature_ctx(
263263
),
264264
));
265265
}
266+
// AUTO and MAXIMUM are the same in OpenSSL.
267+
ctx.set_rsa_pss_saltlen(openssl::sign::RsaPssSaltlen::MAXIMUM_LENGTH)?;
266268
} else {
267269
ctx.set_rsa_pss_saltlen(openssl::sign::RsaPssSaltlen::custom(salt.extract::<i32>()?))?;
268270
};

src/rust/src/buf.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,8 @@ fn _extract_buffer_length<'p>(
5050
) -> pyo3::PyResult<(pyo3::Bound<'p, pyo3::PyAny>, usize, usize)> {
5151
let py = pyobj.py();
5252
let bufobj = if mutable {
53-
let kwargs = pyo3::types::IntoPyDict::into_py_dict(
54-
[(pyo3::intern!(py, "require_writable"), true)],
55-
py,
56-
)?;
53+
let kwargs = [(pyo3::intern!(py, "require_writable"), true)];
54+
let kwargs = pyo3::types::IntoPyDict::into_py_dict(kwargs, py)?;
5755
types::FFI_FROM_BUFFER
5856
.get(py)?
5957
.call((pyobj,), Some(&kwargs))

0 commit comments

Comments
 (0)