Skip to content

Add SHA3 private attribute parity to hashlib hash objects #7134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 1 commit into from
Feb 14, 2026
Merged

Add SHA3 private attribute parity to hashlib hash objects #7134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions Lib/test/test_hashlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,6 @@ def check_sha3(self, name, capacity, rate, suffix):
self.assertEqual(m._rate_bits, rate)
self.assertEqual(m._suffix, suffix)

# TODO: RUSTPYTHON
@unittest.expectedFailure
@requires_sha3
def test_extra_sha3(self):
self.check_sha3('sha3_224', 448, 1152, b'\x06')
Expand Down
74 changes: 74 additions & 0 deletions crates/stdlib/src/hashlib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,28 @@ pub mod _hashlib {
}
}

const KECCAK_WIDTH_BITS: usize = 1600;

fn keccak_suffix(name: &str) -> Option<u8> {
match name {
"sha3_224" | "sha3_256" | "sha3_384" | "sha3_512" => Some(0x06),
"shake_128" | "shake_256" => Some(0x1f),
_ => None,
}
}

fn keccak_rate_bits(name: &str, block_size: usize) -> Option<usize> {
keccak_suffix(name).map(|_| block_size * 8)
}

fn keccak_capacity_bits(name: &str, block_size: usize) -> Option<usize> {
keccak_rate_bits(name, block_size).map(|rate| KECCAK_WIDTH_BITS - rate)
}

fn missing_hash_attribute<T>(vm: &VirtualMachine, class_name: &str, attr: &str) -> PyResult<T> {
Err(vm.new_attribute_error(format!("'{class_name}' object has no attribute '{attr}'")))
}

#[derive(FromArgs)]
#[allow(unused)]
struct XofDigestArgs {
Expand Down Expand Up @@ -132,6 +154,32 @@ pub mod _hashlib {
self.ctx.read().block_size()
}

#[pygetset]
fn _capacity_bits(&self, vm: &VirtualMachine) -> PyResult<usize> {
let block_size = self.ctx.read().block_size();
match keccak_capacity_bits(&self.name, block_size) {
Some(capacity) => Ok(capacity),
None => missing_hash_attribute(vm, "HASH", "_capacity_bits"),
}
}

#[pygetset]
fn _rate_bits(&self, vm: &VirtualMachine) -> PyResult<usize> {
let block_size = self.ctx.read().block_size();
match keccak_rate_bits(&self.name, block_size) {
Some(rate) => Ok(rate),
None => missing_hash_attribute(vm, "HASH", "_rate_bits"),
}
}

#[pygetset]
fn _suffix(&self, vm: &VirtualMachine) -> PyResult<PyBytes> {
match keccak_suffix(&self.name) {
Some(suffix) => Ok(vec![suffix].into()),
None => missing_hash_attribute(vm, "HASH", "_suffix"),
}
}

#[pymethod]
fn update(&self, data: ArgBytesLike) {
data.with_ref(|bytes| self.ctx.write().update(bytes));
Expand Down Expand Up @@ -205,6 +253,32 @@ pub mod _hashlib {
self.ctx.read().block_size()
}

#[pygetset]
fn _capacity_bits(&self, vm: &VirtualMachine) -> PyResult<usize> {
let block_size = self.ctx.read().block_size();
match keccak_capacity_bits(&self.name, block_size) {
Some(capacity) => Ok(capacity),
None => missing_hash_attribute(vm, "HASHXOF", "_capacity_bits"),
}
}

#[pygetset]
fn _rate_bits(&self, vm: &VirtualMachine) -> PyResult<usize> {
let block_size = self.ctx.read().block_size();
match keccak_rate_bits(&self.name, block_size) {
Some(rate) => Ok(rate),
None => missing_hash_attribute(vm, "HASHXOF", "_rate_bits"),
}
}

#[pygetset]
fn _suffix(&self, vm: &VirtualMachine) -> PyResult<PyBytes> {
match keccak_suffix(&self.name) {
Some(suffix) => Ok(vec![suffix].into()),
None => missing_hash_attribute(vm, "HASHXOF", "_suffix"),
}
}

#[pymethod]
fn update(&self, data: ArgBytesLike) {
data.with_ref(|bytes| self.ctx.write().update(bytes));
Expand Down
Loading