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.

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

Replace ZeroizingAllocator #38

Merged
merged 2 commits into from
Dec 6, 2024
Merged

Replace ZeroizingAllocator #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d0dd34
Replace ZeroizingAllocator
dani-garcia Nov 25, 2024
8c809de
Merge branch 'main' into ps/replace-zero-alloc
dani-garcia Dec 2, 2024
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
7 changes: 7 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/bitwarden-crypto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ uniffi = { workspace = true, optional = true }
uuid = { workspace = true }
wasm-bindgen = { workspace = true, optional = true }
zeroize = { version = ">=1.7.0, <2.0", features = ["derive", "aarch64"] }
zeroizing-alloc = ">=0.1.0, <0.2"

[dev-dependencies]
criterion = "0.5.1"
Expand Down
167 changes: 0 additions & 167 deletions crates/bitwarden-crypto/src/allocator.rs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions crates/bitwarden-crypto/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ mod util;
pub use util::{generate_random_alphanumeric, generate_random_bytes, pbkdf2};
mod wordlist;
pub use wordlist::EFF_LONG_WORD_LIST;
mod allocator;
pub use allocator::ZeroizingAllocator;
pub use zeroizing_alloc::ZeroAlloc as ZeroizingAllocator;
Hinton marked this conversation as resolved.
Show resolved Hide resolved

#[cfg(feature = "uniffi")]
uniffi::setup_scaffolding!();
Expand Down
Loading