0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix TODO

Browse source
This commit is contained in:
Vishnu Mohandas 2020-10-02 18:24:46 +05:30
parent 5d4dc2e671
commit 1f2b60f997
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/pages/credentials/index.tsx
View file

@ -56,7 +56,7 @@ export default function Credentials() {
const kek = await libsodium.deriveKey(await libsodium.fromString(passphrase),
await libsodium.fromB64(keyAttributes.kekSalt));
if (await cryptoWorker.verifyHash(keyAttributes.kekHash, kek)) {
if (await cryptoWorker.verifyHash(await libsodium.fromB64(keyAttributes.kekHash), kek)) {
const key = await libsodium.decrypt(
await libsodium.fromB64(keyAttributes.encryptedKey),
await libsodium.fromB64(keyAttributes.keyDecryptionNonce),

16
src/utils/crypto/libsodium.ts
View file

@ -44,19 +44,11 @@ export async function decrypt(data: Uint8Array, nonce: Uint8Array, key: Uint8Arr
return sodium.crypto_secretbox_open_easy(data, nonce, key);
}
// TODO(https://github.com/firstfloorsoftware/flutter_sodium/issues/46)
export async function verifyHash(hash: string, input: Uint8Array) {
var sanitizedHash = "";
for (var index = 0; index < hash.length; index++) {
if (hash.charCodeAt(index) == 0) {
sanitizedHash += "\uFFFD";
break;
} else {
sanitizedHash += hash.charAt(index);
}
}
export async function verifyHash(hash: Uint8Array, input: Uint8Array) {
await sodium.ready;
return (sodium.crypto_pwhash_str_verify(sanitizedHash, input) == 0);
return sodium.crypto_pwhash_str_verify(
sodium.to_string(hash),
input);
}
export async function hash(input: string | Uint8Array) {