aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlMessage.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-05-16 21:43:07 +0200
committerChristian Schneppe <christian@pix-art.de>2018-05-16 21:43:07 +0200
commit0525b1f960f4d7b45940bfe4a88beac99e571363 (patch)
tree73091229ef14a124573b57d351b143bf6adae4f8 /src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlMessage.java
parent5786441681e55b31a7e224a5c7ba37a686490909 (diff)
make session completion work with untrusted devices as well
Diffstat (limited to 'src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlMessage.java')
-rw-r--r--src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlMessage.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlMessage.java b/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlMessage.java
index 81bf6754c..0adbbe51f 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlMessage.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlMessage.java
@@ -215,16 +215,20 @@ public class XmppAxolotlMessage {
return this.from;
}
- public int getSenderDeviceId() {
+ int getSenderDeviceId() {
return sourceDeviceId;
}
- public void addDevice(XmppAxolotlSession session) {
+ void addDevice(XmppAxolotlSession session) {
+ addDevice(session, false);
+ }
+
+ void addDevice(XmppAxolotlSession session, boolean ignoreSessionTrust) {
XmppAxolotlSession.AxolotlKey key;
if (authtagPlusInnerKey != null) {
- key = session.processSending(authtagPlusInnerKey);
+ key = session.processSending(authtagPlusInnerKey, ignoreSessionTrust);
} else {
- key = session.processSending(innerKey);
+ key = session.processSending(innerKey, ignoreSessionTrust);
}
if (key != null) {
keys.put(session.getRemoteAddress().getDeviceId(), key);