Swap

web/apps/photos/src/services/collectionService.ts

@@ -70,7 +70,7 @@ const createCollection = async (
         const cryptoWorker = await sharedCryptoWorker();
         const encryptionKey = await getActualKey();
         const token = getToken();
-        const collectionKey = await cryptoWorker.generateEncryptionKey();
+        const collectionKey = await cryptoWorker.generateKey();
         const { encryptedData: encryptedKey, nonce: keyDecryptionNonce } =
             await cryptoWorker.encryptToB64(collectionKey, encryptionKey);
         const { encryptedData: encryptedName, nonce: nameDecryptionNonce } =

web/packages/accounts/services/passkey.ts

@@ -1,9 +1,7 @@
 import { TwoFactorAuthorizationResponse } from "ente-accounts/services/user";
 import { clientPackageName, isDesktop } from "ente-base/app";
-import {
-    encryptToB64,
-    generateEncryptionKey,
-} from "ente-base/crypto/libsodium";
+import { generateKey } from "ente-base/crypto";
+import { encryptToB64 } from "ente-base/crypto/libsodium";
 import {
     authenticatedRequestHeaders,
     ensureOk,
@@ -111,7 +109,7 @@ export const openAccountsManagePasskeysPage = async () => {
         // If not, enable it for them by creating the necessary recovery
         // information to prevent them from getting locked out.
         const recoveryKeyB64 = await getRecoveryKey();
-        const resetSecret = await generateEncryptionKey();
+        const resetSecret = await generateKey();
         const encryptionResult = await encryptToB64(
             resetSecret,
             recoveryKeyB64,

web/packages/accounts/services/srp.ts

@@ -171,8 +171,8 @@ export async function generateKeyAndSRPAttributes(
     srpSetupAttributes: SRPSetupAttributes;
 }> {
     const cryptoWorker = await sharedCryptoWorker();
-    const masterKey = await cryptoWorker.generateEncryptionKey();
-    const recoveryKey = await cryptoWorker.generateEncryptionKey();
+    const masterKey = await cryptoWorker.generateKey();
+    const recoveryKey = await cryptoWorker.generateKey();
     const kekSalt = await cryptoWorker.generateSaltToDeriveKey();
     const kek = await cryptoWorker.deriveSensitiveKey(passphrase, kekSalt);
 

web/packages/base/crypto/libsodium.ts

@@ -879,11 +879,6 @@ export const deriveInteractiveKey = async (
     return { key, opsLimit, memLimit };
 };
 
-/** Deprecated, use generateKey */
-export async function generateEncryptionKey() {
-    return generateKey();
-}
-
 export async function generateSaltToDeriveKey() {
     await sodium.ready;
     return await toB64(sodium.randombytes_buf(sodium.crypto_pwhash_SALTBYTES));

web/packages/base/crypto/worker.ts

@@ -70,10 +70,6 @@ export class CryptoWorker {
         return libsodium.encryptUTF8(data, key);
     }
 
-    async generateEncryptionKey() {
-        return libsodium.generateEncryptionKey();
-    }
-
     async generateSaltToDeriveKey() {
         return libsodium.generateSaltToDeriveKey();
     }

web/packages/shared/crypto/helpers.ts

@@ -155,7 +155,7 @@ const createNewRecoveryKey = async () => {
 
     const cryptoWorker = await sharedCryptoWorker();
 
-    const recoveryKey = await cryptoWorker.generateEncryptionKey();
+    const recoveryKey = await cryptoWorker.generateKey();
     const encryptedMasterKey = await cryptoWorker.encryptToB64(
         masterKey,
         recoveryKey,