Skip to content

Commit 7987ce7

Browse files
authored
Bump dependency on rust-sdk-crypto-wasm to v8.0.0 (#4396)
1 parent 60cedf2 commit 7987ce7

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
],
5151
"dependencies": {
5252
"@babel/runtime": "^7.12.5",
53-
"@matrix-org/matrix-sdk-crypto-wasm": "^7.0.0",
53+
"@matrix-org/matrix-sdk-crypto-wasm": "^8.0.0",
5454
"@matrix-org/olm": "3.2.15",
5555
"another-json": "^0.2.0",
5656
"bs58": "^6.0.0",

src/rust-crypto/RoomEncryptor.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,9 @@ export class RoomEncryptor {
254254
// When this.room.getBlacklistUnverifiedDevices() === null, the global settings should be used
255255
// See Room#getBlacklistUnverifiedDevices
256256
if (this.room.getBlacklistUnverifiedDevices() ?? globalBlacklistUnverifiedDevices) {
257-
rustEncryptionSettings.sharingStrategy = CollectStrategy.DeviceBasedStrategyOnlyTrustedDevices;
257+
rustEncryptionSettings.sharingStrategy = CollectStrategy.deviceBasedStrategy(true, false);
258258
} else {
259-
rustEncryptionSettings.sharingStrategy = CollectStrategy.DeviceBasedStrategyAllDevices;
259+
rustEncryptionSettings.sharingStrategy = CollectStrategy.deviceBasedStrategy(false, false);
260260
}
261261

262262
await logDuration(this.prefixedLogger, "shareRoomKey", async () => {

src/rust-crypto/rust-crypto.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1741,6 +1741,7 @@ class EventDecryptor {
17411741
const res = (await this.olmMachine.decryptRoomEvent(
17421742
stringifyEvent(event),
17431743
new RustSdkCryptoJs.RoomId(event.getRoomId()!),
1744+
new RustSdkCryptoJs.DecryptionSettings(RustSdkCryptoJs.TrustRequirement.Untrusted),
17441745
)) as RustSdkCryptoJs.DecryptedRoomEvent;
17451746

17461747
// Success. We can remove the event from the pending list, if

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1453,10 +1453,10 @@
14531453
"@jridgewell/resolve-uri" "^3.1.0"
14541454
"@jridgewell/sourcemap-codec" "^1.4.14"
14551455

1456-
"@matrix-org/matrix-sdk-crypto-wasm@^7.0.0":
1457-
version "7.0.0"
1458-
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-7.0.0.tgz#8d6abdb9ded8656cc9e2a7909913a34bf3fc9b3a"
1459-
integrity sha512-MOencXiW/gI5MuTtCNsuojjwT5DXCrjMqv9xOslJC9h2tPdLFFFMGr58dY5Lis4DRd9MRWcgrGowUIHOqieWTA==
1456+
"@matrix-org/matrix-sdk-crypto-wasm@^8.0.0":
1457+
version "8.0.0"
1458+
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-8.0.0.tgz#6ddc0e63538e821a2efbc5c1a2f0fa0f71d489ff"
1459+
integrity sha512-s0q3O2dK8b6hOJ+SZFz+s/IiMabmVsNue6r17sTwbrRD8liBkCrpjYnxoMYvtC01GggJ9TZLQbeqpt8hQSPHAg==
14601460

14611461
"@matrix-org/[email protected]":
14621462
version "3.2.15"

0 commit comments

Comments
 (0)