self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-10 22:11:50 +02:00
Code Issues Releases Activity

All: Set new encryption methods as default (#12229)

Browse Source
This commit is contained in:
Self Not Found
2025-05-19 21:59:20 +00:00
committed by GitHub
parent 5b2f409254
commit e65fbecef0
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/lib/models/settings/builtInMetadata.ts
View File

@@ -1716,17 +1716,6 @@ const builtInMetadata = (Setting: typeof SettingType) => {
// storage: SettingStorage.File, // storage: SettingStorage.File,
// }, // },
'featureFlag.useBetaEncryptionMethod': {
value: false,
type: SettingItemType.Bool,
public: true,
storage: SettingStorage.File,
label: () => 'Use beta encryption',
description: () => 'Set beta encryption methods as the default methods. This applies to all clients and takes effect after restarting the app.',
section: 'sync',
isGlobal: true,
},
'featureFlag.richText.useStrictContentSecurityPolicy': { 'featureFlag.richText.useStrictContentSecurityPolicy': {
value: true, value: true,
type: SettingItemType.Bool, type: SettingItemType.Bool,

6
packages/lib/services/e2ee/EncryptionService.ts
View File

@@ -72,9 +72,9 @@ export default class EncryptionService {
private encryptedMasterKeys_: Map<string, EncryptedMasterKey> = new Map(); private encryptedMasterKeys_: Map<string, EncryptedMasterKey> = new Map();
private decryptedMasterKeys_: Map<string, DecryptedMasterKey> = new Map(); private decryptedMasterKeys_: Map<string, DecryptedMasterKey> = new Map();
public defaultEncryptionMethod_ = Setting.value('featureFlag.useBetaEncryptionMethod') ? EncryptionMethod.StringV1 : EncryptionMethod.SJCL1a; // public because used in tests public defaultEncryptionMethod_ = EncryptionMethod.StringV1; // public because used in tests
public defaultFileEncryptionMethod_ = Setting.value('featureFlag.useBetaEncryptionMethod') ? EncryptionMethod.FileV1 : EncryptionMethod.SJCL1a; // public because used in tests public defaultFileEncryptionMethod_ = EncryptionMethod.FileV1; // public because used in tests
private defaultMasterKeyEncryptionMethod_ = Setting.value('featureFlag.useBetaEncryptionMethod') ? EncryptionMethod.KeyV1 : EncryptionMethod.SJCL4; private defaultMasterKeyEncryptionMethod_ = EncryptionMethod.KeyV1;
private encryptionNonce_: Uint8Array = null; private encryptionNonce_: Uint8Array = null;