From 1dbc2282845d21eeb73aaceb7106d998d0c58f3c Mon Sep 17 00:00:00 2001 From: Mathieu Amiot Date: Mon, 29 Apr 2024 17:44:00 +0200 Subject: [PATCH] build: Release v1.0.0-rc.56-hotfix.1 --- CHANGELOG.md | 6 ++++++ CHANGELOG.tpl | 8 +++++++- crypto-attributes/Cargo.toml | 2 +- crypto-ffi/Cargo.toml | 6 +++--- crypto-ffi/bindings/gradle.properties | 2 +- crypto/Cargo.toml | 12 ++++++------ interop/Cargo.toml | 2 +- keystore-dump/Cargo.toml | 2 +- keystore/Cargo.toml | 2 +- mls-provider/Cargo.toml | 6 +++--- package.json | 4 ++-- 11 files changed, 32 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cebd276da8..60ad967827 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ Platform support legends: * Note: the papercuts will majorly be with the build process. Things might be very rough to integrate as no polish at all has been given yet. * ❌ = tier 3 support. It doesn't work just yet, but we plan to make it work. +## [1.0.0-rc.56-hotfix.1] - 2024-04-29 + +* Backports 2 fixes: + * Android crash on x86_64 + * Lock reentrancy in the iOS/Android FFI causing deadlocks + ## [1.0.0-rc.56] - 2024-04-22
diff --git a/CHANGELOG.tpl b/CHANGELOG.tpl index 5e0b0429de..a505bd9d12 100644 --- a/CHANGELOG.tpl +++ b/CHANGELOG.tpl @@ -7,11 +7,17 @@ Platform support legends: * Note: the papercuts will majorly be with the build process. Things might be very rough to integrate as no polish at all has been given yet. * ❌ = tier 3 support. It doesn't work just yet, but we plan to make it work. +## [1.0.0-rc.56-hotfix.1] - 2024-04-29 + +* Backports 2 fixes: + * Android crash on x86_64 + * Lock reentrancy in the iOS/Android FFI causing deadlocks + ## [1.0.0-rc.56] - 2024-04-22
git-conventional changelog -{{git-cliff tag="v1.0.0-rc.56" unreleased=true}} +{{git-cliff tag="v1.0.0-rc.56"}}
* Added full support for NIST-P curves ciphersuites diff --git a/crypto-attributes/Cargo.toml b/crypto-attributes/Cargo.toml index ffe31614b4..0b1ad4c03f 100644 --- a/crypto-attributes/Cargo.toml +++ b/crypto-attributes/Cargo.toml @@ -2,7 +2,7 @@ name = "core-crypto-attributes" description = "Macros for core-crypto" repository = "https://github.com/wireapp/core-crypto" -version = "1.0.0-rc.56" +version = "1.0.0-rc.56-hotfix.1" edition = "2021" license = "GPL-3.0-only" diff --git a/crypto-ffi/Cargo.toml b/crypto-ffi/Cargo.toml index 3f51766b98..ab201ae11f 100644 --- a/crypto-ffi/Cargo.toml +++ b/crypto-ffi/Cargo.toml @@ -2,7 +2,7 @@ name = "core-crypto-ffi" description = "Platform-specific bindings (Android, iOS, WASM) for CoreCrypto" repository = "https://github.com/wireapp/core-crypto" -version = "1.0.0-rc.56" +version = "1.0.0-rc.56-hotfix.1" edition = "2021" license = "GPL-3.0-only" publish = false @@ -47,7 +47,7 @@ sha2 = { version = "0.10", features = ["force-soft"] } [target.'cfg(not(target_family = "wasm"))'.dependencies] # UniFFI - Android + iOS bindings - Runtime support uniffi = { workspace = true } -core-crypto = { version = "^1.0.0-rc.56", path = "../crypto", features = ["uniffi"] } +core-crypto = { version = "^1.0.0-rc.56-hotfix.1", path = "../crypto", features = ["uniffi"] } [target.wasm32-unknown-unknown.dependencies] wasm-bindgen = "0.2" @@ -58,7 +58,7 @@ serde = { version = "1.0", features = ["derive"] } js-sys = "0.3" web-sys = "0.3" strum = "0.26" -core-crypto = { version = "^1.0.0-rc.56", path = "../crypto" } +core-crypto = { version = "^1.0.0-rc.56-hotfix.1", path = "../crypto" } # UniFFI - Android + iOS bindings - Build support diff --git a/crypto-ffi/bindings/gradle.properties b/crypto-ffi/bindings/gradle.properties index cda7c39e24..3e4bfc49f3 100644 --- a/crypto-ffi/bindings/gradle.properties +++ b/crypto-ffi/bindings/gradle.properties @@ -15,7 +15,7 @@ kotlin.code.style=official # gradle-maven-publish configuration GROUP=com.wire -VERSION_NAME=1.0.0-rc.56 +VERSION_NAME=1.0.0-rc.56-hotfix.1 SONATYPE_HOST=DEFAULT SONATYPE_AUTOMATIC_RELEASE=true RELEASE_SIGNING_ENABLED=true diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml index dab698b354..8134a3f1a9 100644 --- a/crypto/Cargo.toml +++ b/crypto/Cargo.toml @@ -2,7 +2,7 @@ name = "core-crypto" description = "Abstraction over OpenMLS with persistent keystore" repository = "https://github.com/wireapp/core-crypto" -version = "1.0.0-rc.56" +version = "1.0.0-rc.56-hotfix.1" edition = "2021" license = "GPL-3.0-only" publish = false @@ -75,13 +75,13 @@ rexie = { version = "0.4", optional = true } base64 = { version = "0.22", optional = true } [target.'cfg(not(target_os = "ios"))'.dependencies] -core-crypto-keystore = { version = "^1.0.0-rc.56", path = "../keystore" } +core-crypto-keystore = { version = "^1.0.0-rc.56-hotfix.1", path = "../keystore" } [target.'cfg(target_os = "ios")'.dependencies] -core-crypto-keystore = { version = "^1.0.0-rc.56", path = "../keystore", features = ["ios-wal-compat"] } +core-crypto-keystore = { version = "^1.0.0-rc.56-hotfix.1", path = "../keystore", features = ["ios-wal-compat"] } [dependencies.mls-crypto-provider] -version = "^1.0.0-rc.56" +version = "^1.0.0-rc.56-hotfix.1" path = "../mls-provider" [dev-dependencies] @@ -105,7 +105,7 @@ fluvio-wasm-timer = "0.2" time = { version = "0.3", features = ["wasm-bindgen"] } [dev-dependencies.core-crypto-keystore] -version = "^1.0.0-rc.56" +version = "^1.0.0-rc.56-hotfix.1" path = "../keystore" features = ["dummy-entity"] @@ -118,7 +118,7 @@ version = "0.5" features = ["async_std", "html_reports"] [dev-dependencies.core-crypto-attributes] -version = "^1.0.0-rc.56" +version = "^1.0.0-rc.56-hotfix.1" path = "../crypto-attributes" [package.metadata.wasm-pack.profile.release] diff --git a/interop/Cargo.toml b/interop/Cargo.toml index d55692d374..8d07eeb8c5 100644 --- a/interop/Cargo.toml +++ b/interop/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "interop" -version = "1.0.0-rc.56" +version = "1.0.0-rc.56-hotfix.1" edition = "2021" license = "GPL-3.0-only" diff --git a/keystore-dump/Cargo.toml b/keystore-dump/Cargo.toml index 50147dd086..5c2daf862b 100644 --- a/keystore-dump/Cargo.toml +++ b/keystore-dump/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "keystore-dump" description = "Dumps a keystore to JSON on stdout" -version = "1.0.0-rc.56" +version = "1.0.0-rc.56-hotfix.1" edition = "2021" license = "GPL-3.0-only" diff --git a/keystore/Cargo.toml b/keystore/Cargo.toml index 43145e30f9..4ef2ee8f28 100644 --- a/keystore/Cargo.toml +++ b/keystore/Cargo.toml @@ -2,7 +2,7 @@ name = "core-crypto-keystore" description = "Encrypted keystore with support for OpenMLS and Proteus" repository = "https://github.com/wireapp/core-crypto" -version = "1.0.0-rc.56" +version = "1.0.0-rc.56-hotfix.1" edition = "2021" license = "GPL-3.0-only" publish = false diff --git a/mls-provider/Cargo.toml b/mls-provider/Cargo.toml index b1fb58c429..69704a5f04 100644 --- a/mls-provider/Cargo.toml +++ b/mls-provider/Cargo.toml @@ -2,7 +2,7 @@ name = "mls-crypto-provider" description = "MLS Crypto Provider wrapping core-crypto-keystore" repository = "https://github.com/wireapp/core-crypto" -version = "1.0.0-rc.56" +version = "1.0.0-rc.56-hotfix.1" edition = "2021" license = "GPL-3.0-only" publish = false @@ -49,10 +49,10 @@ version = "0.11" features = ["x25519", "p256", "p384", "p521", "xyber768d00"] [target.'cfg(not(target_os = "ios"))'.dependencies] -core-crypto-keystore = { version = "^1.0.0-rc.56", path = "../keystore" } +core-crypto-keystore = { version = "^1.0.0-rc.56-hotfix.1", path = "../keystore" } [target.'cfg(target_os = "ios")'.dependencies] -core-crypto-keystore = { version = "^1.0.0-rc.56", path = "../keystore", features = ["ios-wal-compat"] } +core-crypto-keystore = { version = "^1.0.0-rc.56-hotfix.1", path = "../keystore", features = ["ios-wal-compat"] } [dev-dependencies] wasm-bindgen-test = "0.3" diff --git a/package.json b/package.json index 6178019e98..42ea87e89a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@wireapp/core-crypto", - "version": "1.0.0-rc.56", + "version": "1.0.0-rc.56-hotfix.1", "description": "CoreCrypto bindings for the Web", "type": "module", "module": "platforms/web/corecrypto.js", @@ -43,4 +43,4 @@ "ts-loader": "^9.5.1", "typescript": "^5.3.3" } -} \ No newline at end of file +}