oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

improve guards on loading keypair

Browse source
This commit is contained in:
Ryan Tharp 2020-02-09 19:59:40 -08:00
parent 926a245bf6
commit dbff390035
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libloki/crypto.js
View file

@ -48,6 +48,12 @@
// Should we use ephemeral key pairs here rather than long term keys on each side?
async encrypt(plaintext) {
const myKeyPair = await textsecure.storage.protocol.getIdentityKeyPair();
if (!myKeyPair) {
window.log.warn("encrypt, Can't load myKeyPair from storage");
// FIXME: not sure what I should give on failure
// just going to stick with the same type of value
return {};
}
const myPrivateKey = myKeyPair.privKey;
const symmetricKey = libsignal.Curve.calculateAgreement(
this.pubKey,
@ -63,6 +69,12 @@
async decrypt(ivAndCiphertext) {
const myKeyPair = await textsecure.storage.protocol.getIdentityKeyPair();
if (!myKeyPair) {
window.log.warn("decrypt, Can't load myKeyPair from storage");
// FIXME: not sure what I should give on failure
// just going to stick with the same type of value
return {};
}
const myPrivateKey = myKeyPair.privKey;
const symmetricKey = libsignal.Curve.calculateAgreement(
this.pubKey,
@ -169,6 +181,12 @@
data[len] = type;
const myKeyPair = await textsecure.storage.protocol.getIdentityKeyPair();
if (!myKeyPair) {
window.log.warn("generateSignatureForPairing Can't load myKeyPair from storage");
// FIXME: not sure what I should give on failure
// just going to stick with the same type of value
return {};
}
const signature = await libsignal.Curve.async.calculateSignature(
myKeyPair.privKey,
data.buffer
@ -292,6 +310,12 @@
dcodeIO.ByteBuffer.fromBase64(serverPubKey64).toArrayBuffer()
);
const { privKey } = await textsecure.storage.protocol.getIdentityKeyPair();
if (!myKeyPair) {
window.log.warn("decryptToken, Can't load myKeyPair from storage");
// FIXME: not sure what I should give on failure
// just going to stick with the same type of value
return {};
}
const symmetricKey = libsignal.Curve.calculateAgreement(
serverPubKey,
privKey