Review changes

src/client.ts

@@ -3656,7 +3656,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
  * @param password - Passphrase
  * @param backupInfo - Backup metadata from `checkKeyBackup`
  * @returns key backup key
- * @deprecated
+ * @deprecated Deriving a backup key from a passphrase is not part of the matrix spec. Instead, a random key is generated and stored/shared via 4S.
  */
  public keyBackupKeyFromPassword(password: string, backupInfo: IKeyBackupInfo): Promise<Uint8Array> {
  return keyFromAuthData(backupInfo.auth_data, password);

src/common-crypto/key-passphrase.ts

@@ -27,7 +27,7 @@ interface IAuthData {
  * Derive a backup key from a passphrase using the salt and iterations from the auth data.
  * @param authData - The auth data containing the salt and iterations
  * @param passphrase - The passphrase to derive the key from
- * @deprecated
+ * @deprecated Deriving a backup key from a passphrase is not part of the matrix spec. Instead, a random key is generated and stored/shared via 4S.
  */
 export function keyFromAuthData(authData: IAuthData, passphrase: string): Promise<Uint8Array> {
  if (!authData.private_key_salt || !authData.private_key_iterations) {

src/rust-crypto/rust-crypto.ts

@@ -102,9 +102,8 @@ interface ISignableObject {
 export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, RustCryptoEventMap> implements CryptoBackend {
  /**
  * The number of iterations to use when deriving a recovery key from a passphrase.
- * @private
  */
- private readonly RECOVERY_KEY_DERIVATION_ITERATION = 500000;
+ private readonly RECOVERY_KEY_DERIVATION_ITERATIONS = 500000;
 
  private _trustCrossSignedDevices = true;
 
@@ -891,13 +890,13 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, RustCryptoEv
  const recoveryKey = await deriveRecoveryKeyFromPassphrase(
  password,
  salt,
- this.RECOVERY_KEY_DERIVATION_ITERATION,
+ this.RECOVERY_KEY_DERIVATION_ITERATIONS,
  );
  return {
  keyInfo: {
  passphrase: {
  algorithm: "m.pbkdf2",
- iterations: this.RECOVERY_KEY_DERIVATION_ITERATION,
+ iterations: this.RECOVERY_KEY_DERIVATION_ITERATIONS,
  salt,
  },
  },