Skip to content

Commit

Permalink
changed package name
Browse files Browse the repository at this point in the history
  • Loading branch information
@Alessandro-Salerno
Alessandro-Salerno committed May 26, 2023
1 parent 98ff306 commit 4f4184a
Show file tree
Hide file tree
Showing 29 changed files with 103 additions and 106 deletions.
33 changes: 15 additions & 18 deletions .idea/workspace.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.alessandrosalerno.ordermatchingengine</groupId>
<artifactId>EncryptedTCP</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.1.3-SNAPSHOT</version>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...salerno/encryptedtcp/EncryptedReader.java → ...salerno/encryptedtcp/EncryptedReader.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.alessandrosalerno.encryptedtcp;
package alessandrosalerno.encryptedtcp;

import alessandrosalerno.framedtcp.FramedReader;

Expand Down
24 changes: 12 additions & 12 deletions ...salerno/encryptedtcp/EncryptedSocket.java → ...salerno/encryptedtcp/EncryptedSocket.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package org.alessandrosalerno.encryptedtcp;

import org.alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import org.alessandrosalerno.encryptedtcp.asymmetric.DefaultAsymmetricEncryptionEngineFactory;
import org.alessandrosalerno.encryptedtcp.handshake.DefaultHandshakeManagerFactory;
import org.alessandrosalerno.encryptedtcp.handshake.HandshakeManager;
import org.alessandrosalerno.encryptedtcp.handshake.HandshakeManagerFactory;
import org.alessandrosalerno.encryptedtcp.handshake.modes.DefaultHandshakeModeFactory;
import org.alessandrosalerno.encryptedtcp.handshake.modes.HandshakeModeFactory;
import org.alessandrosalerno.encryptedtcp.symmetric.DefaultSymmetricEncryptionEngineFactory;
import org.alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngine;
import org.alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;
package alessandrosalerno.encryptedtcp;

import alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.handshake.DefaultHandshakeManagerFactory;
import alessandrosalerno.encryptedtcp.handshake.HandshakeManager;
import alessandrosalerno.encryptedtcp.handshake.HandshakeManagerFactory;
import alessandrosalerno.encryptedtcp.handshake.modes.DefaultHandshakeModeFactory;
import alessandrosalerno.encryptedtcp.handshake.modes.HandshakeModeFactory;
import alessandrosalerno.encryptedtcp.asymmetric.DefaultAsymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.symmetric.DefaultSymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngine;
import alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;
import alessandrosalerno.framedtcp.FramedReader;
import alessandrosalerno.framedtcp.FramedWriter;

Expand Down
2 changes: 1 addition & 1 deletion ...salerno/encryptedtcp/EncryptedWriter.java → ...salerno/encryptedtcp/EncryptedWriter.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.alessandrosalerno.encryptedtcp;
package alessandrosalerno.encryptedtcp;

import alessandrosalerno.framedtcp.FramedWriter;

Expand Down
2 changes: 1 addition & 1 deletion ...alerno/encryptedtcp/EncryptionEngine.java → ...alerno/encryptedtcp/EncryptionEngine.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.alessandrosalerno.encryptedtcp;
package alessandrosalerno.encryptedtcp;

public interface EncryptionEngine {
byte[] encrypt(byte[] message);
Expand Down
4 changes: 2 additions & 2 deletions ...symmetric/AsymmetricEncryptionEngine.java → ...symmetric/AsymmetricEncryptionEngine.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.alessandrosalerno.encryptedtcp.asymmetric;
package alessandrosalerno.encryptedtcp.asymmetric;

import org.alessandrosalerno.encryptedtcp.EncryptionEngine;
import alessandrosalerno.encryptedtcp.EncryptionEngine;

import java.security.PrivateKey;
import java.security.PublicKey;
Expand Down
2 changes: 1 addition & 1 deletion ...ic/AsymmetricEncryptionEngineFactory.java → ...ic/AsymmetricEncryptionEngineFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.alessandrosalerno.encryptedtcp.asymmetric;
package alessandrosalerno.encryptedtcp.asymmetric;

import java.security.KeyPair;

Expand Down
2 changes: 1 addition & 1 deletion ...ic/DefaultAsymmetricEncryptionEngine.java → ...ic/DefaultAsymmetricEncryptionEngine.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.alessandrosalerno.encryptedtcp.asymmetric;
package alessandrosalerno.encryptedtcp.asymmetric;

import javax.crypto.Cipher;
import java.security.*;
Expand Down
2 changes: 1 addition & 1 deletion ...ultAsymmetricEncryptionEngineFactory.java → ...ultAsymmetricEncryptionEngineFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.alessandrosalerno.encryptedtcp.asymmetric;
package alessandrosalerno.encryptedtcp.asymmetric;

import java.security.KeyPair;

Expand Down
2 changes: 1 addition & 1 deletion ...yptedtcp/asymmetric/PublicKeyFactory.java → ...yptedtcp/asymmetric/PublicKeyFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.alessandrosalerno.encryptedtcp.asymmetric;
package alessandrosalerno.encryptedtcp.asymmetric;

import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException;
Expand Down
2 changes: 1 addition & 1 deletion ...IncompatibleProtocolVersionException.java → ...IncompatibleProtocolVersionException.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.alessandrosalerno.encryptedtcp.exceptions;
package alessandrosalerno.encryptedtcp.exceptions;

public class IncompatibleProtocolVersionException extends Exception {
public IncompatibleProtocolVersionException(String otherVersion) {
Expand Down
14 changes: 7 additions & 7 deletions ...cp/handshake/DefaultHandshakeManager.java → ...cp/handshake/DefaultHandshakeManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.alessandrosalerno.encryptedtcp.handshake;
package alessandrosalerno.encryptedtcp.handshake;

import org.alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import org.alessandrosalerno.encryptedtcp.exceptions.IncompatibleProtocolVersionException;
import org.alessandrosalerno.encryptedtcp.handshake.modes.HandshakeMode;
import org.alessandrosalerno.encryptedtcp.handshake.modes.HandshakeModeFactory;
import org.alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngine;
import org.alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.exceptions.IncompatibleProtocolVersionException;
import alessandrosalerno.encryptedtcp.handshake.modes.HandshakeMode;
import alessandrosalerno.encryptedtcp.handshake.modes.HandshakeModeFactory;
import alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngine;
import alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;
import alessandrosalerno.framedtcp.FramedReader;
import alessandrosalerno.framedtcp.FramedWriter;

Expand Down
14 changes: 7 additions & 7 deletions ...shake/DefaultHandshakeManagerFactory.java → ...shake/DefaultHandshakeManagerFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.alessandrosalerno.encryptedtcp.handshake;
package alessandrosalerno.encryptedtcp.handshake;

import org.alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import org.alessandrosalerno.encryptedtcp.asymmetric.DefaultAsymmetricEncryptionEngineFactory;
import org.alessandrosalerno.encryptedtcp.handshake.modes.DefaultHandshakeModeFactory;
import org.alessandrosalerno.encryptedtcp.handshake.modes.HandshakeModeFactory;
import org.alessandrosalerno.encryptedtcp.symmetric.DefaultSymmetricEncryptionEngineFactory;
import org.alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.asymmetric.DefaultAsymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.handshake.modes.DefaultHandshakeModeFactory;
import alessandrosalerno.encryptedtcp.handshake.modes.HandshakeModeFactory;
import alessandrosalerno.encryptedtcp.symmetric.DefaultSymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;

import java.net.Socket;

Expand Down
7 changes: 7 additions & 0 deletions src/main/java/alessandrosalerno/encryptedtcp/handshake/HandshakeManager.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package alessandrosalerno.encryptedtcp.handshake;

import alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngine;

public interface HandshakeManager {
SymmetricEncryptionEngine finalizeHandshake();
}
8 changes: 4 additions & 4 deletions ...cp/handshake/HandshakeManagerFactory.java → ...cp/handshake/HandshakeManagerFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.alessandrosalerno.encryptedtcp.handshake;
package alessandrosalerno.encryptedtcp.handshake;

import org.alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import org.alessandrosalerno.encryptedtcp.handshake.modes.HandshakeModeFactory;
import org.alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.handshake.modes.HandshakeModeFactory;
import alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;

import java.net.Socket;

Expand Down
2 changes: 1 addition & 1 deletion ...cryptedtcp/handshake/HandshakeResult.java → ...cryptedtcp/handshake/HandshakeResult.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.alessandrosalerno.encryptedtcp.handshake;
package alessandrosalerno.encryptedtcp.handshake;

import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
Expand Down
10 changes: 5 additions & 5 deletions ...ke/modes/DefaultHandshakeModeFactory.java → ...ke/modes/DefaultHandshakeModeFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.alessandrosalerno.encryptedtcp.handshake.modes;
package alessandrosalerno.encryptedtcp.handshake.modes;

import org.alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import org.alessandrosalerno.encryptedtcp.handshake.modes.master.DefaultMasterHandshake;
import org.alessandrosalerno.encryptedtcp.handshake.modes.slave.DefaultSlaveHandshake;
import org.alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.handshake.modes.master.DefaultMasterHandshake;
import alessandrosalerno.encryptedtcp.handshake.modes.slave.DefaultSlaveHandshake;
import alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;

import java.net.Socket;

Expand Down
7 changes: 7 additions & 0 deletions src/main/java/alessandrosalerno/encryptedtcp/handshake/modes/HandshakeMode.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package alessandrosalerno.encryptedtcp.handshake.modes;

import alessandrosalerno.encryptedtcp.handshake.HandshakeResult;

public interface HandshakeMode {
HandshakeResult perform();
}
6 changes: 3 additions & 3 deletions ...handshake/modes/HandshakeModeFactory.java → ...handshake/modes/HandshakeModeFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.alessandrosalerno.encryptedtcp.handshake.modes;
package alessandrosalerno.encryptedtcp.handshake.modes;

import org.alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import org.alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;

import java.net.Socket;

Expand Down
20 changes: 10 additions & 10 deletions .../modes/master/DefaultMasterHandshake.java → .../modes/master/DefaultMasterHandshake.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.alessandrosalerno.encryptedtcp.handshake.modes.master;
package alessandrosalerno.encryptedtcp.handshake.modes.master;

import org.alessandrosalerno.encryptedtcp.EncryptedReader;
import org.alessandrosalerno.encryptedtcp.EncryptedWriter;
import org.alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngine;
import org.alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import org.alessandrosalerno.encryptedtcp.asymmetric.PublicKeyFactory;
import org.alessandrosalerno.encryptedtcp.handshake.HandshakeResult;
import org.alessandrosalerno.encryptedtcp.handshake.modes.HandshakeMode;
import org.alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngine;
import org.alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.EncryptedReader;
import alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngine;
import alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.asymmetric.PublicKeyFactory;
import alessandrosalerno.encryptedtcp.handshake.HandshakeResult;
import alessandrosalerno.encryptedtcp.handshake.modes.HandshakeMode;
import alessandrosalerno.encryptedtcp.EncryptedWriter;
import alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngine;
import alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;
import alessandrosalerno.framedtcp.FramedReader;
import alessandrosalerno.framedtcp.FramedWriter;

Expand Down
16 changes: 8 additions & 8 deletions ...ke/modes/slave/DefaultSlaveHandshake.java → ...ke/modes/slave/DefaultSlaveHandshake.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.alessandrosalerno.encryptedtcp.handshake.modes.slave;

import org.alessandrosalerno.encryptedtcp.EncryptedReader;
import org.alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngine;
import org.alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import org.alessandrosalerno.encryptedtcp.handshake.HandshakeResult;
import org.alessandrosalerno.encryptedtcp.handshake.modes.HandshakeMode;
import org.alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;
package alessandrosalerno.encryptedtcp.handshake.modes.slave;

import alessandrosalerno.encryptedtcp.EncryptedReader;
import alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngine;
import alessandrosalerno.encryptedtcp.asymmetric.AsymmetricEncryptionEngineFactory;
import alessandrosalerno.encryptedtcp.handshake.modes.HandshakeMode;
import alessandrosalerno.encryptedtcp.handshake.HandshakeResult;
import alessandrosalerno.encryptedtcp.symmetric.SymmetricEncryptionEngineFactory;
import alessandrosalerno.framedtcp.FramedReader;
import alessandrosalerno.framedtcp.FramedWriter;

Expand Down
2 changes: 1 addition & 1 deletion ...ric/DefaultSymmetricEncryptionEngine.java → ...ric/DefaultSymmetricEncryptionEngine.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.alessandrosalerno.encryptedtcp.symmetric;
package alessandrosalerno.encryptedtcp.symmetric;

import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
Expand Down
2 changes: 1 addition & 1 deletion ...aultSymmetricEncryptionEngineFactory.java → ...aultSymmetricEncryptionEngineFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.alessandrosalerno.encryptedtcp.symmetric;
package alessandrosalerno.encryptedtcp.symmetric;

import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
Expand Down
4 changes: 2 additions & 2 deletions .../symmetric/SymmetricEncryptionEngine.java → .../symmetric/SymmetricEncryptionEngine.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.alessandrosalerno.encryptedtcp.symmetric;
package alessandrosalerno.encryptedtcp.symmetric;

import org.alessandrosalerno.encryptedtcp.EncryptionEngine;
import alessandrosalerno.encryptedtcp.EncryptionEngine;

import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
Expand Down
2 changes: 1 addition & 1 deletion ...ric/SymmetricEncryptionEngineFactory.java → ...ric/SymmetricEncryptionEngineFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.alessandrosalerno.encryptedtcp.symmetric;
package alessandrosalerno.encryptedtcp.symmetric;

import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/org/alessandrosalerno/encryptedtcp/handshake/HandshakeManager.java
View file

This file was deleted.

7 changes: 0 additions & 7 deletions src/main/java/org/alessandrosalerno/encryptedtcp/handshake/modes/HandshakeMode.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/test/java/Test.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import org.alessandrosalerno.encryptedtcp.EncryptedSocket;
import alessandrosalerno.encryptedtcp.EncryptedSocket;

import java.net.ServerSocket;
import java.net.Socket;
Expand Down

0 comments on commit 4f4184a

Please sign in to comment.