diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-07-20 11:04:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 11:04:53 +0100 |
| commit | d78a1b186d4c05e0be8c47d445e1149d393d6b43 (patch) | |
| tree | e9a962408e68adebbef55dd2b431ac4d0cbc609c | |
| parent | 964c1c60011322a16a593f034a8466614f183742 (diff) | |
| parent | 270fd807df48c6d5a936855b984ed65bc222dbb4 (diff) | |
| download | libgit2-d78a1b186d4c05e0be8c47d445e1149d393d6b43.tar.gz | |
Merge pull request #5174 from pks-t/pks/winhttp-hash
sha1: fix compilation of WinHTTP backend
| -rw-r--r-- | azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | azure-pipelines/nightly.yml | 2 | ||||
| -rw-r--r-- | cmake/Modules/SelectHashes.cmake | 12 | ||||
| -rw-r--r-- | src/hash/sha1/win32.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7c63b2bd8..959960f07 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -90,7 +90,7 @@ jobs: - template: azure-pipelines/powershell.yml parameters: environmentVariables: - CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" -DDEPRECATE_HARD=ON + CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS - job: windows_mingw_amd64 displayName: 'Windows (amd64; MinGW)' diff --git a/azure-pipelines/nightly.yml b/azure-pipelines/nightly.yml index 57b5a6fff..c2997160c 100644 --- a/azure-pipelines/nightly.yml +++ b/azure-pipelines/nightly.yml @@ -92,7 +92,7 @@ jobs: - template: powershell.yml parameters: environmentVariables: - CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" -DDEPRECATE_HARD=ON + CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS RUN_INVASIVE_TESTS: true - job: windows_mingw_amd64 diff --git a/cmake/Modules/SelectHashes.cmake b/cmake/Modules/SelectHashes.cmake index e6751adbd..5667a9ed1 100644 --- a/cmake/Modules/SelectHashes.cmake +++ b/cmake/Modules/SelectHashes.cmake @@ -30,7 +30,7 @@ IF(SHA1_BACKEND STREQUAL "CollisionDetection") ADD_DEFINITIONS(-DSHA1DC_NO_STANDARD_INCLUDES=1) ADD_DEFINITIONS(-DSHA1DC_CUSTOM_INCLUDE_SHA1_C=\"common.h\") ADD_DEFINITIONS(-DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C=\"common.h\") - FILE(GLOB SRC_SHA1 hash/sha1/collisiondetect.c hash/sha1/sha1dc/*) + FILE(GLOB SRC_SHA1 hash/sha1/collisiondetect.* hash/sha1/sha1dc/*) ELSEIF(SHA1_BACKEND STREQUAL "OpenSSL") # OPENSSL_FOUND should already be set, we're checking HTTPS_BACKEND @@ -40,13 +40,13 @@ ELSEIF(SHA1_BACKEND STREQUAL "OpenSSL") ELSE() LIST(APPEND LIBGIT2_PC_REQUIRES "openssl") ENDIF() - FILE(GLOB SRC_SHA1 hash/sha1/openssl.c) + FILE(GLOB SRC_SHA1 hash/sha1/openssl.*) ELSEIF(SHA1_BACKEND STREQUAL "CommonCrypto") SET(GIT_SHA1_COMMON_CRYPTO 1) - FILE(GLOB SRC_SHA1 hash/sha1/common_crypto.c) + FILE(GLOB SRC_SHA1 hash/sha1/common_crypto.*) ELSEIF(SHA1_BACKEND STREQUAL "mbedTLS") SET(GIT_SHA1_MBEDTLS 1) - FILE(GLOB SRC_SHA1 hash/sha1/mbedtls.c) + FILE(GLOB SRC_SHA1 hash/sha1/mbedtls.*) LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${MBEDTLS_INCLUDE_DIR}) LIST(APPEND LIBGIT2_LIBS ${MBEDTLS_LIBRARIES}) # mbedTLS has no pkgconfig file, hence we can't require it @@ -55,9 +55,9 @@ ELSEIF(SHA1_BACKEND STREQUAL "mbedTLS") LIST(APPEND LIBGIT2_PC_LIBS ${MBEDTLS_LIBRARIES}) ELSEIF(SHA1_BACKEND STREQUAL "Win32") SET(GIT_SHA1_WIN32 1) - FILE(GLOB SRC_SHA1 hash/sha1/win32.c) + FILE(GLOB SRC_SHA1 hash/sha1/win32.*) ELSEIF(SHA1_BACKEND STREQUAL "Generic") - FILE(GLOB SRC_SHA1 hash/sha1/generic.c) + FILE(GLOB SRC_SHA1 hash/sha1/generic.*) # ELSEIF(NOT USE_SHA1) ELSE() MESSAGE(FATAL_ERROR "Asked for unknown SHA1 backend: ${SHA1_BACKEND}") diff --git a/src/hash/sha1/win32.c b/src/hash/sha1/win32.c index 1b944e27f..c73695665 100644 --- a/src/hash/sha1/win32.c +++ b/src/hash/sha1/win32.c @@ -23,7 +23,7 @@ /* BCRYPT_HASH_REUSEABLE_FLAGS */ #define GIT_HASH_CNG_HASH_REUSABLE 0x00000020 -static struct git_hash_prov hash_prov = {0}; +static git_hash_prov hash_prov = {0}; /* Hash initialization */ |