From 4602f9e583d32614248dc1773bc9bd7987f4b03b Mon Sep 17 00:00:00 2001 From: Andy Ishchenko Date: Wed, 12 Jun 2024 12:28:27 +0200 Subject: [PATCH] - Task PEM-6766: prevent usage of private for macOS platform. --- mz_crypt_apple.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mz_crypt_apple.c b/mz_crypt_apple.c index 72a44c2d..e1fb39b1 100644 --- a/mz_crypt_apple.c +++ b/mz_crypt_apple.c @@ -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. */ -#if !TARGET_OS_IPHONE +#if !TARGET_OS_MAC enum { 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; if (aes->mode == MZ_AES_MODE_GCM) { -#if TARGET_OS_IPHONE +#if TARGET_OS_MAC return MZ_SUPPORT_ERROR; #else 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) { mz_crypt_aes *aes = (mz_crypt_aes *)handle; -#if !TARGET_OS_IPHONE +#if !TARGET_OS_MAC size_t tag_outsize = tag_size; #endif if (!aes || !tag || !tag_size || !aes->crypt || aes->mode != MZ_AES_MODE_GCM) return MZ_PARAM_ERROR; -#if TARGET_OS_IPHONE +#if TARGET_OS_MAC return MZ_SUPPORT_ERROR; #else 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; if (aes->mode == MZ_AES_MODE_GCM) { -#if TARGET_OS_IPHONE +#if TARGET_OS_MAC return MZ_SUPPORT_ERROR; #else 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) { mz_crypt_aes *aes = (mz_crypt_aes *)handle; -#if !TARGET_OS_IPHONE +#if !TARGET_OS_MAC uint8_t tag_actual_buf[MZ_AES_BLOCK_SIZE]; size_t tag_actual_len = sizeof(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) return MZ_PARAM_ERROR; -#if TARGET_OS_IPHONE +#if TARGET_OS_MAC return MZ_SUPPORT_ERROR; #else 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) mode = kCCModeECB; else if (aes->mode == MZ_AES_MODE_GCM) -#if !TARGET_OS_IPHONE +#if !TARGET_OS_MAC mode = kCCModeGCM; #else 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) return MZ_HASH_ERROR; -#if !TARGET_OS_IPHONE +#if !TARGET_OS_MAC if (aes->mode == MZ_AES_MODE_GCM) { aes->error = CCCryptorGCMAddIV(aes->crypt, iv, iv_length);