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

Remove MZ_BCRYPT option from CMake.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2023-04-18 17:15:04 -07:00
parent 23fac55eda
commit 8eed140133
5 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@ -157,13 +157,13 @@ jobs:
deploy-name: windows
# No code coverage supported
- name: Windows MSVC BCrypt
- name: Windows MSVC XP
os: windows-latest
compiler: cl
# Don't use find_package for 3rd party libraries which are installed incorrectly on GitHub CI instances
cmake-args: -D MZ_FORCE_FETCH_LIBS=ON -D MZ_BCRYPT=ON
cmake-args: -D MZ_FORCE_FETCH_LIBS=ON -D CMAKE_C_FLAGS="-D_WIN32_WINNT=_WIN32_WINNT_XP"
deploy: true
deploy-name: uwp
deploy-name: windowsxp
- name: Windows GCC
os: windows-latest

12
CMakeLists.txt
View File

@ -45,7 +45,6 @@ option(MZ_FORCE_FETCH_LIBS "Enables fetching third-party libraries always" OFF)
option(MZ_PKCRYPT "Enables PKWARE traditional encryption" ON)
option(MZ_WZAES "Enables WinZIP AES encryption" ON)
cmake_dependent_option(MZ_OPENSSL "Enables OpenSSL for encryption" ON "UNIX" OFF)
cmake_dependent_option(MZ_BCRYPT "Enables Win32 Crypto API Next Generation" ON "CMAKE_SYSTEM_NAME STREQUAL WindowsStore" OFF)
cmake_dependent_option(MZ_LIBBSD "Builds with libbsd crypto random" ON "UNIX" OFF)
# Character conversion options
option(MZ_ICONV "Enables iconv for string encoding conversion" ON)
@ -435,15 +434,7 @@ if(WIN32)
if(MZ_OPENSSL)
list(APPEND MINIZIP_DEP_PKG OpenSSL)
else()
if(MZ_BCRYPT)
message(STATUS "Using BCrypt API")
list(APPEND MINIZIP_SRC mz_crypt_winrt.c)
list(APPEND MINIZIP_LIB bcrypt.lib crypt32.lib ncrypt.lib)
else()
message(STATUS "Using CryptoAPI")
list(APPEND MINIZIP_SRC mz_crypt_win32.c)
list(APPEND MINIZIP_LIB crypt32.lib)
endif()
list(APPEND MINIZIP_SRC mz_crypt_winvista.c mz_crypt_winxp.c)
endif()
else()
list(APPEND MINIZIP_DEF -DMZ_ZIP_NO_CRYPTO)
@ -970,7 +961,6 @@ add_feature_info(MZ_FORCE_FETCH_LIBS MZ_FORCE_FETCH_LIBS "Enables fetching third
add_feature_info(MZ_PKCRYPT MZ_PKCRYPT "Enables PKWARE traditional encryption")
add_feature_info(MZ_WZAES MZ_WZAES "Enables WinZIP AES encryption")
add_feature_info(MZ_OPENSSL MZ_OPENSSL "Enables OpenSSL for encryption")
add_feature_info(MZ_BCRYPT MZ_BCRYPT "Enables Win32 Crypto API Next Generation (CNG)")
add_feature_info(MZ_LIBBSD MZ_LIBBSD "Builds with libbsd crypto random")
# Character conversion options
add_feature_info(MZ_ICONV MZ_ICONV "Enables iconv string encoding conversion library")

1
README.md
View File

@ -76,7 +76,6 @@ cmake --build build
| MZ_FORCE_FETCH_LIBS | Enables fetching third-party libraries always | OFF |
| MZ_PKCRYPT | Enables PKWARE traditional encryption | ON |
| MZ_WZAES | Enables WinZIP AES encryption | ON |
| MZ_BCRYPT | Builds with Win32 Crypto API New Generation (CNG) | OFF |
| MZ_OPENSSL | Enables OpenSSL encryption | UNIX |
| MZ_LIBBSD | Builds with libbsd crypto random | UNIX |
| MZ_ICONV | Enables iconv encoding conversion | ON |

10
mz_crypt_winrt.c → mz_crypt_winvista.c
View File

@ -1,4 +1,4 @@
/* mz_crypt_winrt.c -- Crypto/hash functions for UWP
/* mz_crypt_winrt.c -- Crypto/hash functions for Windows Vista or later
part of the minizip-ng project
Copyright (C) 2010-2022 Nathan Moinvaziri
@ -13,6 +13,12 @@
#include "mz_crypt.h"
#include <windows.h>
#if _WIN32_WINNT >= _WIN32_WINNT_WINVISTA
#pragma comment(lib, "bcrypt.lib")
#pragma comment(lib, "crypt32.lib")
#pragma comment(lib, "ncrypt.lib")
#include <bcrypt.h>
/***************************************************************************/
@ -516,3 +522,5 @@ void mz_crypt_hmac_delete(void **handle) {
}
*handle = NULL;
}
#endif

8
mz_crypt_win32.c → mz_crypt_winxp.c
View File

@ -1,4 +1,4 @@
/* mz_crypt_win32.c -- Crypto/hash functions for Windows
/* mz_crypt_win32.c -- Crypto/hash functions for Windows XP
part of the minizip-ng project
Copyright (C) Nathan Moinvaziri
@ -13,6 +13,10 @@
#include "mz_crypt.h"
#include <windows.h>
#if _WIN32_WINNT <= _WIN32_WINNT_WINXP
#pragma comment(lib, "crypt32.lib")
#include <wincrypt.h>
/***************************************************************************/
@ -535,3 +539,5 @@ void mz_crypt_hmac_delete(void **handle) {
}
*handle = NULL;
}
#endif