From 03c332e6d1ab92d4ddbe06f233d1c798ed151546 Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Thu, 24 Oct 2024 11:18:34 +0900
Subject: [PATCH] =?UTF-8?q?=EC=95=94=EB=B3=B5=ED=98=B8=ED=99=94=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EB=B0=A9=EB=B2=95=20=EC=B6=94=EA=B0=80(?=
 =?UTF-8?q?=EA=B8=B0=EC=A1=B4=EC=97=90=20=EB=8D=B8=ED=8C=8C=EC=9D=B4(?=
 =?UTF-8?q?=ED=81=B4=EB=A6=B0=ED=8C=8C=ED=82=B9)=EC=97=90=EC=84=9C=20c++?=
 =?UTF-8?q?=EB=A1=9C=20=EC=9E=91=EC=84=B1=EB=90=9C=20DLL=ED=8C=8C=EC=9D=BC?=
 =?UTF-8?q?(xAria32.dll)=20=ED=98=B8=EC=B6=9C=ED=95=98=EC=97=AC=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=ED=95=9C=20=EC=95=94=EB=B3=B5=ED=98=B8?=
 =?UTF-8?q?=ED=99=94)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cokr/xit/base/crypto/bean/XitAria.java    |   4 +-
 .../cokr/xit/base/crypto/bean/XitBridge.java  | 435 ++++++------------
 2 files changed, 155 insertions(+), 284 deletions(-)

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 78e344c..c3aa31d 100644
--- a/src/main/java/cokr/xit/base/crypto/bean/XitAria.java
+++ b/src/main/java/cokr/xit/base/crypto/bean/XitAria.java
@@ -3,15 +3,17 @@ package cokr.xit.base.crypto.bean;
 import cokr.xit.base.crypto.Cryptography;
 
 public class XitAria extends Cryptography {
+
 	private String key;
 	private int keySize;
 	private XitBridge bridge;
 
     public XitAria(String name) {
 		super(name);
+		int version = def.settings().number("version").intValue();
 		setKey(def.settings().string("key"));
 		setKeySize(def.settings().number("keySize").intValue());
-		bridge = XitBridge.create(key, def.settings().string("charset"), keySize);
+		bridge = XitBridge.create(key, def.settings().string("charset"), keySize, version);
 	}
 
     public XitAria setKey(String key)  {
diff --git a/src/main/java/cokr/xit/base/crypto/bean/XitBridge.java b/src/main/java/cokr/xit/base/crypto/bean/XitBridge.java
index cdf25c2..7b41af2 100644
--- a/src/main/java/cokr/xit/base/crypto/bean/XitBridge.java
+++ b/src/main/java/cokr/xit/base/crypto/bean/XitBridge.java
@@ -24,6 +24,10 @@ public class XitBridge extends AbstractComponent {
 		"KeySize", new KeySize()
 	);
 
+	// version이 1이면 델파이(클린파킹)에서 c++로 작성된 xAria32.dll파일 호출하던 암복호화 방식
+	// version이 1이 아닐 경우 델파이(클린파킹)로 작성된 암복호화 방식(cxAria.pas)
+	int version;
+
 	public abstract class Property<T> {
 		public abstract T read();
 		public abstract void write(T o);
@@ -168,8 +172,16 @@ public class XitBridge extends AbstractComponent {
 	// 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 R, q;
+		//if(version == 1) {
+			//R = (128 + 256) / 32;
+			//q = (128 - 128) / 64;
+		//} else {
+			R = (keySize + 256) / 32;
+			q = (keySize - 128) / 64;
+		//}
+
+
 		int i;
 		int[] t = new int[16];
 		int[] w1 = new int[16];
@@ -220,7 +232,11 @@ public class XitBridge extends AbstractComponent {
 		diffusionLayer(t, w3);
 
 		for (i = 0; i < 16; i++) {
-			w3[i] = w3[1] ^ w1[i];
+			if(version == 1) {
+				w3[i] = w3[i] ^ w1[i];
+			} else {
+				w3[i] = w3[1] ^ w1[i];
+			}
 		}
 
 		//e초기화
@@ -297,10 +313,17 @@ public class XitBridge extends AbstractComponent {
 
 	private void setKey(String value) {
 		if (equals(key, value)) return;
-
+		byte[] hash;
 		try {
-		    byte[] hash = inMD5(key = value);
-		    Delphi.move(hash, 0, masterKey, masterKey.length);
+			if(version == 1) {
+				key = value;
+				hash = key.getBytes(charset);
+				masterKey = new int[hash.length];
+			} else {
+				hash = inMD5(key = value);
+			}
+
+		    Delphi.move(hash, 0, masterKey, hash.length);
 		} catch (Exception e) {
 			throw runtimeException(e);
 		}
@@ -313,11 +336,12 @@ public class XitBridge extends AbstractComponent {
 			throw new IllegalArgumentException("num: " + num);
 	}
 
-	public static XitBridge create(String key, String charset, int keySize) {
+	public static XitBridge create(String key, String charset, int keySize, int version) {
 		XitBridge newAria = new XitBridge();
 		newAria.encode = true;
 		newAria.key = "";
 		newAria.charset = charset;
+		newAria.version = version;
 		newAria.keySize = keySize;
 
 		newAria.properties.get("Encode").write(true);
@@ -344,18 +368,43 @@ public class XitBridge extends AbstractComponent {
 
 			byte[] value_byte = value.getBytes(charset);
 
+			if(version == 1) {
+				if(value_byte.length % 16 != 0) {
+					int padCount = 16 - (value_byte.length % 16);
+					byte[] newByte = new byte[value_byte.length + padCount];
+					Arrays.fill(newByte, (byte)0x00);
+					for(int j=0;j<value_byte.length;j++) {
+						newByte[j] = value_byte[j];
+					}
+					newByte[newByte.length-1] = (byte) (padCount);
+					value_byte = newByte;
+				}
+			}
+
 			encryptSize = value_byte.length;
-			encryptData = Delphi.setLength(encryptSize + 4);
 
-			Delphi.move(encryptSize, encryptData, 0);
-			Delphi.move(value_byte,0,encryptData,4,encryptSize);
+			if(version == 1) {
+				encryptData = Delphi.setLength(encryptSize);
+				Delphi.move(value_byte,0,encryptData,0,encryptSize);
+
+			} else {
+				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));
+
+			if(version == 1) {
+				cryptData = Delphi.setLength(dataSize);
+			} else {
+				cryptData = Delphi.setLength(dataSize + 16 - (dataSize % 16));
+			}
 
 			for(i = 1; i <= Math.floorDiv(dataSize,16); i++) {
 				Arrays.fill(inBlock, 0);
@@ -408,6 +457,7 @@ public class XitBridge extends AbstractComponent {
 				cryptData = value.getBytes();
 			}
 
+
 			dataSize = cryptData.length;
 			modSize = dataSize % 16;
 
@@ -437,10 +487,22 @@ public class XitBridge extends AbstractComponent {
 
 			}
 
-			encryptSize = Delphi.move(encryptData,0);
-			byte[] copy = new byte[encryptSize];
-			Delphi.move(encryptData,4,copy,0,encryptSize);
-			return new String(copy, charset);
+			if(version == 1) {
+				if(encryptData[encryptData.length-1] >= 0x01 && encryptData[encryptData.length-1] <= 0x0F) {
+					byte[] newByte = new byte[encryptData.length-encryptData[15]];
+					for(int j=0; j<newByte.length; j++) {
+						newByte[j] = encryptData[j];
+					}
+					encryptData = newByte;
+				}
+
+				return new String(encryptData, charset);
+			} else {
+				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);
@@ -458,278 +520,85 @@ public class XitBridge extends AbstractComponent {
 
 	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 },
+		{
+		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 },
+		{
+		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 },
+		{
+		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 }
+		{
+		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 }
+		{  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