Check prekey identity on mismatched devices too.

signalapp · Feb 17, 2014 · d8e1df9 · d8e1df9
1 parent 6b57533
commit d8e1df9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/org/thoughtcrime/securesms/transport/PushTransport.java b/src/org/thoughtcrime/securesms/transport/PushTransport.java
@@ -189,7 +189,7 @@ private PushAttachmentPointer getPushAttachmentPointer(PushServiceSocket socket,
   private void handleMismatchedDevices(PushServiceSocket socket, long threadId,
                                        Recipient recipient,
                                        MismatchedDevices mismatchedDevices)
-      throws InvalidNumberException, IOException
+      throws InvalidNumberException, IOException, UntrustedIdentityException
   {
     try {
       String e164number = Util.canonicalizeNumber(context, recipient.getNumber());
@@ -205,7 +205,11 @@ private void handleMismatchedDevices(PushServiceSocket socket, long threadId,
         PreKeyEntity           preKey    = socket.getPreKey(address);
         KeyExchangeProcessorV2 processor = new KeyExchangeProcessorV2(context, masterSecret, address);
 
-        processor.processKeyExchangeMessage(preKey, threadId);
+        if (processor.isTrusted(preKey)) {
+          processor.processKeyExchangeMessage(preKey, threadId);
+        } else {
+          throw new UntrustedIdentityException("Untrusted identity key!", e164number, preKey.getIdentityKey());
+        }
       }
     } catch (InvalidKeyException e) {
       throw new IOException(e);