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

Jump to bottom

Rust-themis: Allocate with try_reserve #1014

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Rust-themis: Allocate with try_reserve #1014

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b63e01c
rust-themis: Impl From<TryReserveError> for Error
G1gg1L3s Jun 27, 2023
33204a9
rust-themis: Use try_reserve instead of reserve
G1gg1L3s Jun 27, 2023
1dee404
rust-themis: Run the skipped tests on the 32bit
G1gg1L3s Jun 27, 2023
24d4fd0
rust-themis: with_capacity -> try_reserve
G1gg1L3s Jun 27, 2023
a0b709f
rust: Add a test for checking 4GB allocation
G1gg1L3s Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/wrappers/themis/rust/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,14 @@ impl fmt::Display for Error {
}
}

impl From<std::collections::TryReserveError> for Error {
fn from(_: std::collections::TryReserveError) -> Self {
Self {
kind: ErrorKind::NoMemory,
}
}
}

/// A list of Themis error categories.
///
/// This enumeration is used by [`Error`] type, returned by most Themis functions. Some error kinds
Expand Down
8 changes: 4 additions & 4 deletions src/wrappers/themis/rust/src/keygen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ fn try_gen_rsa_key_pair() -> Result<RsaKeyPair> {
}
}

private_key.reserve(private_key_len);
public_key.reserve(public_key_len);
private_key.try_reserve(private_key_len)?;
public_key.try_reserve(public_key_len)?;

unsafe {
let status = themis_gen_rsa_key_pair(
Expand Down Expand Up @@ -149,8 +149,8 @@ fn try_gen_ec_key_pair() -> Result<EcdsaKeyPair> {
}
}

private_key.reserve(private_key_len);
public_key.reserve(public_key_len);
private_key.try_reserve(private_key_len)?;
public_key.try_reserve(public_key_len)?;

unsafe {
let status = themis_gen_ec_key_pair(
Expand Down
2 changes: 1 addition & 1 deletion src/wrappers/themis/rust/src/keys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ impl SymmetricKey {
}
}

key.reserve(key_len);
key.try_reserve(key_len)?;

unsafe {
let status = themis_gen_sym_key(key.as_mut_ptr(), &mut key_len);
Expand Down
18 changes: 9 additions & 9 deletions src/wrappers/themis/rust/src/secure_cell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@ fn encrypt_seal(master_key: &[u8], user_context: &[u8], message: &[u8]) -> Resul
}
}

encrypted_message.reserve(encrypted_message_len);
encrypted_message.try_reserve(encrypted_message_len)?;

unsafe {
let status = themis_secure_cell_encrypt_seal(
Expand Down Expand Up @@ -985,7 +985,7 @@ fn decrypt_seal(master_key: &[u8], user_context: &[u8], message: &[u8]) -> Resul
}
}

decrypted_message.reserve(decrypted_message_len);
decrypted_message.try_reserve(decrypted_message_len)?;

unsafe {
let status = themis_secure_cell_decrypt_seal(
Expand Down Expand Up @@ -1039,7 +1039,7 @@ fn encrypt_seal_with_passphrase(
}
}

encrypted_message.reserve(encrypted_message_len);
encrypted_message.try_reserve(encrypted_message_len)?;

unsafe {
let status = themis_secure_cell_encrypt_seal_with_passphrase(
Expand Down Expand Up @@ -1093,7 +1093,7 @@ fn decrypt_seal_with_passphrase(
}
}

decrypted_message.reserve(decrypted_message_len);
decrypted_message.try_reserve(decrypted_message_len)?;

unsafe {
let status = themis_secure_cell_decrypt_seal_with_passphrase(
Expand Down Expand Up @@ -1549,8 +1549,8 @@ fn encrypt_token_protect(
}
}

token.reserve(token_len);
encrypted_message.reserve(encrypted_message_len);
token.try_reserve(token_len)?;
encrypted_message.try_reserve(encrypted_message_len)?;

unsafe {
let status = themis_secure_cell_encrypt_token_protect(
Expand Down Expand Up @@ -1612,7 +1612,7 @@ fn decrypt_token_protect(
}
}

decrypted_message.reserve(decrypted_message_len);
decrypted_message.try_reserve(decrypted_message_len)?;

unsafe {
let status = themis_secure_cell_decrypt_token_protect(
Expand Down Expand Up @@ -1866,7 +1866,7 @@ fn encrypt_context_imprint(master_key: &[u8], message: &[u8], context: &[u8]) ->
}
}

encrypted_message.reserve(encrypted_message_len);
encrypted_message.try_reserve(encrypted_message_len)?;

unsafe {
let status = themis_secure_cell_encrypt_context_imprint(
Expand Down Expand Up @@ -1916,7 +1916,7 @@ fn decrypt_context_imprint(master_key: &[u8], message: &[u8], context: &[u8]) ->
}
}

decrypted_message.reserve(decrypted_message_len);
decrypted_message.try_reserve(decrypted_message_len)?;

unsafe {
let status = themis_secure_cell_decrypt_context_imprint(
Expand Down
4 changes: 2 additions & 2 deletions src/wrappers/themis/rust/src/secure_comparator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ impl SecureComparator {
}
}

compare_data.reserve(compare_data_len);
compare_data.try_reserve(compare_data_len)?;

unsafe {
let status = secure_comparator_begin_compare(
Expand Down Expand Up @@ -327,7 +327,7 @@ impl SecureComparator {
}
}

compare_data.reserve(compare_data_len);
compare_data.try_reserve(compare_data_len)?;

unsafe {
let status = secure_comparator_proceed_compare(
Expand Down
8 changes: 4 additions & 4 deletions src/wrappers/themis/rust/src/secure_message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ impl SecureMessage {
}
}

encrypted.reserve(encrypted_len);
encrypted.try_reserve(encrypted_len)?;

unsafe {
let status = themis_secure_message_encrypt(
Expand Down Expand Up @@ -215,7 +215,7 @@ impl SecureMessage {
}
}

decrypted.reserve(decrypted_len);
decrypted.try_reserve(decrypted_len)?;

unsafe {
let status = themis_secure_message_decrypt(
Expand Down Expand Up @@ -349,7 +349,7 @@ impl SecureSign {
}
}

signed.reserve(signed_len);
signed.try_reserve(signed_len)?;

unsafe {
let status = themis_secure_message_sign(
Expand Down Expand Up @@ -477,7 +477,7 @@ impl SecureVerify {
}
}

original.reserve(original_len);
original.try_reserve(original_len)?;

unsafe {
let status = themis_secure_message_verify(
Expand Down
13 changes: 7 additions & 6 deletions src/wrappers/themis/rust/src/secure_session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ impl SecureSession {
}
}

id.reserve(id_len);
id.try_reserve(id_len)?;

unsafe {
let status = secure_session_get_remote_id(self.session, id.as_mut_ptr(), &mut id_len);
Expand Down Expand Up @@ -570,7 +570,8 @@ impl SecureSession {
/// [`negotiate`]: struct.SecureSession.html#method.negotiate
/// [`receive_data`]: trait.SecureSessionTransport.html#method.receive_data
pub fn receive(&mut self, max_len: usize) -> Result<Vec<u8>> {
let mut message = Vec::with_capacity(max_len);
let mut message = Vec::new();
message.try_reserve(max_len)?;

unsafe {
let length = secure_session_receive(
Expand Down Expand Up @@ -628,7 +629,7 @@ impl SecureSession {
}
}

output.reserve(output_len);
output.try_reserve(output_len)?;

unsafe {
let status = secure_session_generate_connect_request(
Expand Down Expand Up @@ -681,7 +682,7 @@ impl SecureSession {
}
}

message.reserve(message_len);
message.try_reserve(message_len)?;

unsafe {
let status = secure_session_unwrap(
Expand Down Expand Up @@ -736,7 +737,7 @@ impl SecureSession {
}
}

wrapped.reserve(wrapped_len);
wrapped.try_reserve(wrapped_len)?;

unsafe {
let status = secure_session_wrap(
Expand Down Expand Up @@ -787,7 +788,7 @@ impl SecureSession {
}
}

message.reserve(message_len);
message.try_reserve(message_len)?;

unsafe {
let status = secure_session_unwrap(
Expand Down
10 changes: 0 additions & 10 deletions tests/rust/secure_cell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,11 +760,6 @@ mod token_protect {
}

#[test]
// FIXME(ilammy, 2020-05-25): avoid capacity allocation panics (T1649)
// This tests panics on 32-bit architectures due to size overflow.
// The implementation needs to use Vec::try_reserve instead of Vec::reserve
// when it becomes available in stable Rust.
#[cfg_attr(target_pointer_width = "32", ignore)]
fn detects_corrupted_token() {
let cell = SecureCell::with_key(SymmetricKey::new())
.unwrap()
Expand Down Expand Up @@ -817,11 +812,6 @@ mod token_protect {
}

#[test]
// FIXME(ilammy, 2020-05-25): avoid capacity allocation panics (T1649)
// This tests panics on 32-bit architectures due to size overflow.
// The implementation needs to use Vec::try_reserve instead of Vec::reserve
// when it becomes available in stable Rust.
#[cfg_attr(target_pointer_width = "32", ignore)]
fn detects_data_token_swap() {
let cell = SecureCell::with_key(SymmetricKey::new())
.unwrap()
Expand Down