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

fix: avoid private api on Mac App Store

Browse Source
This commit is contained in:
Cœur 2024-10-21 13:13:50 +02:00 committed by Nathan Moinvaziri
parent 0ee98b6909
commit 23bf392d1b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mz_crypt_apple.c
View File

@ -21,7 +21,7 @@
/***************************************************************************/ /***************************************************************************/
/* Avoid use of private API for iOS, Apple does not allow it on App Store. Zip format doesn't need GCM. */ /* Avoid use of private API for iOS, Apple does not allow it on App Store. Zip format doesn't need GCM. */
#if !TARGET_OS_IPHONE #if !defined(__APPLE__)
enum { enum {
kCCModeGCM = 11, kCCModeGCM = 11,
}; };
@ -227,7 +227,7 @@ int32_t mz_crypt_aes_encrypt(void *handle, const void *aad, int32_t aad_size, ui
return MZ_PARAM_ERROR; return MZ_PARAM_ERROR;
if (aes->mode == MZ_AES_MODE_GCM) { if (aes->mode == MZ_AES_MODE_GCM) {
#if TARGET_OS_IPHONE #if defined(__APPLE__)
return MZ_SUPPORT_ERROR; return MZ_SUPPORT_ERROR;
#else #else
if (aad && aad_size > 0) { if (aad && aad_size > 0) {
@ -251,14 +251,14 @@ int32_t mz_crypt_aes_encrypt(void *handle, const void *aad, int32_t aad_size, ui
int32_t mz_crypt_aes_encrypt_final(void *handle, uint8_t *buf, int32_t size, uint8_t *tag, int32_t tag_size) { int32_t mz_crypt_aes_encrypt_final(void *handle, uint8_t *buf, int32_t size, uint8_t *tag, int32_t tag_size) {
mz_crypt_aes *aes = (mz_crypt_aes *)handle; mz_crypt_aes *aes = (mz_crypt_aes *)handle;
#if !TARGET_OS_IPHONE #if !defined(__APPLE__)
size_t tag_outsize = tag_size; size_t tag_outsize = tag_size;
#endif #endif
if (!aes || !tag || !tag_size || !aes->crypt || aes->mode != MZ_AES_MODE_GCM) if (!aes || !tag || !tag_size || !aes->crypt || aes->mode != MZ_AES_MODE_GCM)
return MZ_PARAM_ERROR; return MZ_PARAM_ERROR;
#if TARGET_OS_IPHONE #if defined(__APPLE__)
return MZ_SUPPORT_ERROR; return MZ_SUPPORT_ERROR;
#else #else
aes->error = CCCryptorGCMEncrypt(aes->crypt, buf, size, buf); aes->error = CCCryptorGCMEncrypt(aes->crypt, buf, size, buf);
@ -282,7 +282,7 @@ int32_t mz_crypt_aes_decrypt(void *handle, const void *aad, int32_t aad_size, ui
return MZ_PARAM_ERROR; return MZ_PARAM_ERROR;
if (aes->mode == MZ_AES_MODE_GCM) { if (aes->mode == MZ_AES_MODE_GCM) {
#if TARGET_OS_IPHONE #if defined(__APPLE__)
return MZ_SUPPORT_ERROR; return MZ_SUPPORT_ERROR;
#else #else
if (aad && aad_size > 0) { if (aad && aad_size > 0) {
@ -306,7 +306,7 @@ int32_t mz_crypt_aes_decrypt(void *handle, const void *aad, int32_t aad_size, ui
int32_t mz_crypt_aes_decrypt_final(void *handle, uint8_t *buf, int32_t size, const uint8_t *tag, int32_t tag_length) { int32_t mz_crypt_aes_decrypt_final(void *handle, uint8_t *buf, int32_t size, const uint8_t *tag, int32_t tag_length) {
mz_crypt_aes *aes = (mz_crypt_aes *)handle; mz_crypt_aes *aes = (mz_crypt_aes *)handle;
#if !TARGET_OS_IPHONE #if !defined(__APPLE__)
uint8_t tag_actual_buf[MZ_AES_BLOCK_SIZE]; uint8_t tag_actual_buf[MZ_AES_BLOCK_SIZE];
size_t tag_actual_len = sizeof(tag_actual_buf); size_t tag_actual_len = sizeof(tag_actual_buf);
uint8_t *tag_actual = tag_actual_buf; uint8_t *tag_actual = tag_actual_buf;
@ -317,7 +317,7 @@ int32_t mz_crypt_aes_decrypt_final(void *handle, uint8_t *buf, int32_t size, con
if (!aes || !tag || !tag_length || !aes->crypt || aes->mode != MZ_AES_MODE_GCM) if (!aes || !tag || !tag_length || !aes->crypt || aes->mode != MZ_AES_MODE_GCM)
return MZ_PARAM_ERROR; return MZ_PARAM_ERROR;
#if TARGET_OS_IPHONE #if defined(__APPLE__)
return MZ_SUPPORT_ERROR; return MZ_SUPPORT_ERROR;
#else #else
aes->error = CCCryptorGCMDecrypt(aes->crypt, buf, size, buf); aes->error = CCCryptorGCMDecrypt(aes->crypt, buf, size, buf);
@ -353,7 +353,7 @@ static int32_t mz_crypt_aes_set_key(void *handle, const void *key, int32_t key_l
else if (aes->mode == MZ_AES_MODE_ECB) else if (aes->mode == MZ_AES_MODE_ECB)
mode = kCCModeECB; mode = kCCModeECB;
else if (aes->mode == MZ_AES_MODE_GCM) else if (aes->mode == MZ_AES_MODE_GCM)
#if !TARGET_OS_IPHONE #if !defined(__APPLE__)
mode = kCCModeGCM; mode = kCCModeGCM;
#else #else
return MZ_SUPPORT_ERROR; return MZ_SUPPORT_ERROR;
@ -369,7 +369,7 @@ static int32_t mz_crypt_aes_set_key(void *handle, const void *key, int32_t key_l
if (aes->error != kCCSuccess) if (aes->error != kCCSuccess)
return MZ_HASH_ERROR; return MZ_HASH_ERROR;
#if !TARGET_OS_IPHONE #if !defined(__APPLE__)
if (aes->mode == MZ_AES_MODE_GCM) { if (aes->mode == MZ_AES_MODE_GCM) {
aes->error = CCCryptorGCMAddIV(aes->crypt, iv, iv_length); aes->error = CCCryptorGCMAddIV(aes->crypt, iv, iv_length);