c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up memory freeing in mz_crypt classes.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2023-04-27 09:46:29 -07:00
parent 4d1b93bf05
commit dd4711c1d2
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mz_crypt_apple.c
View File

@ -202,7 +202,7 @@ typedef struct mz_crypt_aes_s {
/***************************************************************************/
void mz_crypt_aes_reset(void *handle) {
static void mz_crypt_aes_free(void *handle) {
mz_crypt_aes *aes = (mz_crypt_aes *)handle;
if (aes->crypt)
@ -210,6 +210,10 @@ void mz_crypt_aes_reset(void *handle) {
aes->crypt = NULL;
}
void mz_crypt_aes_reset(void *handle) {
mz_crypt_aes_free(handle);
}
int32_t mz_crypt_aes_encrypt(void *handle, uint8_t *buf, int32_t size) {
mz_crypt_aes *aes = (mz_crypt_aes *)handle;
size_t data_moved = 0;
@ -355,7 +359,7 @@ void mz_crypt_aes_delete(void **handle) {
return;
aes = (mz_crypt_aes *)*handle;
if (aes) {
mz_crypt_aes_reset(*handle);
mz_crypt_aes_free(*handle);
free(aes);
}
*handle = NULL;

16
mz_crypt_winvista.c
View File

@ -219,14 +219,16 @@ static void mz_crypt_aes_free(void *handle) {
mz_crypt_aes *aes = (mz_crypt_aes *)handle;
if (aes->key)
BCryptDestroyKey(aes->key);
aes->key = NULL;
if (aes->provider)
BCryptCloseAlgorithmProvider(aes->provider, 0);
free(aes->key_buffer);
free(aes->iv);
free(aes->auth_info);
aes->provider = NULL;
aes->key = NULL;
free(aes->key_buffer);
aes->key_buffer = NULL;
free(aes->iv);
aes->iv = NULL;
free(aes->auth_info);
aes->auth_info = NULL;
}
void mz_crypt_aes_reset(void *handle) {
@ -493,14 +495,14 @@ static void mz_crypt_hmac_free(void *handle) {
mz_crypt_hmac *hmac = (mz_crypt_hmac *)handle;
if (hmac->hash)
BCryptDestroyHash(hmac->hash);
hmac->hash = NULL;
if (hmac->key)
BCryptDestroyKey(hmac->key);
hmac->key = NULL;
if (hmac->provider)
BCryptCloseAlgorithmProvider(hmac->provider, 0);
free(hmac->buffer);
hmac->hash = NULL;
hmac->key = NULL;
hmac->provider = NULL;
free(hmac->buffer);
hmac->buffer = NULL;
}