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

Fixed HMAC bug on Windows when key size is 1. #523

Browse Source
This commit is contained in:
Nathan Moinvaziri 2020-10-11 13:00:53 -07:00
parent 9a19a43744
commit 8c761cc6a0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mz_crypt_win32.c
View File

@ -258,6 +258,7 @@ static int32_t mz_crypt_aes_set_key(void *handle, const void *key, int32_t key_l
result = CryptImportKey(aes->provider, key_blob, key_blob_size, 0, 0, &aes->key);
SecureZeroMemory(key_blob, key_blob_size);
MZ_FREE(key_blob);
} else {
err = MZ_MEM_ERROR;
@ -380,11 +381,15 @@ int32_t mz_crypt_hmac_init(void *handle, const void *key, int32_t key_length) {
hmac->error = GetLastError();
err = MZ_CRYPT_ERROR;
} else {
/* Zero-pad odd key lengths */
if (key_length % 2 == 1)
key_length += 1;
key_blob_size = sizeof(key_blob_header_s) + key_length;
key_blob = (uint8_t *)MZ_ALLOC(key_blob_size);
}
if (key_blob) {
memset(key_blob, 0, key_blob_size);
key_blob_s = (key_blob_header_s *)key_blob;
key_blob_s->hdr.bType = PLAINTEXTKEYBLOB;
key_blob_s->hdr.bVersion = CUR_BLOB_VERSION;
@ -400,6 +405,7 @@ int32_t mz_crypt_hmac_init(void *handle, const void *key, int32_t key_length) {
if (result)
result = CryptSetHashParam(hmac->hash, HP_HMAC_INFO, (uint8_t *)&hmac->info, 0);
SecureZeroMemory(key_blob, key_blob_size);
MZ_FREE(key_blob);
} else if (err == MZ_OK) {
err = MZ_MEM_ERROR;

1
mz_zip_rw.c
View File

@ -1294,7 +1294,6 @@ int32_t mz_zip_writer_entry_open(void *handle, mz_zip_file *file_info) {
return err;
}
#if !defined(MZ_ZIP_NO_ENCRYPTION) && defined(MZ_ZIP_SIGNING)
int32_t mz_zip_writer_entry_sign(void *handle, uint8_t *message, int32_t message_size,
uint8_t *cert_data, int32_t cert_data_size, const char *cert_pwd) {