matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-23 17:02:25 +03:00
Code Activity

Update encrypted state to say MSC4362 everywhere

Browse Source
This commit is contained in:
Andy Balaam
2025-11-17 17:11:51 +00:00
parent c7a75c8824
commit 486b696085
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/test-utils/test-utils.ts
View File

@@ -82,7 +82,7 @@ export function getSyncResponse(
state_key: "", state_key: "",
content: { content: {
"algorithm": "m.megolm.v1.aes-sha2", "algorithm": "m.megolm.v1.aes-sha2",
"io.element.msc3414.encrypt_state_events": encryptStateEvents, "io.element.msc4362.encrypt_state_events": encryptStateEvents,
}, },
}), }),
], ],

2
src/@types/state_events.ts
View File

@@ -106,7 +106,7 @@ export interface RoomPinnedEventsEventContent {
export interface RoomEncryptionEventContent { export interface RoomEncryptionEventContent {
"algorithm": "m.megolm.v1.aes-sha2"; "algorithm": "m.megolm.v1.aes-sha2";
"io.element.msc3414.encrypt_state_events"?: boolean; "io.element.msc4362.encrypt_state_events"?: boolean;
"rotation_period_ms"?: number; "rotation_period_ms"?: number;
"rotation_period_msgs"?: number; "rotation_period_msgs"?: number;
} }

2
src/client.ts
View File

@@ -6916,7 +6916,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
return; return;
} }
// Check if the event is excluded under MSC3414 // Check if the event is excluded under MSC4362
if ( if (
[ [
"m.room.create", "m.room.create",

4
src/models/event.ts
View File

@@ -753,7 +753,7 @@ export class MatrixEvent extends TypedEventEmitter<MatrixEventEmittedEvents, Mat
/** /**
* Get the event state_key if it has one. If necessary, this will perform * Get the event state_key if it has one. If necessary, this will perform
* string-unpacking on the state key, as per MSC3414. This will return * string-unpacking on the state key, as per MSC4362. This will return
* <code>undefined</code> for message events. * <code>undefined</code> for message events.
* @returns The event's `state_key`. * @returns The event's `state_key`.
*/ */
@@ -766,7 +766,7 @@ export class MatrixEvent extends TypedEventEmitter<MatrixEventEmittedEvents, Mat
/** /**
* Get the raw event state_key if it has one. This may be string-packed as per * Get the raw event state_key if it has one. This may be string-packed as per
* MSC3414 if the state event is encrypted. This will return <code>undefined * MSC4362 if the state event is encrypted. This will return <code>undefined
* </code> for message events. * </code> for message events.
* @returns The event's `state_key`. * @returns The event's `state_key`.
*/ */

4
src/rust-crypto/rust-crypto.ts
View File

@@ -164,7 +164,7 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, CryptoEventH
/** Crypto callbacks provided by the application */ /** Crypto callbacks provided by the application */
private readonly cryptoCallbacks: CryptoCallbacks, private readonly cryptoCallbacks: CryptoCallbacks,
/** Enable support for encrypted state events under MSC3414. */ /** Enable support for encrypted state events under MSC4362. */
private readonly enableEncryptedStateEvents: boolean = false, private readonly enableEncryptedStateEvents: boolean = false,
) { ) {
super(); super();
@@ -1774,7 +1774,7 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, CryptoEventH
return; return;
} }
if (config["io.element.msc3414.encrypt_state_events"] && this.enableEncryptedStateEvents) { if (config["io.element.msc4362.encrypt_state_events"] && this.enableEncryptedStateEvents) {
this.logger.info("crypto Enabling state event encryption..."); this.logger.info("crypto Enabling state event encryption...");
settings.encryptStateEvents = true; settings.encryptStateEvents = true;
} }