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

Added clarifying comments to WinZip AES code.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2023-04-06 16:30:49 -07:00
parent 3c0995b85d
commit 16cbb2a9d7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mz_strm_wzaes.c
View File

@ -106,8 +106,10 @@ int32_t mz_stream_wzaes_open(void *stream, const char *path, int32_t mode) {
mz_crypt_pbkdf2((uint8_t *)password, password_length, salt_value, salt_length, mz_crypt_pbkdf2((uint8_t *)password, password_length, salt_value, salt_length,
MZ_AES_KEYING_ITERATIONS, kbuf, 2 * key_length + MZ_AES_PW_VERIFY_SIZE); MZ_AES_KEYING_ITERATIONS, kbuf, 2 * key_length + MZ_AES_PW_VERIFY_SIZE);
/* Initialize the encryption nonce and buffer pos */ /* Initialize the buffer pos */
wzaes->crypt_pos = MZ_AES_BLOCK_SIZE; wzaes->crypt_pos = MZ_AES_BLOCK_SIZE;
/* Use fixed zeroed IV/nonce for CTR mode */
memset(wzaes->nonce, 0, sizeof(wzaes->nonce)); memset(wzaes->nonce, 0, sizeof(wzaes->nonce));
/* Initialize for encryption using key 1 */ /* Initialize for encryption using key 1 */
@ -171,7 +173,7 @@ static int32_t mz_stream_wzaes_ctr_encrypt(void *stream, uint8_t *buf, int32_t s
while (j < 8 && !++wzaes->nonce[j]) while (j < 8 && !++wzaes->nonce[j])
j += 1; j += 1;
/* Encrypt the nonce to form next xor buffer */ /* Encrypt the nonce using ECB mode to form next xor buffer */
memcpy(wzaes->crypt_block, wzaes->nonce, MZ_AES_BLOCK_SIZE); memcpy(wzaes->crypt_block, wzaes->nonce, MZ_AES_BLOCK_SIZE);
mz_crypt_aes_encrypt(wzaes->aes, wzaes->crypt_block, sizeof(wzaes->crypt_block)); mz_crypt_aes_encrypt(wzaes->aes, wzaes->crypt_block, sizeof(wzaes->crypt_block));
pos = 0; pos = 0;