self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Code Issues Releases Activity

All: Security: Changed default encryption method to CCM

Browse Source
This commit is contained in:
Laurent Cozic 2020-03-06 22:33:33 +00:00
parent 3007918647
commit 03146ed85f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CliClient/tests/synchronizer.js
View File

@ -87,7 +87,7 @@ async function localNotesFoldersSameAsRemote(locals, expect) {
let insideBeforeEach = false;
describe('Synchronizer', function() {
describe('synchronizer', function() {
beforeEach(async (done) => {
insideBeforeEach = true;

2
ReactNativeClient/lib/services/EncryptionService.js
View File

@ -316,7 +316,7 @@ class EncryptionService {
iter: 101, // Since the master key already uses key derivations and is secure, additional iteration here aren't necessary, which will make decryption faster. SJCL enforces an iter strictly greater than 100
ks: 128, // Key size - "128 bits should be secure enough"
ts: 64, // ???
mode: 'ocb2', // The cipher mode is a standard for how to use AES and other algorithms to encrypt and authenticate your message. OCB2 mode is slightly faster and has more features, but CCM mode has wider support because it is not patented.
mode: 'ccm', // The cipher mode is a standard for how to use AES and other algorithms to encrypt and authenticate your message. OCB2 mode is slightly faster and has more features, but CCM mode has wider support because it is not patented.
// "adata":"", // Associated Data - not needed?
cipher: 'aes',
});