diff --git a/pom.xml b/pom.xml
index a26c30f..b03e659 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,12 +76,6 @@
system
${basedir}/3rd-party/dguard/lib/DguardAPI.jar
-
-
- net.java.dev.jna
- jna
- 5.14.0
-
diff --git a/src/main/java/cokr/xit/base/crypto/bean/Delphi.java b/src/main/java/cokr/xit/base/crypto/bean/Delphi.java
new file mode 100644
index 0000000..a8d6710
--- /dev/null
+++ b/src/main/java/cokr/xit/base/crypto/bean/Delphi.java
@@ -0,0 +1,82 @@
+package cokr.xit.base.crypto.bean;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+/**
+ * @author leebj
+ */
+class Delphi {
+ static int move(byte[] source, int sourceFrom){
+ byte[] b = new byte[4];
+ b[0] = source[sourceFrom];
+ b[1] = source[sourceFrom+1];
+ b[2] = source[sourceFrom+2];
+ b[3] = source[sourceFrom+3];
+
+ return _bytesToInt_le(b);
+ }
+
+ static void move(int sourceInt, byte[] target, int targetFrom){
+ byte[] source = _intToBytes_le(sourceInt);
+
+ int j = targetFrom;
+ for(int z=0; z < 4; z++) {
+ target[j] = source[z];
+ j++;
+ }
+ }
+
+ static void move(byte[] source, int sourceFrom, byte[] target, int targetFrom, int size){
+ int i = sourceFrom;
+ int j = targetFrom;
+ for(int z=0; z < size; z++) {
+ target[j] = source[i];
+ i++;
+ j++;
+ }
+ }
+
+ static void move(byte[] source, int sourceFrom, int[] targetIntArray, int size){
+ byte[] byteTarget = new byte[targetIntArray.length];
+ move(source,sourceFrom,byteTarget,0,size);
+ _convertIntArray(byteTarget, targetIntArray);
+ }
+
+ static void move(int[] sourceIntArray, byte[] target, int targetFrom, int size){
+ byte[] byteSource = new byte[sourceIntArray.length];
+ _convertByteArray(sourceIntArray, byteSource);
+ move(byteSource,0,target,targetFrom,size);
+ }
+
+ static int inc(int num, int incNum) {
+ return num + incNum;
+ }
+
+ static byte[] setLength(int len) {
+ return new byte[len];
+ }
+
+ private static void _convertIntArray(byte[] b, int[] n){
+ for(int j = 0; j < b.length; j++ ) {
+ if(b[j] < 0)
+ n[j] = b[j] + 256;
+ else
+ n[j] = b[j];
+ }
+ }
+
+ private static void _convertByteArray(int[] n, byte[] b){
+ for(int j = 0; j < n.length; j++ ) {
+ b[j] = (byte)n[j];
+ }
+ }
+
+ private static byte[] _intToBytes_le(int num) {
+ return ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN).putInt(num).array();
+ }
+
+ private static int _bytesToInt_le(byte[] byteArray) {
+ return ByteBuffer.wrap(byteArray).order(ByteOrder.LITTLE_ENDIAN).getInt();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/cokr/xit/base/crypto/bean/XitAria.java b/src/main/java/cokr/xit/base/crypto/bean/XitAria.java
index bf8ac99..6de42dc 100644
--- a/src/main/java/cokr/xit/base/crypto/bean/XitAria.java
+++ b/src/main/java/cokr/xit/base/crypto/bean/XitAria.java
@@ -1,16 +1,15 @@
package cokr.xit.base.crypto.bean;
-import com.sun.jna.Native;
-import com.sun.jna.win32.StdCallLibrary;
-
import cokr.xit.base.crypto.Cryptography;
public class XitAria extends Cryptography {
private String key;
+ private XitBridge bridge;
public XitAria(String name) {
super(name);
setKey(def.settings().string("key"));
+ bridge = XitBridge.create(key, def.settings().string("charset"));
}
public XitAria setKey(String key) {
@@ -20,19 +19,11 @@ public class XitAria extends Cryptography {
@Override
protected String doEncrypt(String plain) throws Exception {
- return Header.INSTANCE.XIT_AriaCrypt_Java(key, plain);
+ return bridge.encrypt(plain);
}
@Override
protected String doDecrypt(String encrypted) throws Exception {
- return Header.INSTANCE.XIT_AriaDeCrypt_Java(key, encrypted);
- }
-
- public static interface Header extends StdCallLibrary {
- Header INSTANCE = Native.loadLibrary("3rd-party/xit-aria/XAria", XitAria.Header.class);
-
- String XIT_AriaCrypt_Java(String AKey, String AValue);
-
- String XIT_AriaDeCrypt_Java(String AKey, String AValue);
+ return bridge.decrypt(encrypted);
}
}
\ No newline at end of file
diff --git a/src/main/java/cokr/xit/base/crypto/bean/XitBridge.java b/src/main/java/cokr/xit/base/crypto/bean/XitBridge.java
new file mode 100644
index 0000000..b0d467f
--- /dev/null
+++ b/src/main/java/cokr/xit/base/crypto/bean/XitBridge.java
@@ -0,0 +1,733 @@
+package cokr.xit.base.crypto.bean;
+
+import java.security.MessageDigest;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.HexFormat;
+import java.util.Map;
+
+import cokr.xit.foundation.AbstractComponent;
+
+/**
+ * @author leebj
+ */
+public class XitBridge extends AbstractComponent {
+ private int[] masterKey = new int[32];
+ private int keySize;
+ private String
+ key,
+ charset;
+ private boolean encode;
+ Map properties = Map.of(
+ "Encode", new Encode(),
+ "Key", new Key(),
+ "KeySize", new KeySize()
+ );
+
+ public abstract class Property {
+ public abstract T read();
+ public abstract void write(T o);
+ }
+
+ public class Encode extends Property {
+ @Override
+ public Boolean read() {
+ return encode;
+ }
+
+ @Override
+ public void write(Boolean bool) {
+ encode = bool;
+ }
+ }
+
+ public class Key extends Property{
+ @Override
+ public String read() {
+ return key;
+ }
+
+ @Override
+ public void write(String str) {
+ setKey(str);
+ }
+ };
+
+ public class KeySize extends Property{
+ @Override
+ public Integer read() {
+ return keySize;
+ }
+ @Override
+ public void write(Integer num) {
+ setKeySize(num);
+ }
+ }
+
+ private void diffusionLayer(int[] i, int[] o) {
+ int T;
+
+ T = (i[3] ^ i[4] ^ i[9] ^ i[14]);
+ o[0] = (i[6] ^ i[8] ^ i[13] ^ T);
+ o[5] = (i[1] ^ i[10] ^ i[15] ^ T);
+ o[11] = (i[2] ^ i[7] ^ i[12] ^ T);
+ o[14] = (i[0] ^ i[5] ^ i[11] ^ T);
+ T = (i[2] ^ i[5] ^ i[8] ^ i[15]);
+ o[1] = (i[7] ^ i[9] ^ i[12] ^ T);
+ o[4] = (i[0] ^ i[11] ^ i[14] ^ T);
+ o[10] = (i[3] ^ i[6] ^ i[13] ^ T);
+ o[15] = (i[1] ^ i[4] ^ i[10] ^ T);
+ T = (i[1] ^ i[6] ^ i[11] ^ i[12]);
+ o[2] = (i[4] ^ i[10] ^ i[15] ^ T);
+ o[7] = (i[3] ^ i[8] ^ i[13] ^ T);
+ o[9] = (i[0] ^ i[5] ^ i[14] ^ T);
+ o[12] = (i[2] ^ i[7] ^ i[9] ^ T);
+ T = (i[0] ^ i[7] ^ i[10] ^ i[13]);
+ o[3] = (i[5] ^ i[11] ^ i[14] ^ T);
+ o[6] = (i[2] ^ i[9] ^ i[12] ^ T);
+ o[8] = (i[1] ^ i[4] ^ i[15] ^ T);
+ o[13] = (i[3] ^ i[6] ^ i[8] ^ T);
+ }
+
+ private void diffusionLayer(int[] i, int iIndex, int[] o, int oIndex) {
+ int T;
+
+ T = (i[iIndex + 3] ^ i[iIndex + 4] ^ i[iIndex + 9] ^ i[iIndex + 14]);
+ o[oIndex + 0] = (i[iIndex + 6] ^ i[iIndex + 8] ^ i[iIndex + 13] ^ T);
+ o[oIndex + 5] = (i[iIndex + 1] ^ i[iIndex + 10] ^ i[iIndex + 15] ^ T);
+ o[oIndex + 11] = (i[iIndex + 2] ^ i[iIndex + 7] ^ i[iIndex + 12] ^ T);
+ o[oIndex + 14] = (i[iIndex + 0] ^ i[iIndex + 5] ^ i[iIndex + 11] ^ T);
+ T = (i[iIndex + 2] ^ i[iIndex + 5] ^ i[iIndex + 8] ^ i[iIndex + 15]);
+ o[oIndex + 1] = (i[iIndex + 7] ^ i[iIndex + 9] ^ i[iIndex + 12] ^ T);
+ o[oIndex + 4] = (i[iIndex + 0] ^ i[iIndex + 11] ^ i[iIndex + 14] ^ T);
+ o[oIndex + 10] = (i[iIndex + 3] ^ i[iIndex + 6] ^ i[iIndex + 13] ^ T);
+ o[oIndex + 15] = (i[iIndex + 1] ^ i[iIndex + 4] ^ i[iIndex + 10] ^ T);
+ T = (i[iIndex + 1] ^ i[iIndex + 6] ^ i[iIndex + 11] ^ i[iIndex + 12]);
+ o[oIndex + 2] = (i[iIndex + 4] ^ i[iIndex + 10] ^ i[iIndex + 15] ^ T);
+ o[oIndex + 7] = (i[iIndex + 3] ^ i[iIndex + 8] ^ i[iIndex + 13] ^ T);
+ o[oIndex + 9] = (i[iIndex + 0] ^ i[iIndex + 5] ^ i[iIndex + 14] ^ T);
+ o[oIndex + 12] = (i[iIndex + 2] ^ i[iIndex + 7] ^ i[iIndex + 9] ^ T);
+ T = (i[iIndex + 0] ^ i[iIndex + 7] ^ i[iIndex + 10] ^ i[iIndex + 13]);
+ o[oIndex + 3] = (i[iIndex + 5] ^ i[iIndex + 11] ^ i[iIndex + 14] ^ T);
+ o[oIndex + 6] = (i[iIndex + 2] ^ i[iIndex + 9] ^ i[iIndex + 12] ^ T);
+ o[oIndex + 8] = (i[iIndex + 1] ^ i[iIndex + 4] ^ i[iIndex + 15] ^ T);
+ o[oIndex + 13] = (i[iIndex + 3] ^ i[iIndex + 6] ^ i[iIndex + 8] ^ T);
+ }
+
+ // Encryption and decryption rountine
+ // p: plain text, e: round keys, c: ciphertext
+ private void doEncrypt(int[] p, int R, int[] e, int[] c) {
+ int i, j;
+ int index = 0;
+ int[] t = new int[16];
+
+ for (j = 0; j < 16; j++) {
+ c[j] = p[j];
+ }
+
+ for (i = 0; i < R / 2; i++) {
+ for (j = 0; j < 16; j++) {
+ t[j] = SBox[j % 4][e[index + j] ^ c[j]];
+ }
+ diffusionLayer(t, c);
+ index += 16;
+ for (j = 0; j < 16; j++) {
+ t[j] = SBox[(2 + j) % 4][e[index + j] ^ c[j]];
+ }
+ diffusionLayer(t, c);
+ index += 16;
+ }
+ diffusionLayer(c, t);
+
+ for (j = 0; j < 16; j++) {
+ c[j] = (e[index+j] ^ t[j]);
+ }
+ }
+
+ // Decryption round key generation rountine
+ // w0 : maskter key, d : decryption round keys
+ private int decKeySetup(int[] w0, int[] d) {
+ int i, j, R;
+ int[] t = new int[16];
+
+ R = encKeySetup(w0, d);
+ for (j = 0; j < 16; j++) {
+ t[j] = d[j];
+ d[j] = d[16 * R + j];
+ d[16 * R + j] = t[j];
+ }
+ for (i = 1; i <= R / 2; i++) {
+ diffusionLayer(d, i * 16, t, 0);
+ diffusionLayer(d, (R - i) * 16, d, i * 16);
+ for (j = 0; j < 16; j++)
+ d[(R - i) * 16 + j] = t[j];
+ }
+ return R;
+ }
+
+ // Encryption round key generation rountine
+ // w0 : master key, e : encryption round keys
+ private int encKeySetup(int[] w0, int[] e) {
+ int R = (keySize + 256) / 32;
+ int q = (keySize - 128) / 64;
+ int i;
+ int[] t = new int[16];
+ int[] w1 = new int[16];
+ int[] w2 = new int[16];
+ int[] w3 = new int[16];
+
+ // t from sbox,krk,q
+ for (i = 0; i < 16; i++){
+ t[i] = SBox[i % 4][ KRK[q][i] ^ w0[i]];
+ }
+
+ //dl 1
+ diffusionLayer(t, w1);
+
+ //
+ if (R == 14) {
+ for (i = 0; i < 8; i++) {
+ w1[i] ^= w0[16 + i];
+ }
+ } else if (R == 16) {
+ for (i = 0; i < 16; i++) {
+ w1[i] ^= w0[16 + i];
+ }
+ }
+
+ q = (q == 2) ? 0 : (q + 1);
+
+ // t from sbox,krk,q
+ for (i = 0; i < 16; i++) {
+ t[i] = SBox[(2 + i) % 4][KRK[q][i] ^ w1[i]];
+ }
+
+ //dl 2
+ diffusionLayer(t, w2);
+
+ for (i = 0; i < 16; i++) {
+ w2[i] ^= w0[i];
+ }
+
+ q = (q == 2) ? 0 : (q + 1);
+
+ // t from sbox,krk,q
+ for (i = 0; i < 16; i++) {
+ t[i] = SBox[i % 4][KRK[q][i] ^ w2[i]];
+ }
+
+ //dl 3
+ diffusionLayer(t, w3);
+
+ for (i = 0; i < 16; i++) {
+ w3[i] = w3[1] ^ w1[i];
+ }
+
+ //e초기화
+ for (i = 0; i < 16 * (R + 1); i++) {
+ e[i] = 0;
+ }
+
+ rotXOR(w0, 0, e, 0);
+ rotXOR(w1, 19, e, 0);
+ rotXOR(w1, 0, e, 16);
+ rotXOR(w2, 19, e, 16);
+ rotXOR(w2, 0, e, 32);
+ rotXOR(w3, 19, e, 32);
+ rotXOR(w3, 0, e, 48);
+ rotXOR(w0, 19, e, 48);
+ rotXOR(w0, 0, e, 64);
+ rotXOR(w1, 31, e, 64);
+ rotXOR(w1, 0, e, 80);
+ rotXOR(w2, 31, e, 80);
+ rotXOR(w2, 0, e, 96);
+ rotXOR(w3, 31, e, 96);
+ rotXOR(w3, 0, e, 112);
+ rotXOR(w0, 31, e, 112);
+ rotXOR(w0, 0, e, 128);
+ rotXOR(w1, 67, e, 128);
+ rotXOR(w1, 0, e, 144);
+ rotXOR(w2, 67, e, 144);
+ rotXOR(w2, 0, e, 160);
+ rotXOR(w3, 67, e, 160);
+ rotXOR(w3, 0, e, 176);
+ rotXOR(w0, 67, e, 176);
+ rotXOR(w0, 0, e, 192);
+ rotXOR(w1, 97, e, 192);
+
+ if (R > 12) {
+ rotXOR(w1, 0, e, 208);
+ rotXOR(w2, 97, e, 208);
+ rotXOR(w2, 0, e, 224);
+ rotXOR(w3, 97, e, 224);
+ }
+ if (R > 14) {
+ rotXOR(w3, 0, e, 240);
+ rotXOR(w0, 97, e, 240);
+ rotXOR(w0, 0, e, 256);
+ rotXOR(w1, 109, e, 256);
+ }
+
+ return R;
+ }
+
+ // Right-rotate 128 bit source string s by n bits and XOR it to target
+ private void rotXOR(int[] s, int n, int[] t, int index) {
+ int i, q;
+
+ q = n / 8;
+ n %= 8;
+ for (i = 0; i < 16; i++) {
+ t[index + (q + i) % 16] ^= (byte) (s[i] >> n);
+ if (n != 0) {
+ t[index + (q + i + 1) % 16] ^= (byte) (s[i] << (8 - n));
+ }
+ }
+
+ _convertIntArray(t);
+ }
+
+ private byte[] inMD5(String str) throws Exception {
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ md.update(str.getBytes(charset));
+ byte[] digest = md.digest();
+ String hash = HexFormat.of().formatHex(digest);
+ return hash.getBytes(charset);
+ }
+
+ private void setKey(String value) {
+ if (equals(key, value)) return;
+
+ try {
+ byte[] hash = inMD5(key = value);
+ Delphi.move(hash, 0, masterKey, masterKey.length);
+ } catch (Exception e) {
+ throw runtimeException(e);
+ }
+ }
+
+ private void setKeySize(Integer num) {
+ if (num == 128 || num == 192 || num == 256) {
+ keySize = num;
+ } else
+ throw new IllegalArgumentException("num: " + num);
+ }
+
+ public static XitBridge create(String key, String charset) {
+ XitBridge newAria = new XitBridge();
+ newAria.encode = true;
+ newAria.key = "";
+ newAria.charset = charset;
+ newAria.keySize = 192;
+
+ newAria.properties.get("Encode").write(true);
+ newAria.properties.get("Key").write(key);
+
+ return newAria;
+ }
+
+ public String encrypt(String value) {
+ int[] inBlock = new int[16];
+ int[] outBlock = new int[16];
+ int roundNum;
+ int[] roundKey = new int[16*17];
+ int i;
+ int start;
+ byte[] encryptData = new byte[0];
+ int encryptSize;
+ byte[] cryptData = new byte[0];
+ int dataSize;
+ int modSize;
+ try {
+
+ byte[] value_byte = value.getBytes(charset);
+
+ encryptSize = value_byte.length;
+ encryptData = Delphi.setLength(encryptSize + 4);
+
+ Delphi.move(encryptSize, encryptData, 0);
+ Delphi.move(value_byte,0,encryptData,4,encryptSize);
+
+ dataSize = encryptData.length;
+ modSize = dataSize % 16;
+ roundNum = encKeySetup(masterKey, roundKey);
+
+ start = 1;
+ cryptData = Delphi.setLength(dataSize + 16 - (dataSize % 16));
+
+ for(i = 1; i <= Math.floorDiv(dataSize,16); i++) {
+ Arrays.fill(inBlock, 0);
+ Arrays.fill(outBlock, 0);
+
+ Delphi.move(encryptData, start-1, inBlock, 16);
+ doEncrypt(inBlock, roundNum, roundKey, outBlock);
+ Delphi.move(outBlock,cryptData,start-1,16);
+
+ start = Delphi.inc(start,16);
+ }
+
+ //나머지크기
+ if (modSize != 0) {
+ Arrays.fill(inBlock, 0);
+ Arrays.fill(outBlock, 0);
+
+ Delphi.move(encryptData,start-1,inBlock,modSize);
+ doEncrypt(inBlock, roundNum, roundKey, outBlock);
+ Delphi.move(outBlock,cryptData,start-1,16);
+ }
+
+ if(encode) {
+ return new String(Base64.getEncoder().encode(cryptData),"ISO-8859-1");
+ } else {
+ return new String(cryptData, charset);
+ }
+ } catch (Exception e) {
+ throw runtimeException(e);
+ }
+ }
+
+ public String decrypt(String value) {
+ int[] inBlock = new int[16];
+ int[] outBlock = new int[16];
+ int roundNum;
+ int[] roundKey = new int[16 * 17];
+ int i;
+ int start;
+ byte[] cryptData;
+ byte[] encryptData = new byte[0];
+ int encryptSize;
+ int dataSize;
+ int modSize;
+
+ try {
+ if(encode) {
+ cryptData = Base64.getDecoder().decode(value);
+ } else {
+ cryptData = value.getBytes();
+ }
+
+ dataSize = cryptData.length;
+ modSize = dataSize % 16;
+
+ roundNum = decKeySetup(masterKey, roundKey);
+
+ start = 1;
+ encryptData = Delphi.setLength(dataSize);
+ for (i = 1; i <= Math.floorDiv(dataSize, 16); i++) {
+ Arrays.fill(inBlock, 0);
+ Arrays.fill(outBlock, 0);
+
+ Delphi.move(cryptData,(start-1),inBlock,16);
+ doEncrypt(inBlock, roundNum, roundKey, outBlock);
+ Delphi.move(outBlock,encryptData,start-1,16);
+
+ start = Delphi.inc(start,16);
+ }
+
+
+ if(modSize > 0) {
+ Arrays.fill(inBlock, 0);
+ Arrays.fill(outBlock, 0);
+
+ Delphi.move(cryptData,(start-1),inBlock,16);
+ doEncrypt(inBlock, roundNum, roundKey, outBlock);
+ Delphi.move(outBlock,encryptData,start-1,16);
+
+ }
+
+ encryptSize = Delphi.move(encryptData,0);
+ byte[] copy = new byte[encryptSize];
+ Delphi.move(encryptData,4,copy,0,encryptSize);
+ return new String(copy, charset);
+
+ } catch (Exception e) {
+ throw runtimeException(e);
+ }
+ }
+
+ private static void _convertIntArray(int[] n){
+ for(int j = 0; j < n.length; j++ ) {
+ if(n[j] < 0)
+ n[j] = n[j] + 256;
+ else
+ n[j] = n[j];
+ }
+ }
+
+ private static int[][] SBox = {
+ // S-box type 1
+ { 0x63, 0x7c, 0x77, 0x7b, 0xf2,
+ 0x6b, 0x6f, 0xc5, 0x30,
+ 0x01, 0x67, 0x2b, 0xfe,
+ 0xd7, 0xab, 0x76, 0xca,
+ 0x82, 0xc9, 0x7d, 0xfa,
+ 0x59, 0x47, 0xf0, 0xad,
+ 0xd4, 0xa2, 0xaf, 0x9c,
+ 0xa4, 0x72, 0xc0, 0xb7,
+ 0xfd, 0x93, 0x26, 0x36,
+ 0x3f, 0xf7, 0xcc, 0x34,
+ 0xa5, 0xe5, 0xf1, 0x71,
+ 0xd8, 0x31, 0x15, 0x04,
+ 0xc7, 0x23, 0xc3, 0x18,
+ 0x96, 0x05, 0x9a, 0x07,
+ 0x12, 0x80, 0xe2, 0xeb,
+ 0x27, 0xb2, 0x75, 0x09,
+ 0x83, 0x2c, 0x1a, 0x1b,
+ 0x6e, 0x5a, 0xa0, 0x52,
+ 0x3b, 0xd6, 0xb3, 0x29,
+ 0xe3, 0x2f, 0x84, 0x53,
+ 0xd1, 0x00, 0xed, 0x20,
+ 0xfc, 0xb1, 0x5b, 0x6a,
+ 0xcb, 0xbe, 0x39, 0x4a,
+ 0x4c, 0x58, 0xcf, 0xd0,
+ 0xef, 0xaa, 0xfb, 0x43,
+ 0x4d, 0x33, 0x85, 0x45,
+ 0xf9, 0x02, 0x7f, 0x50,
+ 0x3c, 0x9f, 0xa8, 0x51,
+ 0xa3, 0x40, 0x8f, 0x92,
+ 0x9d, 0x38, 0xf5, 0xbc,
+ 0xb6, 0xda, 0x21, 0x10,
+ 0xff, 0xf3, 0xd2, 0xcd,
+ 0x0c, 0x13, 0xec, 0x5f,
+ 0x97, 0x44, 0x17, 0xc4,
+ 0xa7, 0x7e, 0x3d, 0x64,
+ 0x5d, 0x19, 0x73, 0x60,
+ 0x81, 0x4f, 0xdc, 0x22,
+ 0x2a, 0x90, 0x88, 0x46,
+ 0xee, 0xb8, 0x14, 0xde,
+ 0x5e, 0x0b, 0xdb, 0xe0,
+ 0x32, 0x3a, 0x0a, 0x49,
+ 0x06, 0x24, 0x5c, 0xc2,
+ 0xd3, 0xac, 0x62, 0x91,
+ 0x95, 0xe4, 0x79, 0xe7,
+ 0xc8, 0x37, 0x6d, 0x8d,
+ 0xd5, 0x4e, 0xa9, 0x6c,
+ 0x56, 0xf4, 0xea, 0x65,
+ 0x7a, 0xae, 0x08, 0xba,
+ 0x78, 0x25, 0x2e, 0x1c,
+ 0xa6, 0xb4, 0xc6, 0xe8,
+ 0xdd, 0x74, 0x1f, 0x4b,
+ 0xbd, 0x8b, 0x8a, 0x70,
+ 0x3e, 0xb5, 0x66, 0x48,
+ 0x03, 0xf6, 0x0e, 0x61,
+ 0x35, 0x57, 0xb9, 0x86,
+ 0xc1, 0x1d, 0x9e, 0xe1,
+ 0xf8, 0x98, 0x11, 0x69,
+ 0xd9, 0x8e, 0x94, 0x9b,
+ 0x1e, 0x87, 0xe9, 0xce,
+ 0x55, 0x28, 0xdf, 0x8c,
+ 0xa1, 0x89, 0x0d, 0xbf,
+ 0xe6, 0x42, 0x68, 0x41,
+ 0x99, 0x2d, 0x0f, 0xb0,
+ 0x54, 0xbb, 0x16 },
+ // S-box type 2
+ { 0xe2, 0x4e, 0x54, 0xfc, 0x94,
+ 0xc2, 0x4a, 0xcc, 0x62,
+ 0x0d, 0x6a, 0x46, 0x3c,
+ 0x4d, 0x8b, 0xd1, 0x5e,
+ 0xfa, 0x64, 0xcb, 0xb4,
+ 0x97, 0xbe, 0x2b, 0xbc,
+ 0x77, 0x2e, 0x03, 0xd3,
+ 0x19, 0x59, 0xc1, 0x1d,
+ 0x06, 0x41, 0x6b, 0x55,
+ 0xf0, 0x99, 0x69, 0xea,
+ 0x9c, 0x18, 0xae, 0x63,
+ 0xdf, 0xe7, 0xbb, 0x00,
+ 0x73, 0x66, 0xfb, 0x96,
+ 0x4c, 0x85, 0xe4, 0x3a,
+ 0x09, 0x45, 0xaa, 0x0f,
+ 0xee, 0x10, 0xeb, 0x2d,
+ 0x7f, 0xf4, 0x29, 0xac,
+ 0xcf, 0xad, 0x91, 0x8d,
+ 0x78, 0xc8, 0x95, 0xf9,
+ 0x2f, 0xce, 0xcd, 0x08,
+ 0x7a, 0x88, 0x38, 0x5c,
+ 0x83, 0x2a, 0x28, 0x47,
+ 0xdb, 0xb8, 0xc7, 0x93,
+ 0xa4, 0x12, 0x53, 0xff,
+ 0x87, 0x0e, 0x31, 0x36,
+ 0x21, 0x58, 0x48, 0x01,
+ 0x8e, 0x37, 0x74, 0x32,
+ 0xca, 0xe9, 0xb1, 0xb7,
+ 0xab, 0x0c, 0xd7, 0xc4,
+ 0x56, 0x42, 0x26, 0x07,
+ 0x98, 0x60, 0xd9, 0xb6,
+ 0xb9, 0x11, 0x40, 0xec,
+ 0x20, 0x8c, 0xbd, 0xa0,
+ 0xc9, 0x84, 0x04, 0x49,
+ 0x23, 0xf1, 0x4f, 0x50,
+ 0x1f, 0x13, 0xdc, 0xd8,
+ 0xc0, 0x9e, 0x57, 0xe3,
+ 0xc3, 0x7b, 0x65, 0x3b,
+ 0x02, 0x8f, 0x3e, 0xe8,
+ 0x25, 0x92, 0xe5, 0x15,
+ 0xdd, 0xfd, 0x17, 0xa9,
+ 0xbf, 0xd4, 0x9a, 0x7e,
+ 0xc5, 0x39, 0x67, 0xfe,
+ 0x76, 0x9d, 0x43, 0xa7,
+ 0xe1, 0xd0, 0xf5, 0x68,
+ 0xf2, 0x1b, 0x34, 0x70,
+ 0x05, 0xa3, 0x8a, 0xd5,
+ 0x79, 0x86, 0xa8, 0x30,
+ 0xc6, 0x51, 0x4b, 0x1e,
+ 0xa6, 0x27, 0xf6, 0x35,
+ 0xd2, 0x6e, 0x24, 0x16,
+ 0x82, 0x5f, 0xda, 0xe6,
+ 0x75, 0xa2, 0xef, 0x2c,
+ 0xb2, 0x1c, 0x9f, 0x5d,
+ 0x6f, 0x80, 0x0a, 0x72,
+ 0x44, 0x9b, 0x6c, 0x90,
+ 0x0b, 0x5b, 0x33, 0x7d,
+ 0x5a, 0x52, 0xf3, 0x61,
+ 0xa1, 0xf7, 0xb0, 0xd6,
+ 0x3f, 0x7c, 0x6d, 0xed,
+ 0x14, 0xe0, 0xa5, 0x3d,
+ 0x22, 0xb3, 0xf8, 0x89,
+ 0xde, 0x71, 0x1a, 0xaf,
+ 0xba, 0xb5, 0x81 },
+ // inverse of S-box type 1
+ { 0x52, 0x09, 0x6a, 0xd5, 0x30,
+ 0x36, 0xa5, 0x38, 0xbf,
+ 0x40, 0xa3, 0x9e, 0x81,
+ 0xf3, 0xd7, 0xfb, 0x7c,
+ 0xe3, 0x39, 0x82, 0x9b,
+ 0x2f, 0xff, 0x87, 0x34,
+ 0x8e, 0x43, 0x44, 0xc4,
+ 0xde, 0xe9, 0xcb, 0x54,
+ 0x7b, 0x94, 0x32, 0xa6,
+ 0xc2, 0x23, 0x3d, 0xee,
+ 0x4c, 0x95, 0x0b, 0x42,
+ 0xfa, 0xc3, 0x4e, 0x08,
+ 0x2e, 0xa1, 0x66, 0x28,
+ 0xd9, 0x24, 0xb2, 0x76,
+ 0x5b, 0xa2, 0x49, 0x6d,
+ 0x8b, 0xd1, 0x25, 0x72,
+ 0xf8, 0xf6, 0x64, 0x86,
+ 0x68, 0x98, 0x16, 0xd4,
+ 0xa4, 0x5c, 0xcc, 0x5d,
+ 0x65, 0xb6, 0x92, 0x6c,
+ 0x70, 0x48, 0x50, 0xfd,
+ 0xed, 0xb9, 0xda, 0x5e,
+ 0x15, 0x46, 0x57, 0xa7,
+ 0x8d, 0x9d, 0x84, 0x90,
+ 0xd8, 0xab, 0x00, 0x8c,
+ 0xbc, 0xd3, 0x0a, 0xf7,
+ 0xe4, 0x58, 0x05, 0xb8,
+ 0xb3, 0x45, 0x06, 0xd0,
+ 0x2c, 0x1e, 0x8f, 0xca,
+ 0x3f, 0x0f, 0x02, 0xc1,
+ 0xaf, 0xbd, 0x03, 0x01,
+ 0x13, 0x8a, 0x6b, 0x3a,
+ 0x91, 0x11, 0x41, 0x4f,
+ 0x67, 0xdc, 0xea, 0x97,
+ 0xf2, 0xcf, 0xce, 0xf0,
+ 0xb4, 0xe6, 0x73, 0x96,
+ 0xac, 0x74, 0x22, 0xe7,
+ 0xad, 0x35, 0x85, 0xe2,
+ 0xf9, 0x37, 0xe8, 0x1c,
+ 0x75, 0xdf, 0x6e, 0x47,
+ 0xf1, 0x1a, 0x71, 0x1d,
+ 0x29, 0xc5, 0x89, 0x6f,
+ 0xb7, 0x62, 0x0e, 0xaa,
+ 0x18, 0xbe, 0x1b, 0xfc,
+ 0x56, 0x3e, 0x4b, 0xc6,
+ 0xd2, 0x79, 0x20, 0x9a,
+ 0xdb, 0xc0, 0xfe, 0x78,
+ 0xcd, 0x5a, 0xf4, 0x1f,
+ 0xdd, 0xa8, 0x33, 0x88,
+ 0x07, 0xc7, 0x31, 0xb1,
+ 0x12, 0x10, 0x59, 0x27,
+ 0x80, 0xec, 0x5f, 0x60,
+ 0x51, 0x7f, 0xa9, 0x19,
+ 0xb5, 0x4a, 0x0d, 0x2d,
+ 0xe5, 0x7a, 0x9f, 0x93,
+ 0xc9, 0x9c, 0xef, 0xa0,
+ 0xe0, 0x3b, 0x4d, 0xae,
+ 0x2a, 0xf5, 0xb0, 0xc8,
+ 0xeb, 0xbb, 0x3c, 0x83,
+ 0x53, 0x99, 0x61, 0x17,
+ 0x2b, 0x04, 0x7e, 0xba,
+ 0x77, 0xd6, 0x26, 0xe1,
+ 0x69, 0x14, 0x63, 0x55,
+ 0x21, 0x0c, 0x7d },
+ // inverse of S-box type 2
+ { 0x30, 0x68, 0x99, 0x1b, 0x87,
+ 0xb9, 0x21, 0x78, 0x50,
+ 0x39, 0xdb, 0xe1, 0x72,
+ 0x09, 0x62, 0x3c, 0x3e,
+ 0x7e, 0x5e, 0x8e, 0xf1,
+ 0xa0, 0xcc, 0xa3, 0x2a,
+ 0x1d, 0xfb, 0xb6, 0xd6,
+ 0x20, 0xc4, 0x8d, 0x81,
+ 0x65, 0xf5, 0x89, 0xcb,
+ 0x9d, 0x77, 0xc6, 0x57,
+ 0x43, 0x56, 0x17, 0xd4,
+ 0x40, 0x1a, 0x4d, 0xc0,
+ 0x63, 0x6c, 0xe3, 0xb7,
+ 0xc8, 0x64, 0x6a, 0x53,
+ 0xaa, 0x38, 0x98, 0x0c,
+ 0xf4, 0x9b, 0xed, 0x7f,
+ 0x22, 0x76, 0xaf, 0xdd,
+ 0x3a, 0x0b, 0x58, 0x67,
+ 0x88, 0x06, 0xc3, 0x35,
+ 0x0d, 0x01, 0x8b, 0x8c,
+ 0xc2, 0xe6, 0x5f, 0x02,
+ 0x24, 0x75, 0x93, 0x66,
+ 0x1e, 0xe5, 0xe2, 0x54,
+ 0xd8, 0x10, 0xce, 0x7a,
+ 0xe8, 0x08, 0x2c, 0x12,
+ 0x97, 0x32, 0xab, 0xb4,
+ 0x27, 0x0a, 0x23, 0xdf,
+ 0xef, 0xca, 0xd9, 0xb8,
+ 0xfa, 0xdc, 0x31, 0x6b,
+ 0xd1, 0xad, 0x19, 0x49,
+ 0xbd, 0x51, 0x96, 0xee,
+ 0xe4, 0xa8, 0x41, 0xda,
+ 0xff, 0xcd, 0x55, 0x86,
+ 0x36, 0xbe, 0x61, 0x52,
+ 0xf8, 0xbb, 0x0e, 0x82,
+ 0x48, 0x69, 0x9a, 0xe0,
+ 0x47, 0x9e, 0x5c, 0x04,
+ 0x4b, 0x34, 0x15, 0x79,
+ 0x26, 0xa7, 0xde, 0x29,
+ 0xae, 0x92, 0xd7, 0x84,
+ 0xe9, 0xd2, 0xba, 0x5d,
+ 0xf3, 0xc5, 0xb0, 0xbf,
+ 0xa4, 0x3b, 0x71, 0x44,
+ 0x46, 0x2b, 0xfc, 0xeb,
+ 0x6f, 0xd5, 0xf6, 0x14,
+ 0xfe, 0x7c, 0x70, 0x5a,
+ 0x7d, 0xfd, 0x2f, 0x18,
+ 0x83, 0x16, 0xa5, 0x91,
+ 0x1f, 0x05, 0x95, 0x74,
+ 0xa9, 0xc1, 0x5b, 0x4a,
+ 0x85, 0x6d, 0x13, 0x07,
+ 0x4f, 0x4e, 0x45, 0xb2,
+ 0x0f, 0xc9, 0x1c, 0xa6,
+ 0xbc, 0xec, 0x73, 0x90,
+ 0x7b, 0xcf, 0x59, 0x8f,
+ 0xa1, 0xf9, 0x2d, 0xf2,
+ 0xb1, 0x00, 0x94, 0x37,
+ 0x9f, 0xd0, 0x2e, 0x9c,
+ 0x6e, 0x28, 0x3f, 0x80,
+ 0xf0, 0x3d, 0xd3, 0x25,
+ 0x8a, 0xb5, 0xe7, 0x42,
+ 0xb3, 0xc7, 0xea, 0xf7,
+ 0x4c, 0x11, 0x33, 0x03,
+ 0xa2, 0xac, 0x60 }
+ };
+ private static int[][] KRK = {
+ { 0x51, 0x7c, 0xc1, 0xb7, 0x27,
+ 0x22, 0x0a, 0x94, 0xfe,
+ 0x13, 0xab, 0xe8, 0xfa,
+ 0x9a, 0x6e, 0xe0 },
+ { 0x6d, 0xb1, 0x4a, 0xcc, 0x9e,
+ 0x21, 0xc8, 0x20, 0xff,
+ 0x28, 0xb1, 0xd5, 0xef,
+ 0x5d, 0xe2, 0xb0 },
+ { 0xdb, 0x92, 0x37, 0x1d, 0x21,
+ 0x26, 0xe9, 0x70, 0x03,
+ 0x24, 0x97, 0x75, 0x04,
+ 0xe8, 0xc9, 0x0e }
+ };
+}
\ No newline at end of file
diff --git a/src/test/java/cokr/xit/base/crypto/CryptographyTest.java b/src/test/java/cokr/xit/base/crypto/CryptographyTest.java
index 68ee18b..30f1ada 100644
--- a/src/test/java/cokr/xit/base/crypto/CryptographyTest.java
+++ b/src/test/java/cokr/xit/base/crypto/CryptographyTest.java
@@ -1,6 +1,8 @@
package cokr.xit.base.crypto;
import java.lang.reflect.Method;
+import java.security.MessageDigest;
+import java.util.HexFormat;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.PropertyUtils;
@@ -54,17 +56,42 @@ public class CryptographyTest /* extends TestSupport */ {
String name = "xit-aria";
Cryptography aria = Cryptography.get(name);
- String str = "7011102177320",
- encrypted = aria.encrypt(str),
+ String plain = "7011102177320",
+ encrypted = aria.encrypt(plain),
decrypted = aria.decrypt(encrypted);
- System.out.println(String.format("text:%s -> encrypted:%s -> decrypted:%s", str, encrypted, decrypted));
- Assertions.assertEquals(str, decrypted);
+ System.out.println(String.format("plain: %s -> encrypted: %s -> decrypted: %s", plain, encrypted, decrypted));
+ Assertions.assertEquals(plain, decrypted);
- encrypted = "zyiiAcdcgc9G/UOGT6+W2pL0DfsFYDcCt1Sn9cKk/Ro=";
+ plain = "5703201535219";
+ encrypted = aria.encrypt(plain);
+ decrypted = aria.decrypt(encrypted);
+ System.out.println(String.format("plain: %s -> encrypted: %s -> decrypted: %s", plain, encrypted, decrypted));
+ Assertions.assertEquals(plain, decrypted);
+
+ encrypted = "0EsqJtTQ+kaN3ISfI1g78IP9Rx9Vz9iiEliy1NV1G8w=";
decrypted = aria.decrypt(encrypted);
System.out.println(String.format("encrypted: %s -> decrypted: %s", encrypted, decrypted));
}
+ private String md5(String str) {
+ try {
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ md.update(str.getBytes("EUC-KR"));
+ byte[] digest = md.digest();
+ return HexFormat.of().withDelimiter("").formatHex(digest);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Test
+ void md5() {
+ String str = "7011102177320";
+ System.out.println(md5(str));
+ System.out.println(System.getProperty("os.name").toLowerCase());
+ }
+
+
@Test
void echelon() {
String name = "echelon";