mirror/libsignal
0
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2024-09-20 03:52:17 +02:00
Code

Java: reorganize package structure

Browse Source 
- org.whispersystems.libsignal -> org.signal.libsignal.protocol
- org.whispersystems.libsignal.protocol ->
    org.signal.libsignal.protocol.messages
- org.whispersystems.libsignal.util.AndroidSignalProtocolLogger ->
    org.signal.libsignal.logging.AndroidSignalProtocolLogger
- org.signal.zkgroup -> org.signal.libsignal.zkgroup
- org.signal.devicetransfer -> org.signal.libsignal.devicetransfer
  (test only)
- org.signal.client.internal -> org.signal.libsignal.internal
This commit is contained in:
Jordan Rose 2022-03-22 14:35:26 -07:00
parent f98b7394ec
commit a0c1745f8b
167 changed files with 777 additions and 775 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/android/src/main/AndroidManifest.xml
View File

@ -1,3 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.whispersystems.libsignal">
package="org.signal.libsignal">
</manifest>

4
java/android/src/main/java/org/whispersystems/libsignal/util/AndroidSignalProtocolLogger.java → java/android/src/main/java/org/signal/libsignal/protocol/logging/AndroidSignalProtocolLogger.java
View File

@ -3,13 +3,11 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.util;
package org.signal.libsignal.protocol.logging;
import android.util.Log;
import android.util.SparseIntArray;
import org.whispersystems.libsignal.logging.SignalProtocolLogger;
public class AndroidSignalProtocolLogger implements SignalProtocolLogger {
private static final SparseIntArray PRIORITY_MAP = new SparseIntArray(5) {{

6
java/client/src/main/java/org/signal/libsignal/crypto/Aes256Ctr32.java
View File

@ -5,9 +5,9 @@
package org.signal.libsignal.crypto;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.whispersystems.libsignal.InvalidKeyException;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.signal.libsignal.protocol.InvalidKeyException;
public class Aes256Ctr32 implements NativeHandleGuard.Owner {
private final long unsafeHandle;

6
java/client/src/main/java/org/signal/libsignal/crypto/Aes256GcmDecryption.java
View File

@ -5,9 +5,9 @@
package org.signal.libsignal.crypto;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.whispersystems.libsignal.InvalidKeyException;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.signal.libsignal.protocol.InvalidKeyException;
public class Aes256GcmDecryption implements NativeHandleGuard.Owner {
public static final int TAG_SIZE_IN_BYTES = 16;

6
java/client/src/main/java/org/signal/libsignal/crypto/Aes256GcmEncryption.java
View File

@ -5,9 +5,9 @@
package org.signal.libsignal.crypto;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.whispersystems.libsignal.InvalidKeyException;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.signal.libsignal.protocol.InvalidKeyException;
public class Aes256GcmEncryption implements NativeHandleGuard.Owner {
private long unsafeHandle;

8
java/client/src/main/java/org/signal/libsignal/crypto/Aes256GcmSiv.java
View File

@ -5,10 +5,10 @@
package org.signal.libsignal.crypto;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.InvalidKeyException;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.InvalidKeyException;
class Aes256GcmSiv implements NativeHandleGuard.Owner {
private final long unsafeHandle;

4
java/client/src/main/java/org/signal/libsignal/crypto/CryptographicHash.java
View File

@ -5,8 +5,8 @@
package org.signal.libsignal.crypto;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
public class CryptographicHash implements NativeHandleGuard.Owner {
private final long unsafeHandle;

4
java/client/src/main/java/org/signal/libsignal/crypto/CryptographicMac.java
View File

@ -5,8 +5,8 @@
package org.signal.libsignal.crypto;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
public class CryptographicMac implements NativeHandleGuard.Owner {
private final long unsafeHandle;

2
java/client/src/main/java/org/signal/libsignal/devicetransfer/DeviceTransferKey.java
View File

@ -5,7 +5,7 @@
package org.signal.libsignal.devicetransfer;
import org.signal.client.internal.Native;
import org.signal.libsignal.internal.Native;
public class DeviceTransferKey {
byte[] keyMaterial;

6
java/client/src/main/java/org/signal/libsignal/hsmenclave/HsmEnclaveClient.java
View File

@ -5,9 +5,9 @@
package org.signal.libsignal.hsmenclave;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.whispersystems.libsignal.InvalidKeyException;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.signal.libsignal.protocol.InvalidKeyException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;

2
java/client/src/main/java/org/signal/libsignal/metadata/ProtocolInvalidKeyException.java
View File

@ -1,7 +1,7 @@
package org.signal.libsignal.metadata;
import org.signal.libsignal.metadata.protocol.UnidentifiedSenderMessageContent;
import org.whispersystems.libsignal.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidKeyException;
public class ProtocolInvalidKeyException extends ProtocolException {
public ProtocolInvalidKeyException(InvalidKeyException e, String sender, int senderDevice) {

2
java/client/src/main/java/org/signal/libsignal/metadata/ProtocolInvalidMessageException.java
View File

@ -1,7 +1,7 @@
package org.signal.libsignal.metadata;
import org.signal.libsignal.metadata.protocol.UnidentifiedSenderMessageContent;
import org.whispersystems.libsignal.InvalidMessageException;
import org.signal.libsignal.protocol.InvalidMessageException;
public class ProtocolInvalidMessageException extends ProtocolException {
public ProtocolInvalidMessageException(InvalidMessageException e, String sender, int senderDevice) {

2
java/client/src/main/java/org/signal/libsignal/metadata/ProtocolInvalidVersionException.java
View File

@ -1,7 +1,7 @@
package org.signal.libsignal.metadata;
import org.signal.libsignal.metadata.protocol.UnidentifiedSenderMessageContent;
import org.whispersystems.libsignal.InvalidVersionException;
import org.signal.libsignal.protocol.InvalidVersionException;
public class ProtocolInvalidVersionException extends ProtocolException {
public ProtocolInvalidVersionException(InvalidVersionException e, String sender, int senderDevice) {

2
java/client/src/main/java/org/signal/libsignal/metadata/ProtocolLegacyMessageException.java
View File

@ -1,7 +1,7 @@
package org.signal.libsignal.metadata;
import org.signal.libsignal.metadata.protocol.UnidentifiedSenderMessageContent;
import org.whispersystems.libsignal.LegacyMessageException;
import org.signal.libsignal.protocol.LegacyMessageException;
public class ProtocolLegacyMessageException extends ProtocolException {
public ProtocolLegacyMessageException(LegacyMessageException e, String sender, int senderDeviceId) {

2
java/client/src/main/java/org/signal/libsignal/metadata/ProtocolNoSessionException.java
View File

@ -1,7 +1,7 @@
package org.signal.libsignal.metadata;
import org.signal.libsignal.metadata.protocol.UnidentifiedSenderMessageContent;
import org.whispersystems.libsignal.NoSessionException;
import org.signal.libsignal.protocol.NoSessionException;
public class ProtocolNoSessionException extends ProtocolException {
public ProtocolNoSessionException(NoSessionException e, String sender, int senderDevice) {

2
java/client/src/main/java/org/signal/libsignal/metadata/ProtocolUntrustedIdentityException.java
View File

@ -1,7 +1,7 @@
package org.signal.libsignal.metadata;
import org.signal.libsignal.metadata.protocol.UnidentifiedSenderMessageContent;
import org.whispersystems.libsignal.UntrustedIdentityException;
import org.signal.libsignal.protocol.UntrustedIdentityException;
public class ProtocolUntrustedIdentityException extends ProtocolException {
public ProtocolUntrustedIdentityException(UntrustedIdentityException e, String sender, int senderDevice) {

46
java/client/src/main/java/org/signal/libsignal/metadata/SealedSessionCipher.java
View File

@ -4,30 +4,30 @@ import org.signal.libsignal.metadata.certificate.CertificateValidator;
import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
import org.signal.libsignal.metadata.certificate.SenderCertificate;
import org.signal.libsignal.metadata.protocol.UnidentifiedSenderMessageContent;
import org.whispersystems.libsignal.DuplicateMessageException;
import org.whispersystems.libsignal.IdentityKeyPair;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidKeyIdException;
import org.whispersystems.libsignal.InvalidMacException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.InvalidRegistrationIdException;
import org.whispersystems.libsignal.InvalidVersionException;
import org.whispersystems.libsignal.LegacyMessageException;
import org.whispersystems.libsignal.NoSessionException;
import org.whispersystems.libsignal.SessionCipher;
import org.whispersystems.libsignal.SignalProtocolAddress;
import org.whispersystems.libsignal.UntrustedIdentityException;
import org.whispersystems.libsignal.groups.GroupCipher;
import org.whispersystems.libsignal.protocol.CiphertextMessage;
import org.whispersystems.libsignal.protocol.PlaintextContent;
import org.whispersystems.libsignal.protocol.PreKeySignalMessage;
import org.whispersystems.libsignal.protocol.SenderKeyMessage;
import org.whispersystems.libsignal.protocol.SignalMessage;
import org.whispersystems.libsignal.state.SessionRecord;
import org.whispersystems.libsignal.state.SignalProtocolStore;
import org.signal.libsignal.protocol.DuplicateMessageException;
import org.signal.libsignal.protocol.IdentityKeyPair;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidKeyIdException;
import org.signal.libsignal.protocol.InvalidMacException;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.InvalidRegistrationIdException;
import org.signal.libsignal.protocol.InvalidVersionException;
import org.signal.libsignal.protocol.LegacyMessageException;
import org.signal.libsignal.protocol.NoSessionException;
import org.signal.libsignal.protocol.SessionCipher;
import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.signal.libsignal.protocol.UntrustedIdentityException;
import org.signal.libsignal.protocol.groups.GroupCipher;
import org.signal.libsignal.protocol.message.CiphertextMessage;
import org.signal.libsignal.protocol.message.PlaintextContent;
import org.signal.libsignal.protocol.message.PreKeySignalMessage;
import org.signal.libsignal.protocol.message.SenderKeyMessage;
import org.signal.libsignal.protocol.message.SignalMessage;
import org.signal.libsignal.protocol.state.SessionRecord;
import org.signal.libsignal.protocol.state.SignalProtocolStore;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import java.util.List;
import java.util.Optional;

10
java/client/src/main/java/org/signal/libsignal/metadata/certificate/CertificateValidator.java
View File

@ -1,11 +1,11 @@
package org.signal.libsignal.metadata.certificate;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.whispersystems.libsignal.InvalidKeyException;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.signal.libsignal.protocol.InvalidKeyException;
public class CertificateValidator {
private final ECPublicKey trustRoot;

10
java/client/src/main/java/org/signal/libsignal/metadata/certificate/SenderCertificate.java
View File

@ -1,11 +1,11 @@
package org.signal.libsignal.metadata.certificate;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidMessageException;
import java.util.Optional;

12
java/client/src/main/java/org/signal/libsignal/metadata/certificate/ServerCertificate.java
View File

@ -1,12 +1,12 @@
package org.signal.libsignal.metadata.certificate;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
public class ServerCertificate implements NativeHandleGuard.Owner {
private final long unsafeHandle;

6
java/client/src/main/java/org/signal/libsignal/metadata/protocol/UnidentifiedSenderMessageContent.java
View File

@ -1,12 +1,12 @@
package org.signal.libsignal.metadata.protocol;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.signal.libsignal.metadata.InvalidMetadataMessageException;
import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
import org.signal.libsignal.metadata.certificate.SenderCertificate;
import org.whispersystems.libsignal.protocol.CiphertextMessage;
import org.signal.libsignal.protocol.message.CiphertextMessage;
import java.util.Optional;

4
java/client/src/test/java/org/signal/libsignal/crypto/Aes256Ctr32Tests.java
View File

@ -7,8 +7,8 @@ package org.signal.libsignal.crypto;
import java.io.IOException;
import junit.framework.TestCase;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.util.Hex;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.util.Hex;
public class Aes256Ctr32Tests extends TestCase {

6
java/client/src/test/java/org/signal/libsignal/crypto/Aes256GcmEncryptionTests.java
View File

@ -7,9 +7,9 @@ package org.signal.libsignal.crypto;
import java.io.IOException;
import junit.framework.TestCase;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.util.Hex;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.util.Hex;
public class Aes256GcmEncryptionTests extends TestCase {

6
java/client/src/test/java/org/signal/libsignal/crypto/Aes256GcmSivTests.java
View File

@ -7,9 +7,9 @@ package org.signal.libsignal.crypto;
import java.io.IOException;
import junit.framework.TestCase;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.util.Hex;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.util.Hex;
public class Aes256GcmSivTests extends TestCase {

2
java/client/src/test/java/org/signal/libsignal/crypto/CryptographicHashTests.java
View File

@ -6,7 +6,7 @@
package org.signal.libsignal.crypto;
import junit.framework.TestCase;
import org.signal.libsignal.crypto.CryptographicHash;
import org.whispersystems.libsignal.util.Hex;
import org.signal.libsignal.protocol.util.Hex;
public class CryptographicHashTests extends TestCase {

2
java/client/src/test/java/org/signal/libsignal/crypto/CryptographicMacTests.java
View File

@ -6,7 +6,7 @@
package org.signal.libsignal.crypto;
import junit.framework.TestCase;
import org.signal.libsignal.crypto.CryptographicMac;
import org.whispersystems.libsignal.util.Hex;
import org.signal.libsignal.protocol.util.Hex;
public class CryptographicMacTests extends TestCase {

0
java/client/src/test/java/org/signal/devicetransfer/DeviceTransferKeyTest.java → java/client/src/test/java/org/signal/libsignal/devicetransfer/DeviceTransferKeyTest.java
View File

56
java/client/src/test/java/org/signal/libsignal/metadata/SealedSessionCipherTest.java
View File

@ -8,36 +8,36 @@ import org.signal.libsignal.metadata.certificate.CertificateValidator;
import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
import org.signal.libsignal.metadata.certificate.SenderCertificate;
import org.signal.libsignal.metadata.certificate.ServerCertificate;
import org.whispersystems.libsignal.IdentityKeyPair;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.InvalidRegistrationIdException;
import org.whispersystems.libsignal.InvalidVersionException;
import org.whispersystems.libsignal.LegacyMessageException;
import org.whispersystems.libsignal.NoSessionException;
import org.whispersystems.libsignal.SessionBuilder;
import org.whispersystems.libsignal.SessionCipher;
import org.whispersystems.libsignal.SignalProtocolAddress;
import org.whispersystems.libsignal.UntrustedIdentityException;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.whispersystems.libsignal.groups.GroupCipher;
import org.whispersystems.libsignal.groups.GroupSessionBuilder;
import org.whispersystems.libsignal.protocol.CiphertextMessage;
import org.whispersystems.libsignal.protocol.DecryptionErrorMessage;
import org.whispersystems.libsignal.protocol.PlaintextContent;
import org.whispersystems.libsignal.protocol.SenderKeyDistributionMessage;
import org.whispersystems.libsignal.state.PreKeyBundle;
import org.whispersystems.libsignal.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SessionRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.signal.libsignal.protocol.IdentityKeyPair;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.InvalidRegistrationIdException;
import org.signal.libsignal.protocol.InvalidVersionException;
import org.signal.libsignal.protocol.LegacyMessageException;
import org.signal.libsignal.protocol.NoSessionException;
import org.signal.libsignal.protocol.SessionBuilder;
import org.signal.libsignal.protocol.SessionCipher;
import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.signal.libsignal.protocol.UntrustedIdentityException;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.signal.libsignal.protocol.groups.GroupCipher;
import org.signal.libsignal.protocol.groups.GroupSessionBuilder;
import org.signal.libsignal.protocol.message.CiphertextMessage;
import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
import org.signal.libsignal.protocol.message.PlaintextContent;
import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage;
import org.signal.libsignal.protocol.state.PreKeyBundle;
import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.signal.libsignal.protocol.state.SessionRecord;
import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.whispersystems.libsignal.util.Hex;
import org.whispersystems.libsignal.util.Pair;
import org.signal.libsignal.protocol.util.Hex;
import org.signal.libsignal.protocol.util.Pair;
import java.util.ArrayList;
import java.util.Arrays;

14
java/client/src/test/java/org/signal/libsignal/metadata/TestInMemorySignalProtocolStore.java
View File

@ -1,13 +1,13 @@
package org.signal.libsignal.metadata;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.whispersystems.libsignal.state.impl.InMemorySignalProtocolStore;
import org.whispersystems.libsignal.util.KeyHelper;
import org.signal.libsignal.protocol.IdentityKey;
import org.signal.libsignal.protocol.IdentityKeyPair;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
import org.signal.libsignal.protocol.state.impl.InMemorySignalProtocolStore;
import org.signal.libsignal.protocol.util.KeyHelper;
public class TestInMemorySignalProtocolStore extends InMemorySignalProtocolStore {
public TestInMemorySignalProtocolStore() {

14
java/client/src/test/java/org/signal/libsignal/metadata/certificate/SenderCertificateTest.java
View File

@ -2,14 +2,14 @@ package org.signal.libsignal.metadata.certificate;
import junit.framework.TestCase;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.whispersystems.libsignal.ecc.ECPrivateKey;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.signal.libsignal.protocol.ecc.ECPrivateKey;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import java.util.UUID;

10
java/client/src/test/java/org/signal/libsignal/metadata/certificate/ServerCertificateTest.java
View File

@ -2,12 +2,12 @@ package org.signal.libsignal.metadata.certificate;
import junit.framework.TestCase;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
public class ServerCertificateTest extends TestCase {

6
java/client/src/test/java/org/whispersystems/libsignal/CurveTest.java → java/client/src/test/java/org/signal/libsignal/protocol/CurveTest.java
View File

@ -1,9 +1,9 @@
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import junit.framework.TestCase;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
public class CurveTest extends TestCase {

6
java/client/src/test/java/org/whispersystems/libsignal/IdentityKeyTest.java → java/client/src/test/java/org/signal/libsignal/protocol/IdentityKeyTest.java
View File

@ -3,11 +3,11 @@
// SPDX-License-Identifier: AGPL-3.0-only
//
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import junit.framework.TestCase;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair;
import org.signal.libsignal.protocol.IdentityKey;
import org.signal.libsignal.protocol.IdentityKeyPair;
public class IdentityKeyTest extends TestCase {
public void testSignAlternateKey() {

10
java/client/src/test/java/org/whispersystems/libsignal/PlaintextContentTest.java → java/client/src/test/java/org/signal/libsignal/protocol/PlaintextContentTest.java
View File

@ -3,13 +3,13 @@
// SPDX-License-Identifier: AGPL-3.0-only
//
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import org.junit.Test;
import org.whispersystems.libsignal.protocol.CiphertextMessage;
import org.whispersystems.libsignal.protocol.DecryptionErrorMessage;
import org.whispersystems.libsignal.protocol.PlaintextContent;
import org.whispersystems.libsignal.util.Hex;
import org.signal.libsignal.protocol.message.CiphertextMessage;
import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
import org.signal.libsignal.protocol.message.PlaintextContent;
import org.signal.libsignal.protocol.util.Hex;
import java.util.Arrays;

26
java/client/src/test/java/org/whispersystems/libsignal/SessionBuilderTest.java → java/client/src/test/java/org/signal/libsignal/protocol/SessionBuilderTest.java
View File

@ -1,19 +1,19 @@
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import junit.framework.TestCase;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.protocol.CiphertextMessage;
import org.whispersystems.libsignal.protocol.PreKeySignalMessage;
import org.whispersystems.libsignal.protocol.SignalMessage;
import org.whispersystems.libsignal.state.IdentityKeyStore;
import org.whispersystems.libsignal.state.PreKeyBundle;
import org.whispersystems.libsignal.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SessionRecord;
import org.whispersystems.libsignal.state.SignalProtocolStore;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.whispersystems.libsignal.util.Pair;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.signal.libsignal.protocol.message.CiphertextMessage;
import org.signal.libsignal.protocol.message.PreKeySignalMessage;
import org.signal.libsignal.protocol.message.SignalMessage;
import org.signal.libsignal.protocol.state.IdentityKeyStore;
import org.signal.libsignal.protocol.state.PreKeyBundle;
import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.signal.libsignal.protocol.state.SessionRecord;
import org.signal.libsignal.protocol.state.SignalProtocolStore;
import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
import org.signal.libsignal.protocol.util.Pair;
import java.util.HashSet;
import java.util.Set;

20
java/client/src/test/java/org/whispersystems/libsignal/SessionCipherTest.java → java/client/src/test/java/org/signal/libsignal/protocol/SessionCipherTest.java
View File

@ -1,16 +1,16 @@
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import junit.framework.TestCase;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.whispersystems.libsignal.ecc.ECPrivateKey;
import org.whispersystems.libsignal.protocol.CiphertextMessage;
import org.whispersystems.libsignal.protocol.SignalMessage;
import org.whispersystems.libsignal.state.SignalProtocolStore;
import org.whispersystems.libsignal.state.SessionRecord;
import org.whispersystems.libsignal.util.Pair;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.signal.libsignal.protocol.ecc.ECPrivateKey;
import org.signal.libsignal.protocol.message.CiphertextMessage;
import org.signal.libsignal.protocol.message.SignalMessage;
import org.signal.libsignal.protocol.state.SignalProtocolStore;
import org.signal.libsignal.protocol.state.SessionRecord;
import org.signal.libsignal.protocol.util.Pair;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;

4
java/client/src/test/java/org/whispersystems/libsignal/SessionRecordTest.java → java/client/src/test/java/org/signal/libsignal/protocol/SessionRecordTest.java
View File

@ -3,10 +3,10 @@
// SPDX-License-Identifier: AGPL-3.0-only
//
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import junit.framework.TestCase;
import org.whispersystems.libsignal.state.SessionRecord;
import org.signal.libsignal.protocol.state.SessionRecord;
public class SessionRecordTest extends TestCase {

22
java/client/src/test/java/org/whispersystems/libsignal/SimultaneousInitiateTests.java → java/client/src/test/java/org/signal/libsignal/protocol/SimultaneousInitiateTests.java
View File

@ -1,17 +1,17 @@
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import junit.framework.TestCase;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.protocol.CiphertextMessage;
import org.whispersystems.libsignal.protocol.PreKeySignalMessage;
import org.whispersystems.libsignal.protocol.SignalMessage;
import org.whispersystems.libsignal.state.SignalProtocolStore;
import org.whispersystems.libsignal.state.PreKeyBundle;
import org.whispersystems.libsignal.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.whispersystems.libsignal.util.Medium;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.signal.libsignal.protocol.message.CiphertextMessage;
import org.signal.libsignal.protocol.message.PreKeySignalMessage;
import org.signal.libsignal.protocol.message.SignalMessage;
import org.signal.libsignal.protocol.state.SignalProtocolStore;
import org.signal.libsignal.protocol.state.PreKeyBundle;
import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
import org.signal.libsignal.protocol.util.Medium;
import java.util.Arrays;
import java.util.Random;

6
java/client/src/test/java/org/whispersystems/libsignal/TestBadSignedPreKeysStore.java → java/client/src/test/java/org/signal/libsignal/protocol/TestBadSignedPreKeysStore.java
View File

@ -1,7 +1,7 @@
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import org.whispersystems.libsignal.InvalidKeyIdException;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.signal.libsignal.protocol.InvalidKeyIdException;
import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
public class TestBadSignedPreKeysStore extends TestInMemorySignalProtocolStore {
public static class CustomException extends RuntimeException {

10
java/client/src/test/java/org/whispersystems/libsignal/TestInMemoryIdentityKeyStore.java → java/client/src/test/java/org/signal/libsignal/protocol/TestInMemoryIdentityKeyStore.java
View File

@ -1,10 +1,10 @@
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.util.KeyHelper;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.signal.libsignal.protocol.util.KeyHelper;
public class TestInMemoryIdentityKeyStore extends org.whispersystems.libsignal.state.impl.InMemoryIdentityKeyStore {
public class TestInMemoryIdentityKeyStore extends org.signal.libsignal.protocol.state.impl.InMemoryIdentityKeyStore {
public TestInMemoryIdentityKeyStore() {
super(generateIdentityKeyPair(), generateRegistrationId());
}

10
java/client/src/test/java/org/whispersystems/libsignal/TestInMemorySignalProtocolStore.java → java/client/src/test/java/org/signal/libsignal/protocol/TestInMemorySignalProtocolStore.java
View File

@ -1,9 +1,9 @@
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.state.impl.InMemorySignalProtocolStore;
import org.whispersystems.libsignal.util.KeyHelper;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.signal.libsignal.protocol.state.impl.InMemorySignalProtocolStore;
import org.signal.libsignal.protocol.util.KeyHelper;
public class TestInMemorySignalProtocolStore extends InMemorySignalProtocolStore {
public TestInMemorySignalProtocolStore() {

6
java/client/src/test/java/org/whispersystems/libsignal/TestNoSignedPreKeysStore.java → java/client/src/test/java/org/signal/libsignal/protocol/TestNoSignedPreKeysStore.java
View File

@ -1,7 +1,7 @@
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import org.whispersystems.libsignal.InvalidKeyIdException;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.signal.libsignal.protocol.InvalidKeyIdException;
import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
public class TestNoSignedPreKeysStore extends TestInMemorySignalProtocolStore {
@Override

4
java/client/src/test/java/org/whispersystems/libsignal/ecc/Curve25519Test.java → java/client/src/test/java/org/signal/libsignal/protocol/ecc/Curve25519Test.java
View File

@ -1,8 +1,8 @@
package org.whispersystems.libsignal.ecc;
package org.signal.libsignal.protocol.ecc;
import junit.framework.TestCase;
import org.whispersystems.libsignal.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidKeyException;
import java.util.Arrays;

8
java/client/src/test/java/org/whispersystems/libsignal/fingerprint/NumericFingerprintGeneratorTest.java → java/client/src/test/java/org/signal/libsignal/protocol/fingerprint/NumericFingerprintGeneratorTest.java
View File

@ -1,10 +1,10 @@
package org.whispersystems.libsignal.fingerprint;
package org.signal.libsignal.protocol.fingerprint;
import junit.framework.TestCase;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.signal.libsignal.protocol.IdentityKey;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import java.util.Arrays;

22
java/client/src/test/java/org/whispersystems/libsignal/groups/GroupCipherTest.java → java/client/src/test/java/org/signal/libsignal/protocol/groups/GroupCipherTest.java
View File

@ -1,17 +1,17 @@
package org.whispersystems.libsignal.groups;
package org.signal.libsignal.protocol.groups;
import junit.framework.TestCase;
import org.whispersystems.libsignal.SignalProtocolAddress;
import org.whispersystems.libsignal.DuplicateMessageException;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.InvalidVersionException;
import org.whispersystems.libsignal.LegacyMessageException;
import org.whispersystems.libsignal.NoSessionException;
import org.whispersystems.libsignal.groups.state.InMemorySenderKeyStore;
import org.whispersystems.libsignal.protocol.CiphertextMessage;
import org.whispersystems.libsignal.protocol.SenderKeyDistributionMessage;
import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.signal.libsignal.protocol.DuplicateMessageException;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.InvalidVersionException;
import org.signal.libsignal.protocol.LegacyMessageException;
import org.signal.libsignal.protocol.NoSessionException;
import org.signal.libsignal.protocol.groups.state.InMemorySenderKeyStore;
import org.signal.libsignal.protocol.message.CiphertextMessage;
import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;

2
java/client/src/test/java/org/whispersystems/libsignal/kdf/HKDFTest.java → java/client/src/test/java/org/signal/libsignal/protocol/kdf/HKDFTest.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.libsignal.kdf;
package org.signal.libsignal.protocol.kdf;
import junit.framework.TestCase;

18
java/client/src/test/java/org/whispersystems/libsignal/ratchet/RatchetingSessionTest.java → java/client/src/test/java/org/signal/libsignal/protocol/ratchet/RatchetingSessionTest.java
View File

@ -1,15 +1,15 @@
package org.whispersystems.libsignal.ratchet;
package org.signal.libsignal.protocol.ratchet;
import junit.framework.TestCase;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.ecc.ECPrivateKey;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.whispersystems.libsignal.state.SessionRecord;
import org.signal.libsignal.protocol.IdentityKey;
import org.signal.libsignal.protocol.IdentityKeyPair;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.signal.libsignal.protocol.ecc.ECPrivateKey;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.signal.libsignal.protocol.state.SessionRecord;
import java.util.Arrays;

6
java/client/src/test/java/org/signal/zkgroup/RandomnessTest.java → java/client/src/test/java/org/signal/libsignal/zkgroup/RandomnessTest.java
View File

@ -3,11 +3,11 @@
// SPDX-License-Identifier: AGPL-3.0-only
//
package org.signal.zkgroup;
package org.signal.libsignal.zkgroup;
import org.junit.Test;
import org.signal.zkgroup.internal.*;
import org.whispersystems.libsignal.util.Hex;
import org.signal.libsignal.zkgroup.internal.*;
import org.signal.libsignal.protocol.util.Hex;
import java.io.IOException;
import java.security.SecureRandom;

2
java/client/src/test/java/org/signal/zkgroup/SecureRandomTest.java → java/client/src/test/java/org/signal/libsignal/zkgroup/SecureRandomTest.java
View File

@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0-only
//
package org.signal.zkgroup;
package org.signal.libsignal.zkgroup;
import java.security.SecureRandom;
import java.security.SecureRandomSpi;

68
java/client/src/test/java/org/signal/zkgroup/integrationtests/ZkGroupTest.java → java/client/src/test/java/org/signal/libsignal/zkgroup/integrationtests/ZkGroupTest.java
View File

@ -3,44 +3,44 @@
// SPDX-License-Identifier: AGPL-3.0-only
//
package org.signal.zkgroup.integrationtests;
package org.signal.libsignal.zkgroup.integrationtests;
import java.io.UnsupportedEncodingException;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.signal.zkgroup.InvalidInputException;
import org.signal.zkgroup.NotarySignature;
import org.signal.zkgroup.SecureRandomTest;
import org.signal.zkgroup.ServerPublicParams;
import org.signal.zkgroup.ServerSecretParams;
import org.signal.zkgroup.VerificationFailedException;
import org.signal.zkgroup.InvalidRedemptionTimeException;
import org.signal.zkgroup.auth.AuthCredential;
import org.signal.zkgroup.auth.AuthCredentialPresentation;
import org.signal.zkgroup.auth.AuthCredentialResponse;
import org.signal.zkgroup.auth.ClientZkAuthOperations;
import org.signal.zkgroup.auth.ServerZkAuthOperations;
import org.signal.zkgroup.groups.ClientZkGroupCipher;
import org.signal.zkgroup.groups.GroupMasterKey;
import org.signal.zkgroup.groups.GroupPublicParams;
import org.signal.zkgroup.groups.GroupSecretParams;
import org.signal.zkgroup.groups.ProfileKeyCiphertext;
import org.signal.zkgroup.groups.UuidCiphertext;
import org.signal.zkgroup.profiles.ClientZkProfileOperations;
import org.signal.zkgroup.profiles.PniCredential;
import org.signal.zkgroup.profiles.PniCredentialPresentation;
import org.signal.zkgroup.profiles.PniCredentialRequestContext;
import org.signal.zkgroup.profiles.PniCredentialResponse;
import org.signal.zkgroup.profiles.ProfileKey;
import org.signal.zkgroup.profiles.ProfileKeyCommitment;
import org.signal.zkgroup.profiles.ProfileKeyCredential;
import org.signal.zkgroup.profiles.ProfileKeyCredentialPresentation;
import org.signal.zkgroup.profiles.ProfileKeyCredentialRequest;
import org.signal.zkgroup.profiles.ProfileKeyCredentialRequestContext;
import org.signal.zkgroup.profiles.ProfileKeyCredentialResponse;
import org.signal.zkgroup.profiles.ProfileKeyVersion;
import org.signal.zkgroup.profiles.ServerZkProfileOperations;
import org.whispersystems.libsignal.util.Hex;
import org.signal.libsignal.zkgroup.InvalidInputException;
import org.signal.libsignal.zkgroup.NotarySignature;
import org.signal.libsignal.zkgroup.SecureRandomTest;
import org.signal.libsignal.zkgroup.ServerPublicParams;
import org.signal.libsignal.zkgroup.ServerSecretParams;
import org.signal.libsignal.zkgroup.VerificationFailedException;
import org.signal.libsignal.zkgroup.InvalidRedemptionTimeException;
import org.signal.libsignal.zkgroup.auth.AuthCredential;
import org.signal.libsignal.zkgroup.auth.AuthCredentialPresentation;
import org.signal.libsignal.zkgroup.auth.AuthCredentialResponse;
import org.signal.libsignal.zkgroup.auth.ClientZkAuthOperations;
import org.signal.libsignal.zkgroup.auth.ServerZkAuthOperations;
import org.signal.libsignal.zkgroup.groups.ClientZkGroupCipher;
import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
import org.signal.libsignal.zkgroup.groups.GroupPublicParams;
import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
import org.signal.libsignal.zkgroup.groups.ProfileKeyCiphertext;
import org.signal.libsignal.zkgroup.groups.UuidCiphertext;
import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
import org.signal.libsignal.zkgroup.profiles.PniCredential;
import org.signal.libsignal.zkgroup.profiles.PniCredentialPresentation;
import org.signal.libsignal.zkgroup.profiles.PniCredentialRequestContext;
import org.signal.libsignal.zkgroup.profiles.PniCredentialResponse;
import org.signal.libsignal.zkgroup.profiles.ProfileKey;
import org.signal.libsignal.zkgroup.profiles.ProfileKeyCommitment;
import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential;
import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialPresentation;
import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequest;
import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequestContext;
import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialResponse;
import org.signal.libsignal.zkgroup.profiles.ProfileKeyVersion;
import org.signal.libsignal.zkgroup.profiles.ServerZkProfileOperations;
import org.signal.libsignal.protocol.util.Hex;
import java.security.SecureRandom;
import java.util.Arrays;

18
java/shared/java/org/signal/client/internal/Native.java → java/shared/java/org/signal/libsignal/internal/Native.java
View File

@ -5,16 +5,16 @@
// WARNING: this file was automatically generated
package org.signal.client.internal;
package org.signal.libsignal.internal;
import org.whispersystems.libsignal.protocol.CiphertextMessage;
import org.whispersystems.libsignal.state.IdentityKeyStore;
import org.whispersystems.libsignal.state.SessionStore;
import org.whispersystems.libsignal.state.PreKeyStore;
import org.whispersystems.libsignal.state.SignedPreKeyStore;
import org.whispersystems.libsignal.groups.state.SenderKeyStore;
import org.whispersystems.libsignal.logging.Log;
import org.whispersystems.libsignal.logging.SignalProtocolLogger;
import org.signal.libsignal.protocol.message.CiphertextMessage;
import org.signal.libsignal.protocol.state.IdentityKeyStore;
import org.signal.libsignal.protocol.state.SessionStore;
import org.signal.libsignal.protocol.state.PreKeyStore;
import org.signal.libsignal.protocol.state.SignedPreKeyStore;
import org.signal.libsignal.protocol.groups.state.SenderKeyStore;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.libsignal.protocol.logging.SignalProtocolLogger;
import java.io.File;
import java.io.FileOutputStream;

2
java/shared/java/org/signal/client/internal/NativeHandleGuard.java → java/shared/java/org/signal/libsignal/internal/NativeHandleGuard.java
View File

@ -4,7 +4,7 @@
* Licensed according to the LICENSE file in this repository.
*/
package org.signal.client.internal;
package org.signal.libsignal.internal;
/**
* Provides access to a Rust object handle while keeping the Java wrapper alive.

2
java/shared/java/org/whispersystems/libsignal/DuplicateMessageException.java → java/shared/java/org/signal/libsignal/protocol/DuplicateMessageException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
public class DuplicateMessageException extends Exception {
public DuplicateMessageException(String s) {

12
java/shared/java/org/whispersystems/libsignal/IdentityKey.java → java/shared/java/org/signal/libsignal/protocol/IdentityKey.java
View File

@ -3,14 +3,14 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.whispersystems.libsignal.util.Hex;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.signal.libsignal.protocol.util.Hex;
/**
* A class for representing an identity key.

14
java/shared/java/org/whispersystems/libsignal/IdentityKeyPair.java → java/shared/java/org/signal/libsignal/protocol/IdentityKeyPair.java
View File

@ -3,15 +3,15 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.ecc.ECPrivateKey;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.signal.libsignal.protocol.ecc.Curve;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.signal.libsignal.protocol.ecc.ECPrivateKey;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
/**
* Holder for public and private identity key pair.

2
java/shared/java/org/whispersystems/libsignal/InvalidKeyException.java → java/shared/java/org/signal/libsignal/protocol/InvalidKeyException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
public class InvalidKeyException extends Exception {

2
java/shared/java/org/whispersystems/libsignal/InvalidKeyIdException.java → java/shared/java/org/signal/libsignal/protocol/InvalidKeyIdException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
public class InvalidKeyIdException extends Exception {
public InvalidKeyIdException(String detailMessage) {

2
java/shared/java/org/whispersystems/libsignal/InvalidMacException.java → java/shared/java/org/signal/libsignal/protocol/InvalidMacException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
public class InvalidMacException extends Exception {

2
java/shared/java/org/whispersystems/libsignal/InvalidMessageException.java → java/shared/java/org/signal/libsignal/protocol/InvalidMessageException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import java.util.List;

2
java/shared/java/org/whispersystems/libsignal/InvalidRegistrationIdException.java → java/shared/java/org/signal/libsignal/protocol/InvalidRegistrationIdException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
public class InvalidRegistrationIdException extends Exception {

2
java/shared/java/org/whispersystems/libsignal/InvalidSessionException.java → java/shared/java/org/signal/libsignal/protocol/InvalidSessionException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
public class InvalidSessionException extends IllegalStateException {
public InvalidSessionException(String detailMessage) {

2
java/shared/java/org/whispersystems/libsignal/InvalidVersionException.java → java/shared/java/org/signal/libsignal/protocol/InvalidVersionException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
public class InvalidVersionException extends Exception {
public InvalidVersionException(String detailMessage) {

2
java/shared/java/org/whispersystems/libsignal/LegacyMessageException.java → java/shared/java/org/signal/libsignal/protocol/LegacyMessageException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
public class LegacyMessageException extends Exception {
public LegacyMessageException(String s) {

2
java/shared/java/org/whispersystems/libsignal/NoSessionException.java → java/shared/java/org/signal/libsignal/protocol/NoSessionException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
public class NoSessionException extends Exception {
public NoSessionException(String s) {

38
java/shared/java/org/whispersystems/libsignal/SessionBuilder.java → java/shared/java/org/signal/libsignal/protocol/SessionBuilder.java
View File

@ -3,28 +3,28 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.whispersystems.libsignal.logging.Log;
import org.whispersystems.libsignal.state.IdentityKeyStore;
import org.whispersystems.libsignal.state.PreKeyBundle;
import org.whispersystems.libsignal.state.PreKeyStore;
import org.whispersystems.libsignal.state.SessionRecord;
import org.whispersystems.libsignal.state.SessionStore;
import org.whispersystems.libsignal.state.SignalProtocolStore;
import org.whispersystems.libsignal.state.SignedPreKeyStore;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.libsignal.protocol.state.IdentityKeyStore;
import org.signal.libsignal.protocol.state.PreKeyBundle;
import org.signal.libsignal.protocol.state.PreKeyStore;
import org.signal.libsignal.protocol.state.SessionRecord;
import org.signal.libsignal.protocol.state.SessionStore;
import org.signal.libsignal.protocol.state.SignalProtocolStore;
import org.signal.libsignal.protocol.state.SignedPreKeyStore;
/**
* SessionBuilder is responsible for setting up encrypted sessions.
* Once a session has been established, {@link org.whispersystems.libsignal.SessionCipher}
* Once a session has been established, {@link org.signal.libsignal.protocol.SessionCipher}
* can be used to encrypt/decrypt messages in that session.
* <p>
* Sessions are built from one of three different possible vectors:
* <ol>
* <li>A {@link org.whispersystems.libsignal.state.PreKeyBundle} retrieved from a server.</li>
* <li>A {@link org.signal.libsignal.protocol.state.PreKeyBundle} retrieved from a server.</li>
* <li>A {@link PreKeySignalMessage} received from a client.</li>
* </ol>
*
@ -47,9 +47,9 @@ public class SessionBuilder {
/**
* Constructs a SessionBuilder.
*
* @param sessionStore The {@link org.whispersystems.libsignal.state.SessionStore} to store the constructed session in.
* @param preKeyStore The {@link org.whispersystems.libsignal.state.PreKeyStore} where the client's local {@link org.whispersystems.libsignal.state.PreKeyRecord}s are stored.
* @param identityKeyStore The {@link org.whispersystems.libsignal.state.IdentityKeyStore} containing the client's identity key information.
* @param sessionStore The {@link org.signal.libsignal.protocol.state.SessionStore} to store the constructed session in.
* @param preKeyStore The {@link org.signal.libsignal.protocol.state.PreKeyStore} where the client's local {@link org.signal.libsignal.protocol.state.PreKeyRecord}s are stored.
* @param identityKeyStore The {@link org.signal.libsignal.protocol.state.IdentityKeyStore} containing the client's identity key information.
* @param remoteAddress The address of the remote user to build a session with.
*/
public SessionBuilder(SessionStore sessionStore,
@ -75,13 +75,13 @@ public class SessionBuilder {
}
/**
* Build a new session from a {@link org.whispersystems.libsignal.state.PreKeyBundle} retrieved from
* Build a new session from a {@link org.signal.libsignal.protocol.state.PreKeyBundle} retrieved from
* a server.
*
* @param preKey A PreKey for the destination recipient, retrieved from a server.
* @throws InvalidKeyException when the {@link org.whispersystems.libsignal.state.PreKeyBundle} is
* @throws InvalidKeyException when the {@link org.signal.libsignal.protocol.state.PreKeyBundle} is
* badly formatted.
* @throws org.whispersystems.libsignal.UntrustedIdentityException when the sender's
* @throws org.signal.libsignal.protocol.UntrustedIdentityException when the sender's
* {@link IdentityKey} is not
* trusted.
*/

28
java/shared/java/org/whispersystems/libsignal/SessionCipher.java → java/shared/java/org/signal/libsignal/protocol/SessionCipher.java
View File

@ -3,21 +3,21 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.whispersystems.libsignal.protocol.CiphertextMessage;
import org.whispersystems.libsignal.protocol.PreKeySignalMessage;
import org.whispersystems.libsignal.protocol.SignalMessage;
import org.whispersystems.libsignal.state.SignalProtocolStore;
import org.whispersystems.libsignal.state.IdentityKeyStore;
import org.whispersystems.libsignal.state.PreKeyStore;
import org.whispersystems.libsignal.state.SessionRecord;
import org.whispersystems.libsignal.state.SessionStore;
import org.whispersystems.libsignal.state.SignedPreKeyStore;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.signal.libsignal.protocol.message.CiphertextMessage;
import org.signal.libsignal.protocol.message.PreKeySignalMessage;
import org.signal.libsignal.protocol.message.SignalMessage;
import org.signal.libsignal.protocol.state.SignalProtocolStore;
import org.signal.libsignal.protocol.state.IdentityKeyStore;
import org.signal.libsignal.protocol.state.PreKeyStore;
import org.signal.libsignal.protocol.state.SessionRecord;
import org.signal.libsignal.protocol.state.SessionStore;
import org.signal.libsignal.protocol.state.SignedPreKeyStore;
import java.security.InvalidAlgorithmParameterException;
import java.security.NoSuchAlgorithmException;
@ -88,7 +88,7 @@ public class SessionCipher {
* @return The plaintext.
* @throws InvalidMessageException if the input is not valid ciphertext.
* @throws DuplicateMessageException if the input is a message that has already been received.
* @throws InvalidKeyIdException when there is no local {@link org.whispersystems.libsignal.state.PreKeyRecord}
* @throws InvalidKeyIdException when there is no local {@link org.signal.libsignal.protocol.state.PreKeyRecord}
* that corresponds to the PreKey ID in the message.
* @throws InvalidKeyException when the message is formatted incorrectly.
* @throws UntrustedIdentityException when the {@link IdentityKey} of the sender is untrusted.

6
java/shared/java/org/whispersystems/libsignal/SignalProtocolAddress.java → java/shared/java/org/signal/libsignal/protocol/SignalProtocolAddress.java
View File

@ -3,10 +3,10 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
public class SignalProtocolAddress implements NativeHandleGuard.Owner {
private final long unsafeHandle;

2
java/shared/java/org/whispersystems/libsignal/UntrustedIdentityException.java → java/shared/java/org/signal/libsignal/protocol/UntrustedIdentityException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
public class UntrustedIdentityException extends Exception {

4
java/shared/java/org/whispersystems/libsignal/ecc/Curve.java → java/shared/java/org/signal/libsignal/protocol/ecc/Curve.java
View File

@ -3,8 +3,8 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.ecc;
import org.whispersystems.libsignal.InvalidKeyException;
package org.signal.libsignal.protocol.ecc;
import org.signal.libsignal.protocol.InvalidKeyException;
public class Curve {
public static final int DJB_TYPE = 0x05;

2
java/shared/java/org/whispersystems/libsignal/ecc/ECKeyPair.java → java/shared/java/org/signal/libsignal/protocol/ecc/ECKeyPair.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.ecc;
package org.signal.libsignal.protocol.ecc;
public class ECKeyPair {

6
java/shared/java/org/whispersystems/libsignal/ecc/ECPrivateKey.java → java/shared/java/org/signal/libsignal/protocol/ecc/ECPrivateKey.java
View File

@ -4,10 +4,10 @@
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.ecc;
package org.signal.libsignal.protocol.ecc;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
public class ECPrivateKey implements NativeHandleGuard.Owner {
private final long unsafeHandle;

6
java/shared/java/org/whispersystems/libsignal/ecc/ECPublicKey.java → java/shared/java/org/signal/libsignal/protocol/ecc/ECPublicKey.java
View File

@ -4,10 +4,10 @@
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.ecc;
package org.signal.libsignal.protocol.ecc;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import java.util.Arrays;
public class ECPublicKey implements Comparable<ECPublicKey>, NativeHandleGuard.Owner {

4
java/shared/java/org/whispersystems/libsignal/fingerprint/DisplayableFingerprint.java → java/shared/java/org/signal/libsignal/protocol/fingerprint/DisplayableFingerprint.java
View File

@ -3,9 +3,9 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.fingerprint;
package org.signal.libsignal.protocol.fingerprint;
import org.signal.client.internal.Native;
import org.signal.libsignal.internal.Native;
public class DisplayableFingerprint {
private String displayString;

2
java/shared/java/org/whispersystems/libsignal/fingerprint/Fingerprint.java → java/shared/java/org/signal/libsignal/protocol/fingerprint/Fingerprint.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.fingerprint;
package org.signal.libsignal.protocol.fingerprint;
public class Fingerprint {

4
java/shared/java/org/whispersystems/libsignal/fingerprint/FingerprintGenerator.java → java/shared/java/org/signal/libsignal/protocol/fingerprint/FingerprintGenerator.java
View File

@ -3,9 +3,9 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.fingerprint;
package org.signal.libsignal.protocol.fingerprint;
import org.whispersystems.libsignal.IdentityKey;
import org.signal.libsignal.protocol.IdentityKey;
import java.util.List;

2
java/shared/java/org/whispersystems/libsignal/fingerprint/FingerprintParsingException.java → java/shared/java/org/signal/libsignal/protocol/fingerprint/FingerprintParsingException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.fingerprint;
package org.signal.libsignal.protocol.fingerprint;
public class FingerprintParsingException extends Exception {

2
java/shared/java/org/whispersystems/libsignal/fingerprint/FingerprintVersionMismatchException.java → java/shared/java/org/signal/libsignal/protocol/fingerprint/FingerprintVersionMismatchException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.fingerprint;
package org.signal.libsignal.protocol.fingerprint;
public class FingerprintVersionMismatchException extends Exception {

6
java/shared/java/org/whispersystems/libsignal/fingerprint/NumericFingerprintGenerator.java → java/shared/java/org/signal/libsignal/protocol/fingerprint/NumericFingerprintGenerator.java
View File

@ -3,10 +3,10 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.fingerprint;
package org.signal.libsignal.protocol.fingerprint;
import org.signal.client.internal.Native;
import org.whispersystems.libsignal.IdentityKey;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.protocol.IdentityKey;
public class NumericFingerprintGenerator implements FingerprintGenerator {
private final int iterations;

4
java/shared/java/org/whispersystems/libsignal/fingerprint/ScannableFingerprint.java → java/shared/java/org/signal/libsignal/protocol/fingerprint/ScannableFingerprint.java
View File

@ -3,9 +3,9 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.fingerprint;
package org.signal.libsignal.protocol.fingerprint;
import org.signal.client.internal.Native;
import org.signal.libsignal.internal.Native;
public class ScannableFingerprint {
private final byte[] encodedFingerprint;

26
java/shared/java/org/whispersystems/libsignal/groups/GroupCipher.java → java/shared/java/org/signal/libsignal/protocol/groups/GroupCipher.java
View File

@ -3,18 +3,18 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.groups;
package org.signal.libsignal.protocol.groups;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.whispersystems.libsignal.DuplicateMessageException;
import org.whispersystems.libsignal.InvalidKeyIdException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.LegacyMessageException;
import org.whispersystems.libsignal.NoSessionException;
import org.whispersystems.libsignal.SignalProtocolAddress;
import org.whispersystems.libsignal.groups.state.SenderKeyStore;
import org.whispersystems.libsignal.protocol.CiphertextMessage;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.signal.libsignal.protocol.DuplicateMessageException;
import org.signal.libsignal.protocol.InvalidKeyIdException;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.LegacyMessageException;
import org.signal.libsignal.protocol.NoSessionException;
import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.signal.libsignal.protocol.groups.state.SenderKeyStore;
import org.signal.libsignal.protocol.message.CiphertextMessage;
import java.security.InvalidAlgorithmParameterException;
import java.security.NoSuchAlgorithmException;
@ -23,8 +23,8 @@ import java.util.UUID;
/**
* The main entry point for Signal Protocol group encrypt/decrypt operations.
*
* Once a session has been established with {@link org.whispersystems.libsignal.groups.GroupSessionBuilder}
* and a {@link org.whispersystems.libsignal.protocol.SenderKeyDistributionMessage} has been
* Once a session has been established with {@link org.signal.libsignal.protocol.groups.GroupSessionBuilder}
* and a {@link org.signal.libsignal.protocol.message.SenderKeyDistributionMessage} has been
* distributed to each member of the group, this class can be used for all subsequent encrypt/decrypt
* operations within that session (ie: until group membership changes).
*

14
java/shared/java/org/whispersystems/libsignal/groups/GroupSessionBuilder.java → java/shared/java/org/signal/libsignal/protocol/groups/GroupSessionBuilder.java
View File

@ -3,20 +3,20 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.groups;
package org.signal.libsignal.protocol.groups;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.whispersystems.libsignal.SignalProtocolAddress;
import org.whispersystems.libsignal.groups.state.SenderKeyStore;
import org.whispersystems.libsignal.protocol.SenderKeyDistributionMessage;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.signal.libsignal.protocol.groups.state.SenderKeyStore;
import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage;
import java.util.UUID;
/**
* GroupSessionBuilder is responsible for setting up group SenderKey encrypted sessions.
*
* Once a session has been established, {@link org.whispersystems.libsignal.groups.GroupCipher}
* Once a session has been established, {@link org.signal.libsignal.protocol.groups.GroupCipher}
* can be used to encrypt/decrypt messages in that session.
* <p>
* The built sessions are unidirectional: they can be used either for sending or for receiving,

2
java/shared/java/org/whispersystems/libsignal/groups/InvalidSenderKeySessionException.java → java/shared/java/org/signal/libsignal/protocol/groups/InvalidSenderKeySessionException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal;
package org.signal.libsignal.protocol;
import java.util.UUID;

12
java/shared/java/org/whispersystems/libsignal/groups/state/InMemorySenderKeyStore.java → java/shared/java/org/signal/libsignal/protocol/groups/state/InMemorySenderKeyStore.java
View File

@ -1,10 +1,10 @@
package org.whispersystems.libsignal.groups.state;
package org.signal.libsignal.protocol.groups.state;
import org.whispersystems.libsignal.groups.state.SenderKeyRecord;
import org.whispersystems.libsignal.groups.state.SenderKeyStore;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.SignalProtocolAddress;
import org.whispersystems.libsignal.util.Pair;
import org.signal.libsignal.protocol.groups.state.SenderKeyRecord;
import org.signal.libsignal.protocol.groups.state.SenderKeyStore;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.signal.libsignal.protocol.util.Pair;
import java.util.HashMap;
import java.util.Map;

8
java/shared/java/org/whispersystems/libsignal/groups/state/SenderKeyRecord.java → java/shared/java/org/signal/libsignal/protocol/groups/state/SenderKeyRecord.java
View File

@ -3,11 +3,11 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.groups.state;
package org.signal.libsignal.protocol.groups.state;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.whispersystems.libsignal.InvalidMessageException;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.signal.libsignal.protocol.InvalidMessageException;
/**
* A durable representation of a set of SenderKeyStates for a specific

8
java/shared/java/org/whispersystems/libsignal/groups/state/SenderKeyStore.java → java/shared/java/org/signal/libsignal/protocol/groups/state/SenderKeyStore.java
View File

@ -3,16 +3,16 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.groups.state;
package org.signal.libsignal.protocol.groups.state;
import org.whispersystems.libsignal.SignalProtocolAddress;
import org.signal.libsignal.protocol.SignalProtocolAddress;
import java.util.UUID;
public interface SenderKeyStore {
/**
* Commit to storage the {@link org.whispersystems.libsignal.groups.state.SenderKeyRecord} for a
* Commit to storage the {@link org.signal.libsignal.protocol.groups.state.SenderKeyRecord} for a
* given (distributionId + senderName + deviceId) tuple.
*
* @param sender The address of the current client.
@ -22,7 +22,7 @@ public interface SenderKeyStore {
public void storeSenderKey(SignalProtocolAddress sender, UUID distributionId, SenderKeyRecord record);
/**
* Returns a copy of the {@link org.whispersystems.libsignal.groups.state.SenderKeyRecord}
* Returns a copy of the {@link org.signal.libsignal.protocol.groups.state.SenderKeyRecord}
* corresponding to the (distributionId + senderName + deviceId) tuple, or `null` if one does not
* exist.
*

4
java/shared/java/org/whispersystems/libsignal/kdf/HKDF.java → java/shared/java/org/signal/libsignal/protocol/kdf/HKDF.java
View File

@ -4,9 +4,9 @@
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.kdf;
package org.signal.libsignal.protocol.kdf;
import org.signal.client.internal.Native;
import org.signal.libsignal.internal.Native;
public abstract class HKDF {
public static byte[] deriveSecrets(byte[] inputKeyMaterial, byte[] info, int outputLength) {

2
java/shared/java/org/whispersystems/libsignal/kdf/HKDFv3.java → java/shared/java/org/signal/libsignal/protocol/kdf/HKDFv3.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.kdf;
package org.signal.libsignal.protocol.kdf;
/**
* @deprecated Use the static methods of {@link HKDF} instead.

2
java/shared/java/org/whispersystems/libsignal/logging/Log.java → java/shared/java/org/signal/libsignal/protocol/logging/Log.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.logging;
package org.signal.libsignal.protocol.logging;
import java.io.PrintWriter;
import java.io.StringWriter;

2
java/shared/java/org/whispersystems/libsignal/logging/SignalProtocolLogger.java → java/shared/java/org/signal/libsignal/protocol/logging/SignalProtocolLogger.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.logging;
package org.signal.libsignal.protocol.logging;
public interface SignalProtocolLogger {

2
java/shared/java/org/whispersystems/libsignal/logging/SignalProtocolLoggerProvider.java → java/shared/java/org/signal/libsignal/protocol/logging/SignalProtocolLoggerProvider.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.logging;
package org.signal.libsignal.protocol.logging;
public class SignalProtocolLoggerProvider {

2
java/shared/java/org/whispersystems/libsignal/protocol/CiphertextMessage.java → java/shared/java/org/signal/libsignal/protocol/message/CiphertextMessage.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.protocol;
package org.signal.libsignal.protocol.message;
public interface CiphertextMessage {

10
java/shared/java/org/whispersystems/libsignal/protocol/DecryptionErrorMessage.java → java/shared/java/org/signal/libsignal/protocol/message/DecryptionErrorMessage.java
View File

@ -3,13 +3,13 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.protocol;
package org.signal.libsignal.protocol.message;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import java.util.Optional;

10
java/shared/java/org/whispersystems/libsignal/protocol/PlaintextContent.java → java/shared/java/org/signal/libsignal/protocol/message/PlaintextContent.java
View File

@ -3,13 +3,13 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.protocol;
package org.signal.libsignal.protocol.message;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.InvalidVersionException;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.InvalidVersionException;
public final class PlaintextContent implements CiphertextMessage, NativeHandleGuard.Owner {

18
java/shared/java/org/whispersystems/libsignal/protocol/PreKeySignalMessage.java → java/shared/java/org/signal/libsignal/protocol/message/PreKeySignalMessage.java
View File

@ -3,16 +3,16 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.protocol;
package org.signal.libsignal.protocol.message;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.InvalidVersionException;
import org.whispersystems.libsignal.LegacyMessageException;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.signal.libsignal.protocol.IdentityKey;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.InvalidVersionException;
import org.signal.libsignal.protocol.LegacyMessageException;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import java.util.Optional;

16
java/shared/java/org/whispersystems/libsignal/protocol/SenderKeyDistributionMessage.java → java/shared/java/org/signal/libsignal/protocol/message/SenderKeyDistributionMessage.java
View File

@ -3,16 +3,16 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.protocol;
package org.signal.libsignal.protocol.message;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.InvalidVersionException;
import org.whispersystems.libsignal.LegacyMessageException;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.InvalidVersionException;
import org.signal.libsignal.protocol.LegacyMessageException;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import java.util.UUID;

18
java/shared/java/org/whispersystems/libsignal/protocol/SenderKeyMessage.java → java/shared/java/org/signal/libsignal/protocol/message/SenderKeyMessage.java
View File

@ -3,17 +3,17 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.protocol;
package org.signal.libsignal.protocol.message;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.InvalidVersionException;
import org.whispersystems.libsignal.LegacyMessageException;
import org.whispersystems.libsignal.ecc.ECPrivateKey;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.InvalidVersionException;
import org.signal.libsignal.protocol.LegacyMessageException;
import org.signal.libsignal.protocol.ecc.ECPrivateKey;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import java.text.ParseException;
import java.util.UUID;

20
java/shared/java/org/whispersystems/libsignal/protocol/SignalMessage.java → java/shared/java/org/signal/libsignal/protocol/message/SignalMessage.java
View File

@ -3,17 +3,17 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.protocol;
package org.signal.libsignal.protocol.message;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.InvalidVersionException;
import org.whispersystems.libsignal.LegacyMessageException;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.whispersystems.libsignal.util.ByteUtil;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.signal.libsignal.protocol.IdentityKey;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.InvalidVersionException;
import org.signal.libsignal.protocol.LegacyMessageException;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
import org.signal.libsignal.protocol.util.ByteUtil;
import javax.crypto.spec.SecretKeySpec;

8
java/shared/java/org/whispersystems/libsignal/state/IdentityKeyStore.java → java/shared/java/org/signal/libsignal/protocol/state/IdentityKeyStore.java
View File

@ -3,11 +3,11 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.state;
package org.signal.libsignal.protocol.state;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair;
import org.whispersystems.libsignal.SignalProtocolAddress;
import org.signal.libsignal.protocol.IdentityKey;
import org.signal.libsignal.protocol.IdentityKeyPair;
import org.signal.libsignal.protocol.SignalProtocolAddress;
/**
* Provides an interface to identity information.

12
java/shared/java/org/whispersystems/libsignal/state/PreKeyBundle.java → java/shared/java/org/signal/libsignal/protocol/state/PreKeyBundle.java
View File

@ -3,12 +3,12 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.state;
package org.signal.libsignal.protocol.state;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.signal.libsignal.protocol.IdentityKey;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
/**
* A class that contains a remote PreKey and collection
@ -104,7 +104,7 @@ public class PreKeyBundle implements NativeHandleGuard.Owner {
}
/**
* @return the {@link org.whispersystems.libsignal.IdentityKey} of this PreKeys owner.
* @return the {@link org.signal.libsignal.protocol.IdentityKey} of this PreKeys owner.
*/
public IdentityKey getIdentityKey() {
try (NativeHandleGuard guard = new NativeHandleGuard(this)) {

16
java/shared/java/org/whispersystems/libsignal/state/PreKeyRecord.java → java/shared/java/org/signal/libsignal/protocol/state/PreKeyRecord.java
View File

@ -3,15 +3,15 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.whispersystems.libsignal.state;
package org.signal.libsignal.protocol.state;
import org.signal.client.internal.Native;
import org.signal.client.internal.NativeHandleGuard;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.ecc.ECPrivateKey;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.signal.libsignal.internal.Native;
import org.signal.libsignal.internal.NativeHandleGuard;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.InvalidMessageException;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.signal.libsignal.protocol.ecc.ECPrivateKey;
import org.signal.libsignal.protocol.ecc.ECPublicKey;
public class PreKeyRecord implements NativeHandleGuard.Owner {
private final long unsafeHandle;

Some files were not shown because too many files have changed in this diff Show More