All: Add new encryption methods based on native crypto libraries #10696
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| import { Crypto, CryptoBuffer } from '@joplin/lib/services/e2ee/types'; | ||
| import crypto from 'react-native-quick-crypto'; | ||
| import { HashAlgorithm } from 'react-native-quick-crypto/lib/typescript/keys'; | ||
|
|
||
| const cryptoLib: Crypto = { | ||
|
|
||
| getCiphers: (): string[] => { | ||
| return crypto.getCiphers(); | ||
| }, | ||
|
|
||
| getHashes: (): string[] => { | ||
| return crypto.getHashes(); | ||
| }, | ||
|
|
||
| randomBytes: async (size: number): Promise<CryptoBuffer> => { | ||
| return new Promise((resolve, reject) => { | ||
| crypto.randomBytes(size, (error, result) => { | ||
| if (error) { | ||
| reject(error); | ||
| } else { | ||
| resolve(result); | ||
| } | ||
| }); | ||
| }); | ||
| }, | ||
|
|
||
| pbkdf2Raw: async (password: string, salt: CryptoBuffer, iterations: number, keylen: number, digest: string): Promise<CryptoBuffer> => { | ||
| const digestMap: { [key: string]: HashAlgorithm } = { | ||
| 'sha1': 'SHA-1', | ||
| 'sha224': 'SHA-224', | ||
| 'sha256': 'SHA-256', | ||
| 'sha384': 'SHA-384', | ||
| 'sha512': 'SHA-512', | ||
| 'ripemd160': 'RIPEMD-160', | ||
| }; | ||
| const digestAlgorithm: string = digestMap[digest.toLowerCase()] || digest; | ||
|
There was a problem hiding this comment. Also not recommended. See https://joplinapp.org/help/dev/coding_style#dont-set-the-type-when-it-can-be-inferred |
||
| return new Promise((resolve, reject) => { | ||
| crypto.pbkdf2(password, salt, iterations, keylen, digestAlgorithm as HashAlgorithm, (error, result) => { | ||
| if (error) { | ||
| reject(error); | ||
| } else { | ||
| resolve(result); | ||
| } | ||
| }); | ||
| }); | ||
| }, | ||
| }; | ||
|
|
||
| export default cryptoLib; | ||
laurent22 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import { Crypto } from './types'; | ||
| import { promisify } from 'util'; | ||
| import crypto = require('crypto'); | ||
|
|
||
| const cryptoLib: Crypto = { | ||
|
|
||
| getCiphers: (): string[] => { | ||
| return crypto.getCiphers(); | ||
| }, | ||
|
|
||
| getHashes: (): string[] => { | ||
| return crypto.getHashes(); | ||
| }, | ||
|
|
||
| randomBytes: async (size: number): Promise<Buffer> => { | ||
| const randomBytesAsync = promisify(crypto.randomBytes); | ||
| return randomBytesAsync(size); | ||
| }, | ||
|
|
||
| pbkdf2Raw: async (password: string, salt: Buffer, iterations: number, keylen: number, digest: string): Promise<Buffer> => { | ||
| const digestMap: { [key: string]: string } = { | ||
| 'sha-1': 'sha1', | ||
| 'sha-224': 'sha224', | ||
| 'sha-256': 'sha256', | ||
| 'sha-384': 'sha384', | ||
| 'sha-512': 'sha512', | ||
| 'ripemd-160': 'ripemd160', | ||
| }; | ||
| const digestAlgorithm: string = digestMap[digest.toLowerCase()] || digest; | ||
|
There was a problem hiding this comment. I don't really get this part - are the digestMap the list of supported digests? In that case shouldn't that be exposed to the library user? In other words, it seems there should be an enum that tells the list of supported digests. And Also please don't use There was a problem hiding this comment. The |
||
|
|
||
| const pbkdf2Async = promisify(crypto.pbkdf2); | ||
| return pbkdf2Async(password, salt, iterations, keylen, digestAlgorithm); | ||
| }, | ||
| }; | ||
|
|
||
| export default cryptoLib; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,4 +110,5 @@ ENOTFOUND | |
| Scaleway | ||
| Inkscape | ||
| Ionicon | ||
| Stormlikes | ||
| ripemd | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Again please read the coding style guide, we explicitly ask not to set types this way. See https://joplinapp.org/help/dev/coding_style#avoid-inline-types
I really shouldn't have to keep reminding you to read it. It's understandable to miss a few details here and there but for this PR that's what, the third or fourth time that I remind you to read it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry I only checked the method declaration. I will change it later.