Merge pull request #216 from aegoroff/develop

ci: migration to APR 1.7.5
aegoroff · Nov 30, 2024 · 64ace7f · 64ace7f
2 parents 4e5fb63 + aad9d43
commit 64ace7f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ env:
   PROJECT_NAME: hc
   RELEASER_VER: 0.11.4
   OPENSSL_VER: 3.3.1
-  APR_VER: 1.7.4
+  APR_VER: 1.7.5
   APR_UTIL_VER: 1.6.3
   PCRE_VER: 10.44
   EXPAT_VER: 2.6.2
@@ -55,7 +55,7 @@ jobs:
         uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
-          vs-version: '17.10'
+          vs-version: '17.12'
 
       - name: Check third party libs existence
         id: check_files

diff --git a/linux_build.sh b/linux_build.sh
@@ -11,7 +11,7 @@ LIB_INSTALL_PREFIX=./external_lib/lib
 CC_FLAGS="zig cc -target ${ARCH}-${OS}-${ABI}"
 AR_FLAGS="zig ar"
 RANLIB_FLAGS="zig ranlib"
-APR_SRC=apr-1.7.4
+APR_SRC=apr-1.7.5
 APR_UTIL_SRC=apr-util-1.6.3
 EXPAT_VER=2.6.2
 EXPAT_SRC=expat-${EXPAT_VER}

diff --git a/src/_tst/BruteForceTest.cpp b/src/_tst/BruteForceTest.cpp
@@ -278,6 +278,6 @@ TEST_P(BruteForceTest, BruteForce_CrackHashDictionaryWithoutNecessaryChars_Resto
     ASSERT_STREQ(NULL, result);
 }
 
-INSTANTIATE_TEST_CASE_P(All,
+INSTANTIATE_TEST_SUITE_P(All,
     BruteForceTest,
     ::testing::Values("crc32", "crc32c", "edonr256", "edonr512", "gost", "haval-128-3", "haval-128-4", "haval-128-5", "haval-160-3", "haval-160-4", "haval-160-5", "haval-192-3", "haval-192-4", "haval-192-5", "haval-224-3", "haval-224-4", "haval-224-5", "haval-256-3", "haval-256-4", "haval-256-5", "md2", "md4", "md5", "ntlm", "ripemd128", "ripemd160", "ripemd256", "ripemd320", "sha-3-224", "sha-3-256", "sha-3-384", "sha-3-512", "sha-3k-224", "sha-3k-256", "sha-3k-384", "sha-3k-512", "sha1", "sha224", "sha256", "sha384", "sha512", "snefru128", "snefru256", "tiger", "tiger2", "tth", "whirlpool", "blake2b", "blake2s", "blake3"));
diff --git a/src/_tst/HashTest.cpp b/src/_tst/HashTest.cpp
@@ -38,6 +38,6 @@ TEST_P(HashTest, Hash_Str123_HashAsSpecified) {
     ASSERT_STREQ(hash_str, GetHash(GetParam()));
 }
 
-INSTANTIATE_TEST_CASE_P(All,
+INSTANTIATE_TEST_SUITE_P(All,
     HashTest,
     ::testing::Values("crc32", "crc32c", "edonr256", "edonr512", "gost", "haval-128-3", "haval-128-4", "haval-128-5", "haval-160-3", "haval-160-4", "haval-160-5", "haval-192-3", "haval-192-4", "haval-192-5", "haval-224-3", "haval-224-4", "haval-224-5", "haval-256-3", "haval-256-4", "haval-256-5", "md2", "md4", "md5", "ntlm", "ripemd128", "ripemd160", "ripemd256", "ripemd320", "sha-3-224", "sha-3-256", "sha-3-384", "sha-3-512", "sha-3k-224", "sha-3k-256", "sha-3k-384", "sha-3k-512", "sha1", "sha224", "sha256", "sha384", "sha512", "snefru128", "snefru256", "tiger", "tiger2", "tth", "whirlpool", "blake2b", "blake2s", "blake3"));
diff --git a/src/hc.xml b/src/hc.xml
@@ -22,7 +22,7 @@
     <PgoEnabled>true</PgoEnabled>
     <GnuBasePath>$(ChocolateyInstall)\lib\winflexbison3\tools</GnuBasePath>
     <EchoCommand>echo</EchoCommand>
-    <VsBasePath>C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.40.33807</VsBasePath>
+    <VsBasePath>C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.42.34433</VsBasePath>
   </PropertyGroup>
   <PropertyGroup Condition="$(KeyFile) != '' AND $(CertPassword) != '' AND $(SignTool) != ''">
     <SignCommand>"$(SignTool)" sign /f "$(KeyFile)" /p $(CertPassword) /t http://timestamp.verisign.com/scripts/timestamp.dll /v /d "hc" /du https://github.com/aegoroff/hc %251</SignCommand>

diff --git a/src/l2h/treeutil.c b/src/l2h/treeutil.c
@@ -115,8 +115,13 @@ static asciinode_t* build_ascii_tree_recursive(fend_node_t* t) {
     }
     char* type = bend_create_label(t, tree_pool);
 
+    size_t len = strlen(node->label);
+#ifdef __STDC_WANT_SECURE_LIB__
+    sprintf_s(node->label, len, "%s", type);
+#else
     sprintf(node->label, "%s", type);
-    node->lablen = strlen(node->label);
+#endif
+    node->lablen = len;
 
     return node;
 }