From b52e6f4a36fa497e29ca3debd752ce865aaabb93 Mon Sep 17 00:00:00 2001 From: jrconlin Date: Fri, 27 Mar 2026 14:23:02 -0700 Subject: [PATCH 1/4] chore: Updates for 2026-03 Issue: PUSH-681 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f807536..93df7c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ lazy_static = { version = "1.5", optional = true } once_cell = "1.21" openssl = { version = "0.10", optional = true } serde = { version = "1.0", features = ["derive"], optional = true } -sha2 = { version = "0.10", optional = true } +sha2 = { version = "0.10", optional = true } # blocked by hkdf 0.12 [features] default = ["backend-openssl", "serializable-keys"] From cd6f9fac64b12998ea06fef2bdec028c7fc41ee8 Mon Sep 17 00:00:00 2001 From: jrconlin Date: Fri, 27 Mar 2026 14:30:46 -0700 Subject: [PATCH 2/4] f clippy/fmt --- src/aes128gcm.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/aes128gcm.rs b/src/aes128gcm.rs index 41b112b..5d3ebbf 100644 --- a/src/aes128gcm.rs +++ b/src/aes128gcm.rs @@ -378,7 +378,7 @@ fn split_into_records( // Ensure we have enough padding to give at least one byte of it to each record. // This is the only reason why we might expand the padding beyond what was requested. let mut min_num_records = plaintext.len() / (rs - 1); - if plaintext.len() % (rs - 1) != 0 { + if !plaintext.len().is_multiple_of(rs - 1) { min_num_records += 1; } let pad_length = std::cmp::max(pad_length, min_num_records); @@ -482,7 +482,7 @@ impl<'a> Iterator for PlaintextRecordIterator<'a> { // The extra plaintext must be distributed as evenly as possible // amongst all but the final record. let mut extra_share = self.extra_plaintext / (records_remaining - 1); - if self.extra_plaintext % (records_remaining - 1) != 0 { + if !self.extra_plaintext.is_multiple_of(records_remaining - 1) { extra_share += 1; } plaintext_share += extra_share; From 1425ef55b33cbf360cd8f3a1746b9731f4693854 Mon Sep 17 00:00:00 2001 From: jrconlin Date: Fri, 27 Mar 2026 14:31:46 -0700 Subject: [PATCH 3/4] f update edition --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 93df7c9..4b2caa3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ authors = [ "JR Conlin ", ] license = "MPL-2.0" -edition = "2021" +edition = "2024" repository = "https://github.com/mozilla/rust-ece" description = "Encrypted Content-Encoding for HTTP Rust implementation." keywords = ["http-ece", "web-push"] From f3943c0a73203dd8385621249a02ce5a19ea265c Mon Sep 17 00:00:00 2001 From: jrconlin Date: Fri, 27 Mar 2026 14:34:30 -0700 Subject: [PATCH 4/4] f update config --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 01d9bff..ae1f948 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ commands: jobs: Check Rust formatting: docker: - - image: circleci/rust:latest + - image: rust:latest auth: username: $DOCKER_USER password: $DOCKER_PASS @@ -41,7 +41,7 @@ jobs: - run: cargo fmt -- --check Rust tests - stable: docker: - - image: circleci/rust:latest + - image: rust:latest auth: username: $DOCKER_USER password: $DOCKER_PASS @@ -50,7 +50,7 @@ jobs: - rust-tests Rust tests - beta: docker: - - image: circleci/rust:latest + - image: rust:latest auth: username: $DOCKER_USER password: $DOCKER_PASS