From dbff390035606e67d72e457d219dd22d60d5f0c4 Mon Sep 17 00:00:00 2001
From: Ryan Tharp <neuro@interx.net>
Date: Sun, 9 Feb 2020 19:59:40 -0800
Subject: [PATCH] improve guards on loading keypair

---
 libloki/crypto.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/libloki/crypto.js b/libloki/crypto.js
index f9888d70e..fbff7e079 100644
--- a/libloki/crypto.js
+++ b/libloki/crypto.js
@@ -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