vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-15 00:32:06 +01:00
Code Issues Releases Wiki Activity

Migrate from libsignal-protocol-java to libsignal

Browse source
This commit is contained in:
Paul Schaub 2024-10-24 17:47:20 +02:00
parent 0561aaa9bc
commit 5e561f410a
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
11 changed files with 170 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
smack-omemo-signal/build.gradle
View file

@ -11,7 +11,7 @@ dependencies {
api project(":smack-im") api project(":smack-im")
api project(":smack-extensions") api project(":smack-extensions")
api project(":smack-omemo") api project(":smack-omemo")
implementation 'org.whispersystems:signal-protocol-java:2.8.1' implementation 'org.signal:libsignal-client:0.26.0'
// TODO: Migrate Junit4 tests to Junit5. // TODO: Migrate Junit4 tests to Junit5.
testImplementation "org.junit.vintage:junit-vintage-engine:$junitVersion" testImplementation "org.junit.vintage:junit-vintage-engine:$junitVersion"

18
smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalCachingOmemoStore.java
View file

@ -23,15 +23,15 @@ package org.jivesoftware.smackx.omemo.signal;
import org.jivesoftware.smackx.omemo.CachingOmemoStore; import org.jivesoftware.smackx.omemo.CachingOmemoStore;
import org.jivesoftware.smackx.omemo.OmemoStore; import org.jivesoftware.smackx.omemo.OmemoStore;
import org.whispersystems.libsignal.IdentityKey; import org.signal.libsignal.protocol.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair; import org.signal.libsignal.protocol.IdentityKeyPair;
import org.whispersystems.libsignal.SessionCipher; import org.signal.libsignal.protocol.SessionCipher;
import org.whispersystems.libsignal.SignalProtocolAddress; import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.whispersystems.libsignal.ecc.ECPublicKey; import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.whispersystems.libsignal.state.PreKeyBundle; import org.signal.libsignal.protocol.state.PreKeyBundle;
import org.whispersystems.libsignal.state.PreKeyRecord; import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SessionRecord; import org.signal.libsignal.protocol.state.SessionRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
/** /**
* Implementation of the CachingOmemoStore for smack-omemo-signal. * Implementation of the CachingOmemoStore for smack-omemo-signal.

18
smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalFileBasedOmemoStore.java
View file

@ -25,15 +25,15 @@ import java.io.File;
import org.jivesoftware.smackx.omemo.FileBasedOmemoStore; import org.jivesoftware.smackx.omemo.FileBasedOmemoStore;
import org.jivesoftware.smackx.omemo.util.OmemoKeyUtil; import org.jivesoftware.smackx.omemo.util.OmemoKeyUtil;
import org.whispersystems.libsignal.IdentityKey; import org.signal.libsignal.protocol.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair; import org.signal.libsignal.protocol.IdentityKeyPair;
import org.whispersystems.libsignal.SessionCipher; import org.signal.libsignal.protocol.SessionCipher;
import org.whispersystems.libsignal.SignalProtocolAddress; import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.whispersystems.libsignal.ecc.ECPublicKey; import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.whispersystems.libsignal.state.PreKeyBundle; import org.signal.libsignal.protocol.state.PreKeyBundle;
import org.whispersystems.libsignal.state.PreKeyRecord; import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SessionRecord; import org.signal.libsignal.protocol.state.SessionRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
/** /**
* Implementation of a FileBasedOmemoStore for the smack-omemo-signal module. * Implementation of a FileBasedOmemoStore for the smack-omemo-signal module.

69
smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java
View file

@ -21,6 +21,7 @@
package org.jivesoftware.smackx.omemo.signal; package org.jivesoftware.smackx.omemo.signal;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.TreeMap; import java.util.TreeMap;
@ -30,16 +31,18 @@ import org.jivesoftware.smackx.omemo.internal.OmemoDevice;
import org.jivesoftware.smackx.omemo.trust.OmemoFingerprint; import org.jivesoftware.smackx.omemo.trust.OmemoFingerprint;
import org.jivesoftware.smackx.omemo.util.OmemoKeyUtil; import org.jivesoftware.smackx.omemo.util.OmemoKeyUtil;
import org.whispersystems.libsignal.IdentityKey; import org.signal.libsignal.protocol.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair; import org.signal.libsignal.protocol.IdentityKeyPair;
import org.whispersystems.libsignal.InvalidKeyException; import org.signal.libsignal.protocol.InvalidKeyException;
import org.whispersystems.libsignal.ecc.Curve; import org.signal.libsignal.protocol.InvalidMessageException;
import org.whispersystems.libsignal.ecc.ECPublicKey; import org.signal.libsignal.protocol.ecc.Curve;
import org.whispersystems.libsignal.state.PreKeyBundle; import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.whispersystems.libsignal.state.PreKeyRecord; import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.whispersystems.libsignal.state.SessionRecord; import org.signal.libsignal.protocol.state.PreKeyBundle;
import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.whispersystems.libsignal.util.KeyHelper; import org.signal.libsignal.protocol.state.SessionRecord;
import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
import org.signal.libsignal.protocol.util.Medium;
/** /**
* Concrete implementation of the KeyUtil for an implementation using the Signal library. * Concrete implementation of the KeyUtil for an implementation using the Signal library.
@ -51,13 +54,13 @@ public class SignalOmemoKeyUtil extends OmemoKeyUtil<IdentityKeyPair, IdentityKe
@Override @Override
public IdentityKeyPair generateOmemoIdentityKeyPair() { public IdentityKeyPair generateOmemoIdentityKeyPair() {
return KeyHelper.generateIdentityKeyPair(); return IdentityKeyPair.generate();
} }
@Override @Override
@SuppressWarnings("NonApiType") @SuppressWarnings("NonApiType")
public TreeMap<Integer, PreKeyRecord> generateOmemoPreKeys(int currentPreKeyId, int count) { public TreeMap<Integer, PreKeyRecord> generateOmemoPreKeys(int currentPreKeyId, int count) {
List<PreKeyRecord> preKeyRecords = KeyHelper.generatePreKeys(currentPreKeyId, count); List<PreKeyRecord> preKeyRecords = generatePreKeys(currentPreKeyId, count);
TreeMap<Integer, PreKeyRecord> map = new TreeMap<>(); TreeMap<Integer, PreKeyRecord> map = new TreeMap<>();
for (PreKeyRecord p : preKeyRecords) { for (PreKeyRecord p : preKeyRecords) {
map.put(p.getId(), p); map.put(p.getId(), p);
@ -65,20 +68,44 @@ public class SignalOmemoKeyUtil extends OmemoKeyUtil<IdentityKeyPair, IdentityKe
return map; return map;
} }
private static List<PreKeyRecord> generatePreKeys(int start, int count) {
List<PreKeyRecord> results = new ArrayList<>(count);
start--;
for (int i = 0; i < count; i++) {
int pkIdx = ((start + i) % (Medium.MAX_VALUE - 1)) + 1;
results.add(new PreKeyRecord(pkIdx, Curve.generateKeyPair()));
}
return results;
}
@Override @Override
public SignedPreKeyRecord generateOmemoSignedPreKey(IdentityKeyPair identityKeyPair, int currentPreKeyId) public SignedPreKeyRecord generateOmemoSignedPreKey(IdentityKeyPair identityKeyPair, int currentPreKeyId)
throws CorruptedOmemoKeyException { throws CorruptedOmemoKeyException {
try { try {
return KeyHelper.generateSignedPreKey(identityKeyPair, currentPreKeyId); return generateSignedPreKey(identityKeyPair, currentPreKeyId);
} catch (InvalidKeyException e) { } catch (InvalidKeyException e) {
throw new CorruptedOmemoKeyException(e); throw new CorruptedOmemoKeyException(e);
} }
} }
private static SignedPreKeyRecord generateSignedPreKey(IdentityKeyPair identityKeyPair, int signedPreKeyId) throws InvalidKeyException {
ECKeyPair keyPair = Curve.generateKeyPair();
byte[] signature = Curve.calculateSignature(identityKeyPair.getPrivateKey(), keyPair.getPublicKey().serialize());
return new SignedPreKeyRecord(signedPreKeyId, System.currentTimeMillis(), keyPair, signature);
}
@Override @Override
public SignedPreKeyRecord signedPreKeyFromBytes(byte[] data) throws IOException { public SignedPreKeyRecord signedPreKeyFromBytes(byte[] data) throws IOException {
if (data == null) return null; if (data == null) return null;
try {
return new SignedPreKeyRecord(data); return new SignedPreKeyRecord(data);
} catch (InvalidMessageException e) {
throw new IOException(e);
}
} }
@Override @Override
@ -89,7 +116,11 @@ public class SignalOmemoKeyUtil extends OmemoKeyUtil<IdentityKeyPair, IdentityKe
@Override @Override
public SessionRecord rawSessionFromBytes(byte[] data) throws IOException { public SessionRecord rawSessionFromBytes(byte[] data) throws IOException {
if (data == null) return null; if (data == null) return null;
try {
return new SessionRecord(data); return new SessionRecord(data);
} catch (InvalidMessageException e) {
throw new IOException(e);
}
} }
@Override @Override
@ -100,11 +131,7 @@ public class SignalOmemoKeyUtil extends OmemoKeyUtil<IdentityKeyPair, IdentityKe
@Override @Override
public IdentityKeyPair identityKeyPairFromBytes(byte[] data) throws CorruptedOmemoKeyException { public IdentityKeyPair identityKeyPairFromBytes(byte[] data) throws CorruptedOmemoKeyException {
if (data == null) return null; if (data == null) return null;
try {
return new IdentityKeyPair(data); return new IdentityKeyPair(data);
} catch (InvalidKeyException e) {
throw new CorruptedOmemoKeyException(e);
}
} }
@Override @Override
@ -135,7 +162,11 @@ public class SignalOmemoKeyUtil extends OmemoKeyUtil<IdentityKeyPair, IdentityKe
@Override @Override
public PreKeyRecord preKeyFromBytes(byte[] bytes) throws IOException { public PreKeyRecord preKeyFromBytes(byte[] bytes) throws IOException {
if (bytes == null) return null; if (bytes == null) return null;
try {
return new PreKeyRecord(bytes); return new PreKeyRecord(bytes);
} catch (InvalidMessageException e) {
throw new IOException(e);
}
} }
@Override @Override
@ -188,7 +219,11 @@ public class SignalOmemoKeyUtil extends OmemoKeyUtil<IdentityKeyPair, IdentityKe
@Override @Override
public byte[] preKeyForBundle(PreKeyRecord preKeyRecord) { public byte[] preKeyForBundle(PreKeyRecord preKeyRecord) {
try {
return preKeyRecord.getKeyPair().getPublicKey().serialize(); return preKeyRecord.getKeyPair().getPublicKey().serialize();
} catch (InvalidKeyException e) {
throw new RuntimeException(e);
}
} }
@Override @Override

53
smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoRatchet.java
View file

@ -35,26 +35,27 @@ import org.jivesoftware.smackx.omemo.exceptions.UntrustedOmemoIdentityException;
import org.jivesoftware.smackx.omemo.internal.CiphertextTuple; import org.jivesoftware.smackx.omemo.internal.CiphertextTuple;
import org.jivesoftware.smackx.omemo.internal.OmemoDevice; import org.jivesoftware.smackx.omemo.internal.OmemoDevice;
import org.whispersystems.libsignal.DuplicateMessageException; import org.signal.libsignal.protocol.DuplicateMessageException;
import org.whispersystems.libsignal.IdentityKey; import org.signal.libsignal.protocol.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair; import org.signal.libsignal.protocol.IdentityKeyPair;
import org.whispersystems.libsignal.InvalidKeyException; import org.signal.libsignal.protocol.InvalidKeyException;
import org.whispersystems.libsignal.InvalidKeyIdException; import org.signal.libsignal.protocol.InvalidKeyIdException;
import org.whispersystems.libsignal.InvalidMessageException; import org.signal.libsignal.protocol.InvalidMessageException;
import org.whispersystems.libsignal.InvalidVersionException; import org.signal.libsignal.protocol.InvalidVersionException;
import org.whispersystems.libsignal.LegacyMessageException; import org.signal.libsignal.protocol.LegacyMessageException;
import org.whispersystems.libsignal.NoSessionException; import org.signal.libsignal.protocol.NoSessionException;
import org.whispersystems.libsignal.SessionCipher; import org.signal.libsignal.protocol.SessionCipher;
import org.whispersystems.libsignal.SignalProtocolAddress; import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.whispersystems.libsignal.UntrustedIdentityException; import org.signal.libsignal.protocol.UntrustedIdentityException;
import org.whispersystems.libsignal.ecc.ECPublicKey; import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.whispersystems.libsignal.protocol.CiphertextMessage; import org.signal.libsignal.protocol.message.CiphertextMessage;
import org.whispersystems.libsignal.protocol.PreKeySignalMessage; import org.signal.libsignal.protocol.message.PreKeySignalMessage;
import org.whispersystems.libsignal.protocol.SignalMessage; import org.signal.libsignal.protocol.message.SignalMessage;
import org.whispersystems.libsignal.state.PreKeyBundle; import org.signal.libsignal.protocol.state.PreKeyBundle;
import org.whispersystems.libsignal.state.PreKeyRecord; import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SessionRecord; import org.signal.libsignal.protocol.state.SessionRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
public class SignalOmemoRatchet public class SignalOmemoRatchet
extends OmemoRatchet<IdentityKeyPair, IdentityKey, PreKeyRecord, SignedPreKeyRecord, SessionRecord, extends OmemoRatchet<IdentityKeyPair, IdentityKey, PreKeyRecord, SignedPreKeyRecord, SessionRecord,
@ -103,7 +104,7 @@ public class SignalOmemoRatchet
catch (UntrustedIdentityException e) { catch (UntrustedIdentityException e) {
throw new AssertionError("Signals trust management MUST be disabled."); throw new AssertionError("Signals trust management MUST be disabled.");
} }
catch (LegacyMessageException | InvalidKeyException e) { catch (InvalidKeyException e) {
throw new CryptoFailedException(e); throw new CryptoFailedException(e);
} }
catch (InvalidKeyIdException e) { catch (InvalidKeyIdException e) {
@ -134,7 +135,15 @@ public class SignalOmemoRatchet
LOGGER.log(Level.INFO, "Decryption of SignalMessage from " + sender + LOGGER.log(Level.INFO, "Decryption of SignalMessage from " + sender +
" failed, since the message has been decrypted before."); " failed, since the message has been decrypted before.");
return null; return null;
} catch (InvalidVersionException e) {
throw new RuntimeException(e);
} catch (InvalidKeyException e) {
throw new RuntimeException(e);
} }
} catch (LegacyMessageException e) {
throw new RuntimeException(e);
} catch (InvalidKeyException e) {
throw new RuntimeException(e);
} }
return decryptedKey; return decryptedKey;
@ -156,7 +165,7 @@ public class SignalOmemoRatchet
} }
private SessionCipher getCipher(OmemoDevice device) { private SessionCipher getCipher(OmemoDevice device) {
return new SessionCipher(storeConnector, storeConnector, storeConnector, storeConnector, return new SessionCipher(storeConnector, storeConnector, storeConnector, null, storeConnector,
SignalOmemoStoreConnector.asAddress(device)); SignalOmemoStoreConnector.asAddress(device));
} }
} }

26
smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoService.java
View file

@ -28,17 +28,19 @@ import org.jivesoftware.smackx.omemo.OmemoStore;
import org.jivesoftware.smackx.omemo.exceptions.CorruptedOmemoKeyException; import org.jivesoftware.smackx.omemo.exceptions.CorruptedOmemoKeyException;
import org.jivesoftware.smackx.omemo.internal.OmemoDevice; import org.jivesoftware.smackx.omemo.internal.OmemoDevice;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair; import org.signal.libsignal.protocol.IdentityKey;
import org.whispersystems.libsignal.SessionBuilder; import org.signal.libsignal.protocol.IdentityKeyPair;
import org.whispersystems.libsignal.SessionCipher; import org.signal.libsignal.protocol.SessionBuilder;
import org.whispersystems.libsignal.SignalProtocolAddress; import org.signal.libsignal.protocol.SessionCipher;
import org.whispersystems.libsignal.UntrustedIdentityException; import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.whispersystems.libsignal.ecc.ECPublicKey; import org.signal.libsignal.protocol.UntrustedIdentityException;
import org.whispersystems.libsignal.state.PreKeyBundle; import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.whispersystems.libsignal.state.PreKeyRecord; import org.signal.libsignal.protocol.state.PreKeyBundle;
import org.whispersystems.libsignal.state.SessionRecord; import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.signal.libsignal.protocol.state.SessionRecord;
import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
/** /**
* Concrete implementation of the OmemoService using the Signal library. * Concrete implementation of the OmemoService using the Signal library.
@ -103,7 +105,7 @@ public final class SignalOmemoService
try { try {
builder.process(contactsBundle); builder.process(contactsBundle);
LOGGER.log(Level.FINE, "Session built with " + contactsDevice); LOGGER.log(Level.FINE, "Session built with " + contactsDevice);
} catch (org.whispersystems.libsignal.InvalidKeyException e) { } catch (org.signal.libsignal.protocol.InvalidKeyException e) {
throw new CorruptedOmemoKeyException(e); throw new CorruptedOmemoKeyException(e);
} catch (UntrustedIdentityException e) { } catch (UntrustedIdentityException e) {
// This should never happen. // This should never happen.

18
smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoStore.java
View file

@ -23,15 +23,15 @@ package org.jivesoftware.smackx.omemo.signal;
import org.jivesoftware.smackx.omemo.OmemoStore; import org.jivesoftware.smackx.omemo.OmemoStore;
import org.jivesoftware.smackx.omemo.util.OmemoKeyUtil; import org.jivesoftware.smackx.omemo.util.OmemoKeyUtil;
import org.whispersystems.libsignal.IdentityKey; import org.signal.libsignal.protocol.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair; import org.signal.libsignal.protocol.IdentityKeyPair;
import org.whispersystems.libsignal.SessionCipher; import org.signal.libsignal.protocol.SessionCipher;
import org.whispersystems.libsignal.SignalProtocolAddress; import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.whispersystems.libsignal.ecc.ECPublicKey; import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.whispersystems.libsignal.state.PreKeyBundle; import org.signal.libsignal.protocol.state.PreKeyBundle;
import org.whispersystems.libsignal.state.PreKeyRecord; import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SessionRecord; import org.signal.libsignal.protocol.state.SessionRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
/** /**
* Implementation of the OmemoStore using the Signal library. * Implementation of the OmemoStore using the Signal library.

35
smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoStoreConnector.java
View file

@ -35,20 +35,22 @@ import org.jivesoftware.smackx.omemo.internal.OmemoDevice;
import org.jxmpp.jid.BareJid; import org.jxmpp.jid.BareJid;
import org.jxmpp.jid.impl.JidCreate; import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.stringprep.XmppStringprepException; import org.jxmpp.stringprep.XmppStringprepException;
import org.whispersystems.libsignal.IdentityKey; import org.signal.libsignal.protocol.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair; import org.signal.libsignal.protocol.IdentityKeyPair;
import org.whispersystems.libsignal.InvalidKeyIdException; import org.signal.libsignal.protocol.InvalidKeyIdException;
import org.whispersystems.libsignal.SessionCipher; import org.signal.libsignal.protocol.NoSessionException;
import org.whispersystems.libsignal.SignalProtocolAddress; import org.signal.libsignal.protocol.SessionCipher;
import org.whispersystems.libsignal.ecc.ECPublicKey; import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.whispersystems.libsignal.state.IdentityKeyStore; import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.whispersystems.libsignal.state.PreKeyBundle; import org.signal.libsignal.protocol.state.IdentityKeyStore;
import org.whispersystems.libsignal.state.PreKeyRecord; import org.signal.libsignal.protocol.state.PreKeyBundle;
import org.whispersystems.libsignal.state.PreKeyStore; import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SessionRecord; import org.signal.libsignal.protocol.state.PreKeyStore;
import org.whispersystems.libsignal.state.SessionStore; import org.signal.libsignal.protocol.state.SessionRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.signal.libsignal.protocol.state.SessionStore;
import org.whispersystems.libsignal.state.SignedPreKeyStore; import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
import org.signal.libsignal.protocol.state.SignedPreKeyStore;
/** /**
* Class that adapts libsignal-protocol-java's Store classes to the OmemoStore class. * Class that adapts libsignal-protocol-java's Store classes to the OmemoStore class.
@ -200,6 +202,11 @@ public class SignalOmemoStoreConnector
} }
} }
@Override
public List<SessionRecord> loadExistingSessions(List<SignalProtocolAddress> addresses) throws NoSessionException {
throw new RuntimeException("Not implemented.");
}
@Override @Override
public List<Integer> getSubDeviceSessions(String s) { public List<Integer> getSubDeviceSessions(String s) {
BareJid jid; BareJid jid;

6
smack-omemo-signal/src/test/java/org/jivesoftware/smackx/omemo/LegacySignalOmemoKeyUtilTest.java
View file

@ -32,9 +32,9 @@ import org.jivesoftware.smackx.omemo.exceptions.CorruptedOmemoKeyException;
import org.jivesoftware.smackx.omemo.signal.SignalOmemoKeyUtil; import org.jivesoftware.smackx.omemo.signal.SignalOmemoKeyUtil;
import org.junit.Test; import org.junit.Test;
import org.whispersystems.libsignal.IdentityKey; import org.signal.libsignal.protocol.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair; import org.signal.libsignal.protocol.IdentityKeyPair;
import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
/** /**
* Test SignalOmemoKeyUtil methods. * Test SignalOmemoKeyUtil methods.

14
smack-omemo-signal/src/test/java/org/jivesoftware/smackx/omemo/SignalOmemoKeyUtilTest.java
View file

@ -28,13 +28,13 @@ import org.jivesoftware.smackx.omemo.util.OmemoKeyUtil;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.whispersystems.libsignal.IdentityKey; import org.signal.libsignal.protocol.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair; import org.signal.libsignal.protocol.IdentityKeyPair;
import org.whispersystems.libsignal.ecc.ECPublicKey; import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.whispersystems.libsignal.state.PreKeyBundle; import org.signal.libsignal.protocol.state.PreKeyBundle;
import org.whispersystems.libsignal.state.PreKeyRecord; import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SessionRecord; import org.signal.libsignal.protocol.state.SessionRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
/** /**
* smack-omemo-signal implementation of {@link OmemoKeyUtilTest}. * smack-omemo-signal implementation of {@link OmemoKeyUtilTest}.

18
smack-omemo-signal/src/test/java/org/jivesoftware/smackx/omemo/SignalOmemoStoreTest.java
View file

@ -35,15 +35,15 @@ import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.jxmpp.stringprep.XmppStringprepException; import org.jxmpp.stringprep.XmppStringprepException;
import org.whispersystems.libsignal.IdentityKey; import org.signal.libsignal.protocol.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair; import org.signal.libsignal.protocol.IdentityKeyPair;
import org.whispersystems.libsignal.SessionCipher; import org.signal.libsignal.protocol.SessionCipher;
import org.whispersystems.libsignal.SignalProtocolAddress; import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.whispersystems.libsignal.ecc.ECPublicKey; import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.whispersystems.libsignal.state.PreKeyBundle; import org.signal.libsignal.protocol.state.PreKeyBundle;
import org.whispersystems.libsignal.state.PreKeyRecord; import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SessionRecord; import org.signal.libsignal.protocol.state.SessionRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
/** /**
* smack-omemo-signal implementation of {@link OmemoStoreTest}. * smack-omemo-signal implementation of {@link OmemoStoreTest}.