1 files changed, 0 insertions, 198 deletions
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/SessionCipherTest.java b/tests/src/main/java/org/whispersystems/libaxolotl/SessionCipherTest.java
deleted file mode 100644
index e956ed77..00000000
--- a/tests/src/main/java/org/whispersystems/libaxolotl/SessionCipherTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.whispersystems.libaxolotl;
-
-import junit.framework.TestCase;
-
-import org.whispersystems.libaxolotl.ecc.Curve;
-import org.whispersystems.libaxolotl.ecc.ECKeyPair;
-import org.whispersystems.libaxolotl.ecc.ECPublicKey;
-import org.whispersystems.libaxolotl.protocol.CiphertextMessage;
-import org.whispersystems.libaxolotl.protocol.WhisperMessage;
-import org.whispersystems.libaxolotl.ratchet.AliceAxolotlParameters;
-import org.whispersystems.libaxolotl.ratchet.BobAxolotlParameters;
-import org.whispersystems.libaxolotl.ratchet.RatchetingSession;
-import org.whispersystems.libaxolotl.state.AxolotlStore;
-import org.whispersystems.libaxolotl.state.SessionRecord;
-import org.whispersystems.libaxolotl.state.SessionState;
-import org.whispersystems.libaxolotl.util.guava.Optional;
-
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-
-
-public class SessionCipherTest extends TestCase {
-
-  public void testBasicSessionV2()
-      throws InvalidKeyException, DuplicateMessageException,
-      LegacyMessageException, InvalidMessageException, NoSuchAlgorithmException, NoSessionException
-  {
-    SessionRecord aliceSessionRecord = new SessionRecord();
-    SessionRecord bobSessionRecord   = new SessionRecord();
-
-    initializeSessionsV2(aliceSessionRecord.getSessionState(), bobSessionRecord.getSessionState());
-    runInteraction(aliceSessionRecord, bobSessionRecord);
-  }
-
-  public void testBasicSessionV3()
-      throws InvalidKeyException, DuplicateMessageException,
-      LegacyMessageException, InvalidMessageException, NoSuchAlgorithmException, NoSessionException
-  {
-    SessionRecord aliceSessionRecord = new SessionRecord();
-    SessionRecord bobSessionRecord   = new SessionRecord();
-
-    initializeSessionsV3(aliceSessionRecord.getSessionState(), bobSessionRecord.getSessionState());
-    runInteraction(aliceSessionRecord, bobSessionRecord);
-  }
-
-  private void runInteraction(SessionRecord aliceSessionRecord, SessionRecord bobSessionRecord)
-      throws DuplicateMessageException, LegacyMessageException, InvalidMessageException, NoSuchAlgorithmException, NoSessionException {
-    AxolotlStore aliceStore = new InMemoryAxolotlStore();
-    AxolotlStore bobStore   = new InMemoryAxolotlStore();
-
-    aliceStore.storeSession(2L, 1, aliceSessionRecord);
-    bobStore.storeSession(3L, 1, bobSessionRecord);
-
-    SessionCipher     aliceCipher    = new SessionCipher(aliceStore, 2L, 1);
-    SessionCipher     bobCipher      = new SessionCipher(bobStore, 3L, 1);
-
-    byte[]            alicePlaintext = "This is a plaintext message.".getBytes();
-    CiphertextMessage message        = aliceCipher.encrypt(alicePlaintext);
-    byte[]            bobPlaintext   = bobCipher.decrypt(new WhisperMessage(message.serialize()));
-
-    assertTrue(Arrays.equals(alicePlaintext, bobPlaintext));
-
-    byte[]            bobReply      = "This is a message from Bob.".getBytes();
-    CiphertextMessage reply         = bobCipher.encrypt(bobReply);
-    byte[]            receivedReply = aliceCipher.decrypt(new WhisperMessage(reply.serialize()));
-
-    assertTrue(Arrays.equals(bobReply, receivedReply));
-
-    List<CiphertextMessage> aliceCiphertextMessages = new ArrayList<>();
-    List<byte[]>            alicePlaintextMessages  = new ArrayList<>();
-
-    for (int i=0;i<50;i++) {
-      alicePlaintextMessages.add(("смерть за смерть " + i).getBytes());
-      aliceCiphertextMessages.add(aliceCipher.encrypt(("смерть за смерть " + i).getBytes()));
-    }
-
-    long seed = System.currentTimeMillis();
-
-    Collections.shuffle(aliceCiphertextMessages, new Random(seed));
-    Collections.shuffle(alicePlaintextMessages, new Random(seed));
-
-    for (int i=0;i<aliceCiphertextMessages.size() / 2;i++) {
-      byte[] receivedPlaintext = bobCipher.decrypt(new WhisperMessage(aliceCiphertextMessages.get(i).serialize()));
-      assertTrue(Arrays.equals(receivedPlaintext, alicePlaintextMessages.get(i)));
-    }
-
-    List<CiphertextMessage> bobCiphertextMessages = new ArrayList<>();
-    List<byte[]>            bobPlaintextMessages  = new ArrayList<>();
-
-    for (int i=0;i<20;i++) {
-      bobPlaintextMessages.add(("смерть за смерть " + i).getBytes());
-      bobCiphertextMessages.add(bobCipher.encrypt(("смерть за смерть " + i).getBytes()));
-    }
-
-    seed = System.currentTimeMillis();
-
-    Collections.shuffle(bobCiphertextMessages, new Random(seed));
-    Collections.shuffle(bobPlaintextMessages, new Random(seed));
-
-    for (int i=0;i<bobCiphertextMessages.size() / 2;i++) {
-      byte[] receivedPlaintext = aliceCipher.decrypt(new WhisperMessage(bobCiphertextMessages.get(i).serialize()));
-      assertTrue(Arrays.equals(receivedPlaintext, bobPlaintextMessages.get(i)));
-    }
-
-    for (int i=aliceCiphertextMessages.size()/2;i<aliceCiphertextMessages.size();i++) {
-      byte[] receivedPlaintext = bobCipher.decrypt(new WhisperMessage(aliceCiphertextMessages.get(i).serialize()));
-      assertTrue(Arrays.equals(receivedPlaintext, alicePlaintextMessages.get(i)));
-    }
-
-    for (int i=bobCiphertextMessages.size() / 2;i<bobCiphertextMessages.size();i++) {
-      byte[] receivedPlaintext = aliceCipher.decrypt(new WhisperMessage(bobCiphertextMessages.get(i).serialize()));
-      assertTrue(Arrays.equals(receivedPlaintext, bobPlaintextMessages.get(i)));
-    }
-  }
-
-
-  private void initializeSessionsV2(SessionState aliceSessionState, SessionState bobSessionState)
-      throws InvalidKeyException
-  {
-    ECKeyPair       aliceIdentityKeyPair = Curve.generateKeyPair();
-    IdentityKeyPair aliceIdentityKey     = new IdentityKeyPair(new IdentityKey(aliceIdentityKeyPair.getPublicKey()),
-                                                               aliceIdentityKeyPair.getPrivateKey());
-    ECKeyPair       aliceBaseKey         = Curve.generateKeyPair();
-    ECKeyPair       aliceEphemeralKey    = Curve.generateKeyPair();
-
-    ECKeyPair       bobIdentityKeyPair   = Curve.generateKeyPair();
-    IdentityKeyPair bobIdentityKey       = new IdentityKeyPair(new IdentityKey(bobIdentityKeyPair.getPublicKey()),
-                                                               bobIdentityKeyPair.getPrivateKey());
-    ECKeyPair       bobBaseKey           = Curve.generateKeyPair();
-    ECKeyPair       bobEphemeralKey      = bobBaseKey;
-
-    AliceAxolotlParameters aliceParameters = AliceAxolotlParameters.newBuilder()
-        .setOurIdentityKey(aliceIdentityKey)
-        .setOurBaseKey(aliceBaseKey)
-        .setTheirIdentityKey(bobIdentityKey.getPublicKey())
-        .setTheirSignedPreKey(bobEphemeralKey.getPublicKey())
-        .setTheirRatchetKey(bobEphemeralKey.getPublicKey())
-        .setTheirOneTimePreKey(Optional.<ECPublicKey>absent())
-        .create();
-
-    BobAxolotlParameters bobParameters = BobAxolotlParameters.newBuilder()
-        .setOurIdentityKey(bobIdentityKey)
-        .setOurOneTimePreKey(Optional.<ECKeyPair>absent())
-        .setOurRatchetKey(bobEphemeralKey)
-        .setOurSignedPreKey(bobBaseKey)
-        .setTheirBaseKey(aliceBaseKey.getPublicKey())
-        .setTheirIdentityKey(aliceIdentityKey.getPublicKey())
-        .create();
-
-    RatchetingSession.initializeSession(aliceSessionState, 2, aliceParameters);
-    RatchetingSession.initializeSession(bobSessionState, 2, bobParameters);
-  }
-
-  private void initializeSessionsV3(SessionState aliceSessionState, SessionState bobSessionState)
-      throws InvalidKeyException
-  {
-    ECKeyPair       aliceIdentityKeyPair = Curve.generateKeyPair();
-    IdentityKeyPair aliceIdentityKey     = new IdentityKeyPair(new IdentityKey(aliceIdentityKeyPair.getPublicKey()),
-                                                               aliceIdentityKeyPair.getPrivateKey());
-    ECKeyPair       aliceBaseKey         = Curve.generateKeyPair();
-    ECKeyPair       aliceEphemeralKey    = Curve.generateKeyPair();
-
-    ECKeyPair       alicePreKey          = aliceBaseKey;
-
-    ECKeyPair       bobIdentityKeyPair   = Curve.generateKeyPair();
-    IdentityKeyPair bobIdentityKey       = new IdentityKeyPair(new IdentityKey(bobIdentityKeyPair.getPublicKey()),
-                                                               bobIdentityKeyPair.getPrivateKey());
-    ECKeyPair       bobBaseKey           = Curve.generateKeyPair();
-    ECKeyPair       bobEphemeralKey      = bobBaseKey;
-
-    ECKeyPair       bobPreKey            = Curve.generateKeyPair();
-
-    AliceAxolotlParameters aliceParameters = AliceAxolotlParameters.newBuilder()
-        .setOurBaseKey(aliceBaseKey)
-        .setOurIdentityKey(aliceIdentityKey)
-        .setTheirOneTimePreKey(Optional.<ECPublicKey>absent())
-        .setTheirRatchetKey(bobEphemeralKey.getPublicKey())
-        .setTheirSignedPreKey(bobBaseKey.getPublicKey())
-        .setTheirIdentityKey(bobIdentityKey.getPublicKey())
-        .create();
-
-    BobAxolotlParameters bobParameters = BobAxolotlParameters.newBuilder()
-        .setOurRatchetKey(bobEphemeralKey)
-        .setOurSignedPreKey(bobBaseKey)
-        .setOurOneTimePreKey(Optional.<ECKeyPair>absent())
-        .setOurIdentityKey(bobIdentityKey)
-        .setTheirIdentityKey(aliceIdentityKey.getPublicKey())
-        .setTheirBaseKey(aliceBaseKey.getPublicKey())
-        .create();
-
-    RatchetingSession.initializeSession(aliceSessionState, 3, aliceParameters);
-    RatchetingSession.initializeSession(bobSessionState, 3, bobParameters);
-  }
-}