From 314765eee19e6bdf1ea82e79f495e898bd0de4ad Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Tue, 20 Oct 2020 20:18:52 +0200 Subject: [PATCH] Windows msys build --- .gitlab-ci.yml | 4 ++-- .../kotlin/crypto/authenticated/XChaCha20Poly1305Test.kt | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c22085..dd99848 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,8 +81,8 @@ buildWindows: windowsPublishToSnapshot: stage: deploy script: - - ./windowsBuildAndPublish-delegated.sh - - ./windowsBuildAndPublish-pure.sh + - C:\msys64\msys2_shell.cmd -msys -here windowsBuildAndPublish-delegated.sh + - C:\msys64\msys2_shell.cmd -msys -here windowsBuildAndPublish-pure.sh rules: - if: '$CI_COMMIT_BRANCH == "master"' - allow_failure: false diff --git a/multiplatform-crypto-delegated/src/commonTest/kotlin/com/ionspin/kotlin/crypto/authenticated/XChaCha20Poly1305Test.kt b/multiplatform-crypto-delegated/src/commonTest/kotlin/com/ionspin/kotlin/crypto/authenticated/XChaCha20Poly1305Test.kt index 6ed851c..f9006e6 100644 --- a/multiplatform-crypto-delegated/src/commonTest/kotlin/com/ionspin/kotlin/crypto/authenticated/XChaCha20Poly1305Test.kt +++ b/multiplatform-crypto-delegated/src/commonTest/kotlin/com/ionspin/kotlin/crypto/authenticated/XChaCha20Poly1305Test.kt @@ -226,7 +226,9 @@ class XChaCha20Poly1305Test { expected.contentEquals(result) && decrypted.contentEquals(data) } val messedUpTag = result.copyOf() + messedUpTag[messedUpTag.size - 3] = 0U messedUpTag[messedUpTag.size - 2] = 0U + messedUpTag[messedUpTag.size - 1] = 0U assertFails { val decryptorForWrongTag = XChaCha20Poly1305Delegated(key, state, header, true) val plaintext = decryptorForWrongTag.decrypt(messedUpTag)