Skip to content
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.

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

feat: support zeroize codegen #100

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ subtle = { version = "2.2.1", default-features = false, features = ["i128"] }
[dev-dependencies]
blake2b_simd = "1"
rand = "0.8"
zeroize = { version = "1", default-features = false }

[features]
default = ["bits", "std"]
Expand All @@ -32,7 +33,8 @@ derive = ["byteorder", "ff_derive"]
std = ["alloc"]
# with MSRV 1.60 this could be merged into bits with ff_derive?/bits
# see PR#72 for more information.
derive_bits = ["bits", "ff_derive/bits"]
derive_bits = ["bits", "derive", "ff_derive/bits"]
test_derive_zeroize = ["derive", "ff_derive/zeroize"]

[[test]]
name = "derive"
Expand Down
2 changes: 2 additions & 0 deletions ff_derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ edition = "2021"
[features]
# enabled when generating bitvec code utilizing the version of ff's bitvec
bits = []
# enabled when generating zeroize bindings
zeroize = []

[lib]
proc-macro = true
Expand Down
19 changes: 19 additions & 0 deletions ff_derive/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,14 @@ fn prime_field_repr_impl(
) -> proc_macro2::TokenStream {
let repr_iter_be = endianness.iter_be();

let prime_field_repr_zeroize_impl = if cfg!(feature = "zeroize") {
Some(quote! {
impl ::zeroize::DefaultIsZeroes for #repr {}
})
} else {
None
Daniel-Aaron-Bloom marked this conversation as resolved.
Show resolved Hide resolved
};

quote! {
#[derive(Copy, Clone)]
pub struct #repr(pub [u8; #bytes]);
Expand Down Expand Up @@ -386,6 +394,8 @@ fn prime_field_repr_impl(
&mut self.0
}
}

#prime_field_repr_zeroize_impl
}
}

Expand Down Expand Up @@ -942,6 +952,14 @@ fn prime_field_impl(
}
};

let prime_field_zeroize_impl = if cfg!(feature = "zeroize") {
Some(quote! {
impl ::zeroize::DefaultIsZeroes for #name {}
})
} else {
None
};

let top_limb_index = limbs - 1;

quote! {
Expand Down Expand Up @@ -1261,6 +1279,7 @@ fn prime_field_impl(
}

#prime_field_bits_impl
#prime_field_zeroize_impl

impl ::ff::Field for #name {
const ZERO: Self = #name([0; #limbs]);
Expand Down
17 changes: 17 additions & 0 deletions tests/derive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,20 @@ fn batch_inversion() {
}
}
}

#[cfg(feature = "test_derive_zeroize")]
#[test]
fn zeroize() {
use ff::{Field, PrimeField};
use rand::rngs::OsRng;
use zeroize::Zeroize;

let mut f = Bls381K12Scalar::random(OsRng);
let mut r = f.to_repr();

f.zeroize();
assert_eq!(f, Bls381K12Scalar::ZERO);

r.zeroize();
assert_eq!(r, Default::default());
}