diff --git a/CHANGELOG.md b/CHANGELOG.md
index cebd276da8..344aae9365 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,16 @@ 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.2] - 2024-05-06
+
+* Backports additional fixes up to rc.60 without the UniFFI upgrade
+
+## [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
@@ -2468,18 +2478,6 @@ consequence, both `commitAccepted` and `decryptMessages` now return buffered mes
git-conventional changelog
-### Bug Fixes
-
-- Kotlin tests not compiling after methods became async
-
-### Features
-
-- Correlate RotateBundle with a GroupId
-
-### Miscellaneous Tasks
-
-- Release 1.0.0-rc.7
-
* **[BREAKING]** `RotateBundle` now returns a `Map` instead of a `Vec` in order
@@ -2623,47 +2621,6 @@ In that case he has to catch & ignore the "OrphanWelcome" error and to rejoin th
- PostQuantum Ciphersuite
- [**breaking**] Remove `export_group_info()`
-
-### Bug Fixes
-
-- Backend sends raw GroupInfo, we were trying to deserialize it from a MlsMessage
-
-
-### Bug Fixes
-
-- Pin a version of openmls with a fix in tls_codec related to variable length encoding
-
-### Testing
-
-- Fix external commit test was not merging the external commit
-
-
-### Bug Fixes
-
-- Typo in build xcframework task
-
-
-### Features
-
-- CoreCrypto draft-20 upgrade
-- Generate XCFramework when releasing for Swift ([#330](https://github.com/wireapp/core-crypto/issues/330))
-
-
-### Features
-
-- Add `e2ei_is_degraded` to flag a conversation as degraded when at least 1 member is not using a e2ei certificate
-
-
-### Bug Fixes
-
-- Usize to u64 conversion error on Android in `client_valid_keypackages_count`. Whatever the reason this applies a default meaningful value
-- [**breaking**] Creating a MLS group does not consume an existing KeyPackage anymore, instead it always generates a new local one. Also, explicitly ask for the credential type of the creator before creating a new MLS group.
-- Mobile FFI was failing when initializing MLS client due to a Arc being incremented one too many times. Also add the E2EI API in the Kotlin wrapper and a test for it
-
-### Features
-
-- [**breaking**] Hide everywhere `Vec` appears in the public API since it seems to fail for obscure reasons on aarch64 Android devices. Undo when we have a better understanding of the root cause of this
-
* feat!: PostQuantum Ciphersuite support ! Using [Xyber768](https://www.ietf.org/archive/id/draft-westerbaan-cfrg-hpke-xyber768d00-02.html) for Key Exchange.
diff --git a/CHANGELOG.tpl b/CHANGELOG.tpl
index 5e0b0429de..f2e10d408c 100644
--- a/CHANGELOG.tpl
+++ b/CHANGELOG.tpl
@@ -7,11 +7,21 @@ 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.2] - 2024-05-06
+
+* Backports additional fixes up to rc.60 without the UniFFI upgrade
+
+## [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..90870543c9 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.2"
edition = "2021"
license = "GPL-3.0-only"
diff --git a/crypto-ffi/Cargo.toml b/crypto-ffi/Cargo.toml
index 3f51766b98..0988975a23 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.2"
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.2", 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.2", path = "../crypto" }
# UniFFI - Android + iOS bindings - Build support
diff --git a/crypto-ffi/bindings/gradle.properties b/crypto-ffi/bindings/gradle.properties
index cda7c39e24..00558533c7 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.2
SONATYPE_HOST=DEFAULT
SONATYPE_AUTOMATIC_RELEASE=true
RELEASE_SIGNING_ENABLED=true
diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml
index dab698b354..03609c736b 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.2"
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.2", 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.2", path = "../keystore", features = ["ios-wal-compat"] }
[dependencies.mls-crypto-provider]
-version = "^1.0.0-rc.56"
+version = "^1.0.0-rc.56-hotfix.2"
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.2"
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.2"
path = "../crypto-attributes"
[package.metadata.wasm-pack.profile.release]
diff --git a/interop/Cargo.toml b/interop/Cargo.toml
index d55692d374..450a289cf1 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.2"
edition = "2021"
license = "GPL-3.0-only"
diff --git a/keystore-dump/Cargo.toml b/keystore-dump/Cargo.toml
index 50147dd086..6dc2e15886 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.2"
edition = "2021"
license = "GPL-3.0-only"
diff --git a/keystore/Cargo.toml b/keystore/Cargo.toml
index 43145e30f9..8f43963a05 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.2"
edition = "2021"
license = "GPL-3.0-only"
publish = false
diff --git a/mls-provider/Cargo.toml b/mls-provider/Cargo.toml
index b1fb58c429..627d7be952 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.2"
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.2", 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.2", path = "../keystore", features = ["ios-wal-compat"] }
[dev-dependencies]
wasm-bindgen-test = "0.3"
diff --git a/package.json b/package.json
index 6178019e98..06035bbb6b 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.2",
"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
+}