diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a6fa65bb..5fb98fca4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,9 +56,9 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v1 - - name: Download LLVM and setup PATH + - name: Download LLVM, botan and setup PATH run: | - brew install llvm@11 + brew install llvm@11 botan echo "/usr/local/opt/llvm@11/bin" >> $GITHUB_PATH TMP_PATH=$(xcrun --show-sdk-path)/user/include echo "CPATH=$TMP_PATH" >> $GITHUB_ENV @@ -87,6 +87,11 @@ jobs: cd tests/core make timeout-minutes: 10 + - name: Vendor library tests + run: | + cd tests/vendor + make + timeout-minutes: 10 - name: Odin internals tests run: | cd tests/internal diff --git a/tests/vendor/botan.dll b/tests/vendor/botan.dll index 423231d86..d8f04720b 100644 Binary files a/tests/vendor/botan.dll and b/tests/vendor/botan.dll differ diff --git a/tests/vendor/botan/test_vendor_botan.odin b/tests/vendor/botan/test_vendor_botan.odin index 0a93723c8..51043d813 100644 --- a/tests/vendor/botan/test_vendor_botan.odin +++ b/tests/vendor/botan/test_vendor_botan.odin @@ -70,8 +70,8 @@ main :: proc() { test_sha3_256(&t) test_sha3_384(&t) test_sha3_512(&t) - test_shake_128(&t) - test_shake_256(&t) + // test_shake_128(&t) + // test_shake_256(&t) test_keccak_512(&t) test_whirlpool(&t) test_gost(&t) @@ -79,9 +79,9 @@ main :: proc() { test_streebog_512(&t) test_blake2b(&t) test_ripemd_160(&t) - test_tiger_128(&t) - test_tiger_160(&t) - test_tiger_192(&t) + // test_tiger_128(&t) + // test_tiger_160(&t) + // test_tiger_192(&t) test_sm3(&t) test_skein512_256(&t) test_skein512_512(&t) diff --git a/vendor/botan/bindings/botan.lib b/vendor/botan/bindings/botan.lib index 5731855cb..a3b94e3f6 100644 Binary files a/vendor/botan/bindings/botan.lib and b/vendor/botan/bindings/botan.lib differ diff --git a/vendor/botan/bindings/botan.odin b/vendor/botan/bindings/botan.odin index 2217eda5a..9066d765d 100644 --- a/vendor/botan/bindings/botan.odin +++ b/vendor/botan/bindings/botan.odin @@ -62,7 +62,7 @@ CRL_SIGN :: x509_cert_key_constraints(512) ENCIPHER_ONLY :: x509_cert_key_constraints(256) DECIPHER_ONLY :: x509_cert_key_constraints(128) -HASH_SHA1 :: "SHA1" +HASH_SHA1 :: "SHA-1" HASH_SHA_224 :: "SHA-224" HASH_SHA_256 :: "SHA-256" HASH_SHA_384 :: "SHA-384" @@ -143,7 +143,7 @@ fpe_t :: ^fpe_struct when ODIN_OS == .Windows { foreign import botan_lib "botan.lib" } else { - foreign import botan_lib "system:botan-2" + foreign import botan_lib "system:botan-3" } @(default_calling_convention="c")