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

Allow writing of more bytes than buffer in pkcrypt and wzaes.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2018-11-21 19:25:20 -08:00
parent d31c5de5b0
commit 3e2d07451c
2 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mz_strm_pkcrypt.c
View File

@ -234,23 +234,36 @@ int32_t mz_stream_pkcrypt_write(void *stream, const void *buf, int32_t size)
{ {
mz_stream_pkcrypt *pkcrypt = (mz_stream_pkcrypt *)stream; mz_stream_pkcrypt *pkcrypt = (mz_stream_pkcrypt *)stream;
const uint8_t *buf_ptr = (const uint8_t *)buf; const uint8_t *buf_ptr = (const uint8_t *)buf;
int32_t bytes_to_write = sizeof(pkcrypt->buffer);
int32_t total_written = 0;
int32_t written = 0; int32_t written = 0;
int32_t i = 0; int32_t i = 0;
uint16_t t = 0; uint16_t t = 0;
if (size < 0) if (size < 0)
return MZ_PARAM_ERROR; return MZ_PARAM_ERROR;
if (size > (int32_t)sizeof(pkcrypt->buffer))
return MZ_BUF_ERROR;
for (i = 0; i < size; i++) do
pkcrypt->buffer[i] = mz_stream_pkcrypt_encode(stream, buf_ptr[i], t); {
if (bytes_to_write > (size - total_written));
bytes_to_write = (size - total_written);
written = mz_stream_write(pkcrypt->stream.base, pkcrypt->buffer, size); for (i = 0; i < bytes_to_write; i += 1)
if (written > 0) {
pkcrypt->total_out += written; pkcrypt->buffer[i] = mz_stream_pkcrypt_encode(stream, *buf_ptr, t);
buf_ptr += 1;
}
return written; written = mz_stream_write(pkcrypt->stream.base, pkcrypt->buffer, bytes_to_write);
if (written < 0)
return written;
total_written += written;
}
while (total_written < size && written > 0);
pkcrypt->total_out += total_written;
return total_written;
} }
int64_t mz_stream_pkcrypt_tell(void *stream) int64_t mz_stream_pkcrypt_tell(void *stream)

34
mz_strm_wzaes.c
View File

@ -234,21 +234,37 @@ int32_t mz_stream_wzaes_read(void *stream, void *buf, int32_t size)
int32_t mz_stream_wzaes_write(void *stream, const void *buf, int32_t size) int32_t mz_stream_wzaes_write(void *stream, const void *buf, int32_t size)
{ {
mz_stream_wzaes *wzaes = (mz_stream_wzaes *)stream; mz_stream_wzaes *wzaes = (mz_stream_wzaes *)stream;
const uint8_t *buf_ptr = (const uint8_t *)buf;
int32_t bytes_to_write = sizeof(wzaes->buffer);
int32_t total_written = 0;
int32_t written = 0; int32_t written = 0;
int32_t i = 0;
uint16_t t = 0;
if (size < 0) if (size < 0)
return MZ_PARAM_ERROR; return MZ_PARAM_ERROR;
if (size > (int32_t)sizeof(wzaes->buffer))
return MZ_BUF_ERROR;
memcpy(wzaes->buffer, buf, size); do
mz_stream_wzaes_encrypt_data(stream, (uint8_t *)wzaes->buffer, size); {
mz_crypt_hmac_update(wzaes->hmac, wzaes->buffer, size); if (bytes_to_write > (size - total_written));
bytes_to_write = (size - total_written);
written = mz_stream_write(wzaes->stream.base, wzaes->buffer, size); memcpy(wzaes->buffer, buf_ptr, bytes_to_write);
if (written > 0) buf_ptr += bytes_to_write;
wzaes->total_out += written;
return written; mz_stream_wzaes_encrypt_data(stream, (uint8_t *)wzaes->buffer, bytes_to_write);
mz_crypt_hmac_update(wzaes->hmac, wzaes->buffer, bytes_to_write);
written = mz_stream_write(wzaes->stream.base, wzaes->buffer, bytes_to_write);
if (written < 0)
return written;
total_written += written;
}
while (total_written < size && written > 0);
wzaes->total_out += total_written;
return total_written;
} }
int64_t mz_stream_wzaes_tell(void *stream) int64_t mz_stream_wzaes_tell(void *stream)