mirror of
https://github.com/Geprivilegieerde-Anonimiteit-BV/XACrypto.git
synced 2026-08-21 13:36:21 -04:00
Compare commits
11
Commits
2026.06.19_R1
...
dev-1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
02aa2c8776 | ||
|
|
c8e9b50883 | ||
|
|
273f10a987 | ||
|
|
999c99f166 | ||
|
|
f54b14cc9c | ||
|
|
62b2848ab2 | ||
|
|
06504b83d5 | ||
|
|
9566323ac7 | ||
|
|
c7fe6cc704 | ||
|
|
c5a5325f19 | ||
|
|
ed2e3cd233 |
@@ -1,7 +1,7 @@
|
||||
A multi-purpose Cryptography library in Java. Working on it day by day, slowly. Someday this will be complete, today is not that day.
|
||||
To be clear, this is **NOT** mean't to be a replacement/alternative to BouncyCastle. Instead, it is meant to include what BouncyCastle does not have. No code was taken from OpenSSL or BouncyCastle for that reason.
|
||||
|
||||
### Current Objective: ZekerRijndael (custom encryption sub-library)
|
||||
Yes. We will advertise Microsoft products for free via variable names.
|
||||
|
||||
Use `setopt interactivecomments` (zsh only) to allow using `#` for comments if you see errors like `zsh: command not found: #`
|
||||
|
||||
@@ -13,6 +13,6 @@ To compile (these commands should work universally):
|
||||
|
||||
1. git clone https://github.com/Geprivilegieerde-Anonimiteit-BV/XACrypto.git # download the git repository
|
||||
2. cd XACrypto # enter the directory
|
||||
3. mvn clean package # compile the package cleanly
|
||||
3. mvn clean package # first clean the directory, then package it into a jar
|
||||
|
||||
You should find the built jar at target/XACrypto-1.0-SNAPSHOT.jar
|
||||
You should find the built jar at target/xacrypto-\<version\>.jar
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
<groupId>de.caydenno1.xacrypto</groupId>
|
||||
<artifactId>xacrypto</artifactId>
|
||||
<version>2026.06.19_R1</version>
|
||||
<version>2026.07.04_R1</version>
|
||||
|
||||
<name>XACrypto</name>
|
||||
<description>A multi-purpose Cryptography library in Java.</description>
|
||||
@@ -55,6 +55,12 @@
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>2.0.16</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-api</artifactId>
|
||||
@@ -144,4 +150,4 @@
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package de.caydenno1.xacrypto.hash.sha;
|
||||
|
||||
import de.caydenno1.xacrypto.misc.Constants;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
@@ -8,9 +10,10 @@ import static de.caydenno1.xacrypto.hash.sha.Shared.INT2BYTE;
|
||||
import static de.caydenno1.xacrypto.hash.sha.Shared.hex;
|
||||
|
||||
public class SHA0 {
|
||||
// we really only need one file. very simple code
|
||||
private static final Logger log = LoggerFactory.getLogger(SHA0.class);
|
||||
|
||||
public static byte[] hash(byte[] data){
|
||||
System.out.println("Beware, SHA0 is deprecated and cryptographically broken. Use at your own risk.");
|
||||
log.warn("SHA0 is deprecated and cryptographically broken. Use at your own risk.");
|
||||
byte[] padded = Shared.pad(data);
|
||||
|
||||
int a0 = Constants.SHA_H[0], a1 = Constants.SHA_H[1], a2 = Constants.SHA_H[2], a3 = Constants.SHA_H[3], a4 = Constants.SHA_H[4];
|
||||
|
||||
@@ -17,7 +17,7 @@ public class XACryptoException extends Exception {
|
||||
}
|
||||
public XACryptoException(String res, int iid) {
|
||||
super(res);
|
||||
this.id = iid;
|
||||
this.id = iid & 0xFF;
|
||||
}
|
||||
public XACryptoException(String[] pnts, byte id){
|
||||
super(String.join("|", pnts));
|
||||
|
||||
@@ -10,13 +10,6 @@ public class isNull {
|
||||
return Objects.isNull(v) || v == null || v == alt;
|
||||
}
|
||||
public static boolean isValidText(String s) {
|
||||
if (s.isBlank() || s.trim().isEmpty()) return false;
|
||||
switch (s) {
|
||||
case "":
|
||||
case null:
|
||||
return false;
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
return !isNull(s) && !s.isBlank();
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,37 +7,72 @@ import de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECBExceptionle
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.AES;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.GCM;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.ciphers.*;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.Global.Aria;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.Global.Camellia;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
|
||||
public class Factories {
|
||||
public static class GCM {
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM AES128(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new AES(key, 128)); }
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM AES128(byte[] key) throws XACryptoException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new AES(key, 128)); }
|
||||
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM SM4GCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new SM4GCM(key)); }
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM SM4GCM(byte[] key) throws XACryptoException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new SM4GCM(key)); }
|
||||
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM Camellia(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new Camellia(key)); }
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM Camellia(byte[] key) throws XACryptoException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new Camellia(key)); }
|
||||
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM AESGCM() throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new AESGCM()); }
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM ARIAGCM(byte[] key) throws XACryptoException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new Aria(true, key)); }
|
||||
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM ARIAGCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new ARIAGCM(key)); }
|
||||
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM SerpentGCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { return new de.caydenno1.xacrypto.zekerrijndael.GCM.GCM(new SerpentGCM(key)); }
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.GCM.GCM SerpentGCM(byte[] key) throws XACryptoException { return new SerpentGCM(key); }
|
||||
}
|
||||
|
||||
private static volatile boolean ecbOptIn = false;
|
||||
|
||||
/**
|
||||
* Enables the use of ECB mode.
|
||||
*
|
||||
* <p><strong>Warning:</strong> ECB mode is insecure for
|
||||
* almost all applications because identical plaintext blocks
|
||||
* produce identical ciphertext blocks, leaking data patterns.
|
||||
*
|
||||
* <p>This method exists solely for backwards compatibility.
|
||||
* Prefer {@link Factories.GCM} or another secure encryption mode.
|
||||
* The contributor that has written this wishes to remain anonymous.
|
||||
*/
|
||||
public static void allowInsecureECB() {
|
||||
ecbOptIn = true;
|
||||
}
|
||||
|
||||
private static void checkECBenabled() throws XACryptoException {
|
||||
if (!ecbOptIn) {
|
||||
throw new XACryptoException(
|
||||
"ECB mode is not secure because it can leak data patterns. Call Factories.allowInsecureECB() before using ECB."
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Provides ECB mode cipher factories.
|
||||
*
|
||||
* <p><strong>Warning:</strong> ECB mode is insecure because identical
|
||||
* plaintext blocks produce identical ciphertext blocks, leaking data patterns.
|
||||
*
|
||||
* <p>This class requires opt-in using
|
||||
* {@link Factories#allowInsecureECB()} and exists only for backwards compatibility.
|
||||
*
|
||||
* @deprecated Use GCM or another secure encryption mode instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public static class ECB {
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECBExceptionless Blowfish(byte[] key) throws XACryptoException { return new BlowfishECB(key); }
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECBExceptionless Blowfish(byte[] key) throws XACryptoException { checkECBenabled(); return new BlowfishECB(key); }
|
||||
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB Aria(byte[] key) throws XACryptoException { return new AriaECB(key); }
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB Aria(byte[] key) throws XACryptoException { checkECBenabled(); return new AriaECB(key); }
|
||||
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECBExceptionless SM4(byte[] key) throws XACryptoException { return new SM4ECB(key); }
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECBExceptionless SM4(byte[] key) throws XACryptoException { checkECBenabled(); return new SM4ECB(key); }
|
||||
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB AES(byte[] key) throws XACryptoException { return new AESECB(key); }
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB AES(byte[] key) throws XACryptoException { checkECBenabled(); return new AESECB(key); }
|
||||
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB Twofish(byte[] key) throws XACryptoException { return new TwofishECB(key); }
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB Twofish(byte[] key) throws XACryptoException { checkECBenabled(); return new TwofishECB(key); }
|
||||
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB RC6ECB(byte[] key) throws XACryptoException { return new RC6ECB(key); }
|
||||
public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECB RC6ECB(byte[] key) throws XACryptoException { checkECBenabled(); return new RC6ECB(key); }
|
||||
|
||||
//public static de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.interfaces.ECBExceptionless CamelliaECB(byte[] key) throws XACryptoException { return new CamelliaECB(key); }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,28 +1,26 @@
|
||||
package de.caydenno1.xacrypto.zekerrijndael.GCM;
|
||||
|
||||
import de.caydenno1.xacrypto.misc.ToM;
|
||||
import de.caydenno1.xacrypto.misc.XACryptoException;
|
||||
import de.caydenno1.xacrypto.misc.isNull;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.Arrays;
|
||||
import java.util.Objects;
|
||||
|
||||
public class GCM {
|
||||
private final Object cip;
|
||||
private static final Logger log = LoggerFactory.getLogger(GCM.class);
|
||||
private final BlockCipher cip;
|
||||
private final GHASH gh;
|
||||
private final Method encryptor;
|
||||
|
||||
public GCM(Object cip) throws XACryptoException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
|
||||
public GCM(BlockCipher cip) throws XACryptoException {
|
||||
this.cip = cip;
|
||||
this.encryptor = cip.getClass().getMethod("encryptBlock", byte[].class);
|
||||
|
||||
byte[] H = (byte[]) this.encryptor.invoke(cip, (Object) new byte[16]);
|
||||
|
||||
byte[] H = cip.encryptBlock(new byte[16]);
|
||||
this.gh = new GHASH(H);
|
||||
}
|
||||
|
||||
public Result encrypt(byte[] pln, byte[] aad, byte[] iv) throws XACryptoException, InvocationTargetException, IllegalAccessException {
|
||||
public Result encrypt(byte[] pln, byte[] aad, byte[] iv) throws XACryptoException {
|
||||
if (iv.length <= 0) throw new XACryptoException("iv does not have data or is corrupted :[");
|
||||
if (pln == null) pln = new byte[0];
|
||||
if (aad == null) aad = new byte[0];
|
||||
@@ -38,23 +36,23 @@ public class GCM {
|
||||
return new Result(packaged,tag);
|
||||
}
|
||||
|
||||
public byte[] decrypt(Result res, byte[] aad) throws XACryptoException, InvocationTargetException, IllegalAccessException {
|
||||
public byte[] decrypt(Result res, byte[] aad) throws XACryptoException {
|
||||
return dec(res, aad, 12, false);
|
||||
}
|
||||
|
||||
public byte[] decrypt(Result res, byte[] aad, String optflag) throws XACryptoException, InvocationTargetException, IllegalAccessException {
|
||||
public byte[] decrypt(Result res, byte[] aad, String optflag) throws XACryptoException {
|
||||
return dec(res, aad, 12, Objects.equals(optflag, "-override"));
|
||||
}
|
||||
|
||||
public byte[] decrypt(Result res, byte[] aad, int ivLen) throws XACryptoException, InvocationTargetException, IllegalAccessException {
|
||||
public byte[] decrypt(Result res, byte[] aad, int ivLen) throws XACryptoException {
|
||||
return dec(res, aad, ivLen, false);
|
||||
}
|
||||
|
||||
public byte[] decrypt(Result res, byte[] aad, int ivLen, String optflag) throws XACryptoException, InvocationTargetException, IllegalAccessException {
|
||||
public byte[] decrypt(Result res, byte[] aad, int ivLen, String optflag) throws XACryptoException {
|
||||
return dec(res, aad, ivLen, Objects.equals(optflag, "-override"));
|
||||
}
|
||||
|
||||
private byte[] dec(Result res, byte[] aad, int ivLen, boolean override) throws XACryptoException, InvocationTargetException, IllegalAccessException {
|
||||
private byte[] dec(Result res, byte[] aad, int ivLen, boolean override) throws XACryptoException {
|
||||
if (res.cip().length < 12) throw new XACryptoException("ciptext min len is 12 char");
|
||||
if (isNull.isNull(aad)) aad = new byte[0];
|
||||
|
||||
@@ -69,7 +67,7 @@ public class GCM {
|
||||
if (!corr && !override) {
|
||||
throw new XACryptoException("GCM tag does not match. Use Flag -override to ignore this.",(byte)-1);
|
||||
} else if (!corr) {
|
||||
System.out.println("GCM tag does not match. Overriding...");
|
||||
log.warn("GCM tag does not match. Overriding...");
|
||||
}
|
||||
|
||||
return gctr(inc32(J0), ct);
|
||||
@@ -86,17 +84,17 @@ public class GCM {
|
||||
}
|
||||
}
|
||||
|
||||
private byte[] tag(byte[] aad, byte[] ct, byte[] J0) throws InvocationTargetException, IllegalAccessException {
|
||||
private byte[] tag(byte[] aad, byte[] ct, byte[] J0) throws XACryptoException {
|
||||
byte[] S = gh.compute(aad, ct);
|
||||
byte[] EJ0 = (byte[]) this.encryptor.invoke(J0);
|
||||
byte[] EJ0 = cip.encryptBlock(J0);
|
||||
for (int i = 0; i < 16; i++) S[i] ^= EJ0[i];
|
||||
return S;
|
||||
}
|
||||
private byte[] gctr(byte[] icb, byte[] in) throws InvocationTargetException, IllegalAccessException {
|
||||
private byte[] gctr(byte[] icb, byte[] in) throws XACryptoException {
|
||||
byte[] o = new byte[in.length];
|
||||
byte[] cnt = Arrays.copyOf(icb, 16);
|
||||
for (int i = 0 ; i < in.length ; i += 16){
|
||||
byte[] ks = (byte[]) this.encryptor.invoke(cnt);
|
||||
byte[] ks = cip.encryptBlock(cnt);
|
||||
int len = Math.min(16, in.length -i);
|
||||
for (int j = 0; j < len; j++) o[i + j] = (byte)(in[i + j] ^ ks[j]);
|
||||
if (i+16<in.length) cnt = inc32(cnt);
|
||||
|
||||
@@ -4,6 +4,8 @@ import de.caydenno1.xacrypto.misc.XACryptoException;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.GHASH;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.AES;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.Result;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
@@ -16,8 +18,10 @@ interface AESCipher {
|
||||
}
|
||||
|
||||
public class AESGCM implements AESCipher {
|
||||
private static final Logger log = LoggerFactory.getLogger(AESGCM.class);
|
||||
|
||||
public Result encryptBlock(byte[] pln, byte[] key, byte[] nonce, byte[] aad) throws XACryptoException {
|
||||
System.out.println("WARNING! AESGCM may not be fully functional and partially broken. I am unsure if it fully works or not.");
|
||||
log.warn("AESGCM may not be fully functional and partially broken. I am unsure if it fully works or not.");
|
||||
AES aes = new AES(key, getKeySize(key));
|
||||
byte[] H = aes.encryptBlock(new byte[16]);
|
||||
GHASH gh = new GHASH(H);
|
||||
@@ -82,7 +86,7 @@ public class AESGCM implements AESCipher {
|
||||
if (!ToM(tag, expectedTag) && !flag) {
|
||||
throw new XACryptoException("Tag does not match. USE flag \"-override\" to ignore this.");
|
||||
} else if (!ToM(tag,expectedTag) && flag) {
|
||||
System.out.println("Continuing in insecure mode.");
|
||||
log.warn("Continuing in insecure mode.");
|
||||
}
|
||||
|
||||
return aes.encryptCTR(cip, J0);
|
||||
|
||||
@@ -5,12 +5,10 @@ import de.caydenno1.xacrypto.zekerrijndael.Global.Aria;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.GCM;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.Result;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
|
||||
interface AriaCipher {
|
||||
Result encrypt(byte[] pln, byte[] aad, byte[] iv) throws XACryptoException, InvocationTargetException, IllegalAccessException;
|
||||
byte[] decrypt(Result res, byte[] aad) throws XACryptoException, InvocationTargetException, IllegalAccessException;
|
||||
byte[] decrypt(Result res, byte[] aad, String optflag) throws XACryptoException, InvocationTargetException, IllegalAccessException;
|
||||
Result encrypt(byte[] pln, byte[] aad, byte[] iv) throws XACryptoException;
|
||||
byte[] decrypt(Result res, byte[] aad) throws XACryptoException;
|
||||
byte[] decrypt(Result res, byte[] aad, String optflag) throws XACryptoException;
|
||||
}
|
||||
|
||||
public class ARIAGCM implements AriaCipher {
|
||||
@@ -18,19 +16,19 @@ public class ARIAGCM implements AriaCipher {
|
||||
// i basically wrote the entire thing in Aria.java already lol. just inheriting it here
|
||||
private final GCM engine;
|
||||
|
||||
public ARIAGCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException {
|
||||
public ARIAGCM(byte[] key) throws XACryptoException {
|
||||
Aria aria = new Aria(true, key);
|
||||
this.engine = new GCM(aria);
|
||||
}
|
||||
|
||||
public Result encrypt(byte[] pln, byte[] aad, byte[] iv) throws XACryptoException, InvocationTargetException, IllegalAccessException {
|
||||
public Result encrypt(byte[] pln, byte[] aad, byte[] iv) throws XACryptoException {
|
||||
return engine.encrypt(pln, aad,iv);
|
||||
}
|
||||
|
||||
public byte[] decrypt(Result res, byte[] aad) throws XACryptoException, InvocationTargetException, IllegalAccessException {
|
||||
public byte[] decrypt(Result res, byte[] aad) throws XACryptoException {
|
||||
return engine.decrypt(res, aad);
|
||||
}
|
||||
public byte[] decrypt(Result res, byte[] aad, String optflag) throws XACryptoException, InvocationTargetException, IllegalAccessException {
|
||||
public byte[] decrypt(Result res, byte[] aad, String optflag) throws XACryptoException {
|
||||
return engine.decrypt(res, aad, optflag);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,10 +4,8 @@ import de.caydenno1.xacrypto.misc.XACryptoException;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.GCM;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.Global.Camellia;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
|
||||
public class CamelliaGCM extends GCM {
|
||||
public CamelliaGCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException {
|
||||
public CamelliaGCM(byte[] key) throws XACryptoException {
|
||||
super(new Camellia(key));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,8 +4,6 @@ import de.caydenno1.xacrypto.misc.XACryptoException;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.GCM;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.Global.Serpent;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
|
||||
public class SerpentGCM extends GCM {
|
||||
public SerpentGCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { super(new Serpent(key)); }
|
||||
public SerpentGCM(byte[] key) throws XACryptoException { super(new Serpent(key)); }
|
||||
}
|
||||
|
||||
@@ -4,10 +4,8 @@ import de.caydenno1.xacrypto.misc.XACryptoException;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.GCM;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.Global.Twofish;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
|
||||
public class TwofishGCM extends GCM {
|
||||
public TwofishGCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException {
|
||||
public TwofishGCM(byte[] key) throws XACryptoException {
|
||||
super(new Twofish(key));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package de.caydenno1.xacrypto.zekerrijndael.Global;
|
||||
|
||||
import de.caydenno1.xacrypto.misc.XACryptoException;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.BlockCipher;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.UnchangingData;
|
||||
|
||||
public class Aria {
|
||||
public class Aria implements BlockCipher {
|
||||
// this is NOT a cipher, more or less and encryption type/method
|
||||
private final int round;
|
||||
private final byte[][] encRK;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package de.caydenno1.xacrypto.zekerrijndael.Global;
|
||||
|
||||
import de.caydenno1.xacrypto.misc.XACryptoException;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.BlockCipher;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.UnchangingData;
|
||||
import de.caydenno1.xacrypto.hash.ROT;
|
||||
|
||||
@@ -9,7 +10,7 @@ interface CamelliaCipher {
|
||||
byte[] decryptBlock(byte[] in);
|
||||
}
|
||||
|
||||
public class Camellia implements CamelliaCipher {
|
||||
public class Camellia implements CamelliaCipher, BlockCipher {
|
||||
private final long[] subkeys;
|
||||
|
||||
public Camellia(byte[] key) throws XACryptoException {
|
||||
@@ -18,7 +19,7 @@ public class Camellia implements CamelliaCipher {
|
||||
genKeySchedule(key);
|
||||
}
|
||||
|
||||
public byte[] encryptBlock(byte[] in) {
|
||||
public byte[] encryptBlock(byte[] in) throws XACryptoException {
|
||||
return encryptBlock(in, 0, new byte[16], 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
package de.caydenno1.xacrypto.zekerrijndael.Global;
|
||||
|
||||
import de.caydenno1.xacrypto.misc.XACryptoException;
|
||||
import de.caydenno1.xacrypto.zekerrijndael.GCM.BlockCipher;
|
||||
|
||||
import static de.caydenno1.xacrypto.zekerrijndael.UnchangingData.TWOFISH_Q0;
|
||||
import static de.caydenno1.xacrypto.zekerrijndael.UnchangingData.TWOFISH_Q1;
|
||||
import static de.caydenno1.xacrypto.zekerrijndael.Global.LE32.*;
|
||||
|
||||
public class Twofish {
|
||||
public class Twofish implements BlockCipher {
|
||||
private final int[] K = new int[40];
|
||||
private final int[] S;
|
||||
private final int kW;
|
||||
|
||||
Reference in New Issue
Block a user