Skip to content

Rust wrapper: sha: free before re-initializing SHA structs #11503

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

Open
holtrop-wolfssl wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −0
Open

Rust wrapper: sha: free before re-initializing SHA structs #11503

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
33 changes: 33 additions & 0 deletions wrapper/rust/wolfssl-wolfcrypt/src/sha.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ impl SHA {
Some(dev_id) => dev_id,
None => sys::INVALID_DEVID,
};
// Free any resources held by a previous initialization before
// re-initializing.
unsafe { sys::wc_ShaFree(&mut self.wc_sha); }
let rc = unsafe { sys::wc_InitSha_ex(&mut self.wc_sha, heap, dev_id) };
if rc != 0 {
return Err(rc);
Expand Down Expand Up @@ -355,6 +358,9 @@ impl SHA224 {
Some(dev_id) => dev_id,
None => sys::INVALID_DEVID,
};
// Free any resources held by a previous initialization before
// re-initializing.
unsafe { sys::wc_Sha224Free(&mut self.wc_sha224); }
let rc = unsafe { sys::wc_InitSha224_ex(&mut self.wc_sha224, heap, dev_id) };
if rc != 0 {
return Err(rc);
Expand Down Expand Up @@ -566,6 +572,9 @@ impl SHA256 {
Some(dev_id) => dev_id,
None => sys::INVALID_DEVID,
};
// Free any resources held by a previous initialization before
// re-initializing.
unsafe { sys::wc_Sha256Free(&mut self.wc_sha256); }
let rc = unsafe { sys::wc_InitSha256_ex(&mut self.wc_sha256, heap, dev_id) };
if rc != 0 {
return Err(rc);
Expand Down Expand Up @@ -799,6 +808,9 @@ impl SHA384 {
Some(dev_id) => dev_id,
None => sys::INVALID_DEVID,
};
// Free any resources held by a previous initialization before
// re-initializing.
unsafe { sys::wc_Sha384Free(&mut self.wc_sha384); }
let rc = unsafe { sys::wc_InitSha384_ex(&mut self.wc_sha384, heap, dev_id) };
if rc != 0 {
return Err(rc);
Expand Down Expand Up @@ -1032,6 +1044,9 @@ impl SHA512 {
Some(dev_id) => dev_id,
None => sys::INVALID_DEVID,
};
// Free any resources held by a previous initialization before
// re-initializing.
unsafe { sys::wc_Sha512Free(&mut self.wc_sha512); }
let rc = unsafe { sys::wc_InitSha512_ex(&mut self.wc_sha512, heap, dev_id) };
if rc != 0 {
return Err(rc);
Expand Down Expand Up @@ -1243,6 +1258,9 @@ impl SHA3_224 {
Some(dev_id) => dev_id,
None => sys::INVALID_DEVID,
};
// Free any resources held by a previous initialization before
// re-initializing.
unsafe { sys::wc_Sha3_224_Free(&mut self.wc_sha3); }
let rc = unsafe { sys::wc_InitSha3_224(&mut self.wc_sha3, heap, dev_id) };
if rc != 0 {
return Err(rc);
Expand Down Expand Up @@ -1454,6 +1472,9 @@ impl SHA3_256 {
Some(dev_id) => dev_id,
None => sys::INVALID_DEVID,
};
// Free any resources held by a previous initialization before
// re-initializing.
unsafe { sys::wc_Sha3_256_Free(&mut self.wc_sha3); }
let rc = unsafe { sys::wc_InitSha3_256(&mut self.wc_sha3, heap, dev_id) };
if rc != 0 {
return Err(rc);
Expand Down Expand Up @@ -1665,6 +1686,9 @@ impl SHA3_384 {
Some(dev_id) => dev_id,
None => sys::INVALID_DEVID,
};
// Free any resources held by a previous initialization before
// re-initializing.
unsafe { sys::wc_Sha3_384_Free(&mut self.wc_sha3); }
let rc = unsafe { sys::wc_InitSha3_384(&mut self.wc_sha3, heap, dev_id) };
if rc != 0 {
return Err(rc);
Expand Down Expand Up @@ -1876,6 +1900,9 @@ impl SHA3_512 {
Some(dev_id) => dev_id,
None => sys::INVALID_DEVID,
};
// Free any resources held by a previous initialization before
// re-initializing.
unsafe { sys::wc_Sha3_512_Free(&mut self.wc_sha3); }
let rc = unsafe { sys::wc_InitSha3_512(&mut self.wc_sha3, heap, dev_id) };
if rc != 0 {
return Err(rc);
Expand Down Expand Up @@ -2089,6 +2116,9 @@ impl SHAKE128 {
Some(dev_id) => dev_id,
None => sys::INVALID_DEVID,
};
// Free any resources held by a previous initialization before
// re-initializing.
unsafe { sys::wc_Shake128_Free(&mut self.wc_shake); }
let rc = unsafe {
sys::wc_InitShake128(&mut self.wc_shake, heap, dev_id)
};
Expand Down Expand Up @@ -2367,6 +2397,9 @@ impl SHAKE256 {
Some(dev_id) => dev_id,
None => sys::INVALID_DEVID,
};
// Free any resources held by a previous initialization before
// re-initializing.
unsafe { sys::wc_Shake256_Free(&mut self.wc_shake); }
let rc = unsafe {
sys::wc_InitShake256(&mut self.wc_shake, heap, dev_id)
};
Expand Down
Loading