summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/aizistral/nochatreports
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/aizistral/nochatreports')
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java6
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java40
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java57
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryption.java25
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java32
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java41
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java88
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryption.java56
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java56
-rw-r--r--src/main/java/com/aizistral/nochatreports/encryption/Encryption.java26
11 files changed, 362 insertions, 67 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
index 889d9b8..caae64d 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
@@ -6,7 +6,7 @@ import java.util.List;
import java.util.Optional;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
-import com.aizistral.nochatreports.encryption.AESEncryptor;
+import com.aizistral.nochatreports.encryption.AESCFB8Encryptor;
import com.aizistral.nochatreports.encryption.Encryptor;
import com.aizistral.nochatreports.gui.UnsafeServerScreen;
import com.aizistral.nochatreports.mixins.client.MixinChatListener;
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java
index 1c24bc4..fa4e974 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
-import com.aizistral.nochatreports.encryption.AESEncryptor;
+import com.aizistral.nochatreports.encryption.AESCFB8Encryptor;
import com.aizistral.nochatreports.encryption.Encryption;
import com.aizistral.nochatreports.encryption.Encryptor;
import com.aizistral.nochatreports.gui.UnsafeServerScreen;
@@ -16,8 +16,8 @@ import net.minecraft.util.StringUtil;
public class NCRConfigEncryption extends JSONConfig {
protected static final String FILE_NAME = "NoChatReports/NCR-Encryption.json";
protected boolean skipWarning = false, enableEncryption = false;
- protected String encryptionKey = Encryption.AES.getDefaultKey(), encryptionPassphrase = "",
- algorithmName = Encryption.AES.getName();
+ protected String encryptionKey = Encryption.AES_CFB8.getDefaultKey(), encryptionPassphrase = "",
+ algorithmName = Encryption.AES_CFB8.getName();
private transient Encryption algorithm;
private transient boolean isValid = false;
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java
new file mode 100644
index 0000000..77adf4c
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java
@@ -0,0 +1,40 @@
+package com.aizistral.nochatreports.encryption;
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+import java.util.Random;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+
+import net.minecraft.util.StringUtil;
+
+public class AESCFB8Encryption extends AESEncryption {
+
+ protected AESCFB8Encryption() {
+ super("CFB8", "NoPadding", true);
+ }
+
+ @Override
+ public AESCFB8Encryptor getProcessor(String key) throws InvalidKeyException {
+ return new AESCFB8Encryptor(key);
+ }
+
+ @Override
+ public AESCFB8Encryptor getRandomProcessor() {
+ try {
+ return this.getProcessor(this.getRandomKey());
+ } catch (InvalidKeyException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+} \ No newline at end of file
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java
new file mode 100644
index 0000000..638a3aa
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java
@@ -0,0 +1,57 @@
+package com.aizistral.nochatreports.encryption;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+import java.util.Random;
+
+import javax.crypto.AEADBadTagException;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.KeyGenerator;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+import net.minecraft.server.network.ServerLoginPacketListenerImpl;
+import net.minecraft.util.Tuple;
+
+import static com.aizistral.nochatreports.encryption.Encryption.*;
+import static javax.crypto.Cipher.*;
+
+public class AESCFB8Encryptor extends AESEncryptor<AESCFB8Encryption> {
+
+ protected AESCFB8Encryptor(String key) throws InvalidKeyException {
+ super(key, Encryption.AES_CFB8);
+ }
+
+ protected AESCFB8Encryptor(SecretKey key, String mode, String padding, boolean iv) throws InvalidKeyException {
+ super(key, Encryption.AES_CFB8);
+ }
+
+ @Override
+ protected Tuple<IvParameterSpec, byte[]> generateIV() throws UnsupportedOperationException {
+ long nonce = RANDOM.nextLong();
+ byte[] iv = new byte[16];
+ new Random(nonce).nextBytes(iv);
+ return new Tuple<>(new IvParameterSpec(iv), ByteBuffer.allocate(8).putLong(nonce).array());
+ }
+
+ @Override
+ protected Tuple<IvParameterSpec, byte[]> splitIV(byte[] message) throws UnsupportedOperationException {
+ ByteBuffer buffer = ByteBuffer.wrap(message);
+ int size = buffer.capacity();
+ long nonce = buffer.getLong();
+ byte[] encrypted = new byte[size - 8];
+ buffer.get(encrypted);
+ byte[] iv = new byte[16];
+ new Random(nonce).nextBytes(iv);
+ return new Tuple<>(new IvParameterSpec(iv), encrypted);
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryption.java b/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryption.java
new file mode 100644
index 0000000..359d509
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryption.java
@@ -0,0 +1,25 @@
+package com.aizistral.nochatreports.encryption;
+
+import java.security.InvalidKeyException;
+
+public class AESECBEncryption extends AESEncryption {
+
+ protected AESECBEncryption() {
+ super("ECB", "PKCS5Padding", false);
+ }
+
+ @Override
+ public AESECBEncryptor getProcessor(String key) throws InvalidKeyException {
+ return new AESECBEncryptor(key);
+ }
+
+ @Override
+ public AESECBEncryptor getRandomProcessor() {
+ try {
+ return this.getProcessor(this.getRandomKey());
+ } catch (InvalidKeyException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java
new file mode 100644
index 0000000..4da4aaa
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java
@@ -0,0 +1,32 @@
+package com.aizistral.nochatreports.encryption;
+
+import java.nio.ByteBuffer;
+import java.security.InvalidKeyException;
+import java.util.Random;
+
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+
+import net.minecraft.util.Tuple;
+
+public class AESECBEncryptor extends AESEncryptor<AESECBEncryption> {
+
+ protected AESECBEncryptor(String key) throws InvalidKeyException {
+ super(key, Encryption.AES_ECB);
+ }
+
+ protected AESECBEncryptor(SecretKey key, String mode, String padding, boolean iv) throws InvalidKeyException {
+ super(key, Encryption.AES_ECB);
+ }
+
+ @Override
+ protected Tuple<IvParameterSpec, byte[]> generateIV() throws UnsupportedOperationException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ protected Tuple<IvParameterSpec, byte[]> splitIV(byte[] message) throws UnsupportedOperationException {
+ throw new UnsupportedOperationException();
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java
index a515dd0..f7c53cd 100644
--- a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java
+++ b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java
@@ -2,12 +2,11 @@ package com.aizistral.nochatreports.encryption;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
+import java.util.Optional;
import java.util.Random;
-import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
@@ -16,8 +15,18 @@ import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.SecretKeySpec;
import net.minecraft.util.StringUtil;
+import net.minecraft.util.Tuple;
-public class AESEncryption extends Encryption {
+public abstract class AESEncryption extends Encryption {
+ private final String mode, padding;
+ private final boolean requiresIV;
+
+ protected AESEncryption(String mode, String padding, boolean requiresIV) {
+ super("aes_" + mode.toLowerCase() + "_base64", "AES/" + mode + "+Base64");
+ this.mode = mode;
+ this.padding = padding;
+ this.requiresIV = requiresIV;
+ }
@Override
public String getRandomKey() {
@@ -72,28 +81,16 @@ public class AESEncryption extends Encryption {
return true;
}
- @Override
- public String getName() {
- return "AES/CFB8+Base64";
- }
-
- @Override
- public String getID() {
- return "aes_base64";
+ public String getMode() {
+ return this.mode;
}
- @Override
- public AESEncryptor getProcessor(String key) throws InvalidKeyException {
- return new AESEncryptor(key);
+ public String getPadding() {
+ return this.padding;
}
- @Override
- public AESEncryptor getRandomProcessor() {
- try {
- return this.getProcessor(this.getRandomKey());
- } catch (InvalidKeyException ex) {
- throw new RuntimeException(ex);
- }
+ public boolean requiresIV() {
+ return this.requiresIV;
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java
index 5e24c22..606cabe 100644
--- a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java
+++ b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java
@@ -1,45 +1,63 @@
package com.aizistral.nochatreports.encryption;
+import static com.aizistral.nochatreports.encryption.Encryption.AES_CFB8;
+import static com.aizistral.nochatreports.encryption.Encryption.BASE64_DECODER;
+import static com.aizistral.nochatreports.encryption.Encryption.BASE64_ENCODER;
+import static javax.crypto.Cipher.DECRYPT_MODE;
+import static javax.crypto.Cipher.ENCRYPT_MODE;
+
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
-import java.util.Base64;
import java.util.Random;
-import javax.crypto.AEADBadTagException;
+import javax.annotation.Nullable;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.KeyGenerator;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-import net.minecraft.server.network.ServerLoginPacketListenerImpl;
-import static com.aizistral.nochatreports.encryption.Encryption.*;
-import static javax.crypto.Cipher.*;
+import net.minecraft.util.Tuple;
-public class AESEncryptor extends Encryptor<AESEncryption> {
+public abstract class AESEncryptor<T extends AESEncryption> extends Encryptor<T> {
+ private final T encryption;
private final SecretKey key;
private final Cipher encryptor, decryptor;
+ private final boolean useIV;
- protected AESEncryptor(String key) throws InvalidKeyException {
- this(new SecretKeySpec(decodeBinaryKey(key), "AES"));
+ protected AESEncryptor(String key, T encryption) throws InvalidKeyException {
+ this(new SecretKeySpec(decodeBinaryKey(key), "AES"), encryption);
}
- protected AESEncryptor(SecretKey key) throws InvalidKeyException {
+ protected AESEncryptor(SecretKey key, T encryption) throws InvalidKeyException {
+ this.encryption = encryption;
+ this.useIV = encryption.requiresIV();
+ String mode = encryption.getMode();
+ String padding = encryption.getPadding();
+
try {
this.key = key;
- Cipher encryptor = Cipher.getInstance(this.key.getAlgorithm() + "/CFB8/NoPadding");
- encryptor.init(ENCRYPT_MODE, this.key, new IvParameterSpec(key.getEncoded()));
+ Cipher encryptor = Cipher.getInstance(this.key.getAlgorithm() + "/" + mode + "/" + padding);
+ if (this.useIV) {
+ encryptor.init(ENCRYPT_MODE, this.key, new IvParameterSpec(key.getEncoded()));
+ } else {
+ encryptor.init(ENCRYPT_MODE, this.key);
+
+ }
this.encryptor = encryptor;
- Cipher decryptor = Cipher.getInstance(this.key.getAlgorithm() + "/CFB8/NoPadding");
- decryptor.init(DECRYPT_MODE, this.key, new IvParameterSpec(key.getEncoded()));
+ Cipher decryptor = Cipher.getInstance(this.key.getAlgorithm() + "/" + mode + "/" + padding);
+ if (this.useIV) {
+ decryptor.init(DECRYPT_MODE, this.key, new IvParameterSpec(key.getEncoded()));
+ } else {
+ decryptor.init(DECRYPT_MODE, this.key);
+ }
this.decryptor = decryptor;
} catch (NoSuchAlgorithmException | NoSuchPaddingException ex) {
throw new RuntimeException(ex);
@@ -51,14 +69,15 @@ public class AESEncryptor extends Encryptor<AESEncryption> {
@Override
public String encrypt(String message) {
try {
- long nonce = RANDOM.nextLong();
- byte[] iv = new byte[16];
- new Random(nonce).nextBytes(iv);
+ if (this.useIV) {
+ var tuple = this.generateIV();
- this.encryptor.init(ENCRYPT_MODE, this.key, new IvParameterSpec(iv));
- byte[] encrypted = this.encryptor.doFinal(message.getBytes());
+ this.encryptor.init(ENCRYPT_MODE, this.key, tuple.getA());
+ byte[] encrypted = this.encryptor.doFinal(message.getBytes());
- return BASE64_ENCODER.encodeToString(ByteBuffer.allocate(encrypted.length + 8).putLong(nonce).put(encrypted).array());
+ return BASE64_ENCODER.encodeToString(ByteBuffer.allocate(encrypted.length + tuple.getB().length).put(tuple.getB()).put(encrypted).array());
+ } else
+ return BASE64_ENCODER.encodeToString(this.encryptor.doFinal(message.getBytes()));
} catch (IllegalBlockSizeException | BadPaddingException | InvalidKeyException | InvalidAlgorithmParameterException ex) {
throw new RuntimeException(ex);
}
@@ -67,29 +86,30 @@ public class AESEncryptor extends Encryptor<AESEncryption> {
@Override
public String decrypt(String message) {
try {
- ByteBuffer buffer = ByteBuffer.wrap(BASE64_DECODER.decode(message));
- int size = buffer.capacity();
- long nonce = buffer.getLong();
- byte[] encrypted = new byte[size - 8];
- buffer.get(encrypted);
- byte[] iv = new byte[16];
- new Random(nonce).nextBytes(iv);
-
- this.decryptor.init(DECRYPT_MODE, this.key, new IvParameterSpec(iv));
- return new String(this.decryptor.doFinal(encrypted), StandardCharsets.UTF_8);
+ if (this.useIV) {
+ var tuple = this.splitIV(BASE64_DECODER.decode(message));
+
+ this.decryptor.init(DECRYPT_MODE, this.key, tuple.getA());
+ return new String(this.decryptor.doFinal(tuple.getB()), StandardCharsets.UTF_8);
+ } else
+ return new String(this.decryptor.doFinal(BASE64_DECODER.decode(message)), StandardCharsets.UTF_8);
} catch (IllegalBlockSizeException | BadPaddingException | InvalidKeyException | InvalidAlgorithmParameterException ex) {
throw new RuntimeException(ex);
}
}
@Override
- public AESEncryption getAlgorithm() {
- return AES;
+ public String getKey() {
+ return encodeBinaryKey(this.key.getEncoded());
}
@Override
- public String getKey() {
- return encodeBinaryKey(this.key.getEncoded());
+ public T getAlgorithm() {
+ return this.encryption;
}
+ protected abstract Tuple<IvParameterSpec, byte[]> generateIV() throws UnsupportedOperationException;
+
+ protected abstract Tuple<IvParameterSpec, byte[]> splitIV(byte[] message) throws UnsupportedOperationException;
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryption.java b/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryption.java
new file mode 100644
index 0000000..16536bc
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryption.java
@@ -0,0 +1,56 @@
+package com.aizistral.nochatreports.encryption;
+
+import java.security.InvalidKeyException;
+import java.security.SecureRandom;
+
+public class CaesarEncryption extends Encryption {
+
+ protected CaesarEncryption() {
+ super("caesar", "Caesar");
+ }
+
+ @Override
+ public String getRandomKey() {
+ return String.valueOf(1 + new SecureRandom().nextInt(1024));
+ }
+
+ @Override
+ public String getDefaultKey() {
+ return "3";
+ }
+
+ @Override
+ public boolean supportsPassphrases() {
+ return false;
+ }
+
+ @Override
+ public String getPassphraseKey(String passphrase) throws UnsupportedOperationException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean validateKey(String key) {
+ try {
+ int value = Integer.valueOf(key);
+ return value > 0 && value < 1025;
+ } catch (NumberFormatException ex) {
+ return false;
+ }
+ }
+
+ @Override
+ public CaesarEncryptor getProcessor(String key) throws InvalidKeyException {
+ return new CaesarEncryptor(key);
+ }
+
+ @Override
+ public CaesarEncryptor getRandomProcessor() {
+ try {
+ return this.getProcessor(this.getRandomKey());
+ } catch (InvalidKeyException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java
new file mode 100644
index 0000000..2b242a4
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java
@@ -0,0 +1,56 @@
+package com.aizistral.nochatreports.encryption;
+
+import java.security.InvalidKeyException;
+
+public class CaesarEncryptor extends Encryptor<CaesarEncryption> {
+ private final int shift;
+
+ protected CaesarEncryptor(int shift) throws InvalidKeyException {
+ if (!Encryption.CAESAR.validateKey(String.valueOf(shift)))
+ throw new InvalidKeyException();
+ this.shift = shift;
+ }
+
+ protected CaesarEncryptor(String key) throws InvalidKeyException {
+ this.shift = fromString(key);
+ }
+
+ @Override
+ public String encrypt(String message) {
+ char[] chars = message.toCharArray();
+
+ for (int i = 0; i < chars.length; i++) {
+ chars[i] = (char) (chars[i] + this.shift);
+ }
+
+ return new String(chars);
+ }
+
+ @Override
+ public String decrypt(String message) {
+ char[] chars = message.toCharArray();
+
+ for (int i = 0; i < chars.length; i++) {
+ chars[i] = (char) (chars[i] - this.shift);
+ }
+
+ return new String(chars);
+ }
+
+ @Override
+ public CaesarEncryption getAlgorithm() {
+ return Encryption.CAESAR;
+ }
+
+ @Override
+ public String getKey() {
+ return String.valueOf(this.shift);
+ }
+
+ private static int fromString(String key) throws InvalidKeyException {
+ if (!Encryption.CAESAR.validateKey(key))
+ throw new InvalidKeyException(key);
+ return Integer.valueOf(key);
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java b/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java
index e356b1b..9376c0a 100644
--- a/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java
+++ b/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java
@@ -12,16 +12,32 @@ public abstract class Encryption {
protected static final Base64.Encoder BASE64_ENCODER = Base64.getEncoder();
protected static final Base64.Decoder BASE64_DECODER = Base64.getDecoder();
- public static final AESEncryption AES = new AESEncryption();
+ public static final AESCFB8Encryption AES_CFB8 = new AESCFB8Encryption();
+ public static final AESECBEncryption AES_ECB = new AESECBEncryption();
+ public static final CaesarEncryption CAESAR = new CaesarEncryption();
- protected Encryption() {
- if (REGISTERED.stream().filter(e -> e.getID().equals(this.getID()) || e.getName().equals(this.getName()))
+ private final String id, name;
+
+ protected Encryption(String id, String name) {
+ this.id = id;
+ this.name = name;
+
+ if (REGISTERED.stream().filter(e -> e.getID().equals(id) || e.getName().equals(name))
.findAny().isPresent())
throw new IllegalStateException("Duplicate encryption algorithm registered! ID: " + this.getID() +
", Name: " + this.getName());
+
REGISTERED.add(this);
}
+ public String getID() {
+ return this.id;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
public abstract String getRandomKey();
public abstract String getDefaultKey();
@@ -32,10 +48,6 @@ public abstract class Encryption {
public abstract boolean validateKey(String key);
- public abstract String getName();
-
- public abstract String getID();
-
public abstract Encryptor<?> getProcessor(String key) throws InvalidKeyException;
public abstract Encryptor<?> getRandomProcessor();