From 3857d826b4bfd03194c515a826a22aced9e18b13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?leehagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?=
 <winner__loser@naver.com>
Date: Mon, 25 Sep 2023 17:01:46 +0900
Subject: [PATCH] =?UTF-8?q?[LDRA]=20585=20S=20(=EB=B6=80=EB=B6=84=EC=A0=81?=
 =?UTF-8?q?=20=EC=B2=98=EB=A6=AC):=20=EB=8F=99=EC=9D=BC=ED=95=9C=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=EC=97=90=20=EB=8C=80=ED=95=9C=20?=
 =?UTF-8?q?=EB=B9=84=ED=8A=B8=EC=99=80=20=EC=97=B0=EC=82=B0=20-=20=20Syste?=
 =?UTF-8?q?m.out.print=20=EB=B6=80=EB=B6=84=EC=97=90=20=EB=B9=84=ED=8A=B8?=
 =?UTF-8?q?=20=EC=97=B0=EC=82=B0=EC=9D=B4=20=EB=91=90=EB=B2=88=20=EC=A7=84?=
 =?UTF-8?q?=ED=96=89=20=EC=A4=91=EC=9D=B4=EC=97=AC=EC=84=9C=20=EB=82=98?=
 =?UTF-8?q?=EB=88=A0=EC=84=9C=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/encrptn/kisa/KISA_SEED_CBC.java    | 230 ++++++++++++++----
 .../server/encrptn/kisa/KISA_SHA256.java      |  28 ++-
 2 files changed, 200 insertions(+), 58 deletions(-)

diff --git a/src/main/java/com/palnet/server/encrptn/kisa/KISA_SEED_CBC.java b/src/main/java/com/palnet/server/encrptn/kisa/KISA_SEED_CBC.java
index d7a20c9..9e90541 100644
--- a/src/main/java/com/palnet/server/encrptn/kisa/KISA_SEED_CBC.java
+++ b/src/main/java/com/palnet/server/encrptn/kisa/KISA_SEED_CBC.java
@@ -372,12 +372,18 @@ public class KISA_SEED_CBC {
 		if(ENDIAN != Common.BIG_ENDIAN) {
 			for(i=0;i<inLen;i++)
 			{
-				data[i] = (byte)(in[i/4] >> ((i%4)*8));
+				int temp = in[i / 4];
+				int shift = (i % 4) * 8;
+				data[i] = (byte) (temp >> shift);
+//				data[i] = (byte)(in[i/4] >> ((i%4)*8));
 			}
 		} else {
 			for(i=0;i<inLen;i++)
 			{
-				data[i] = (byte)(in[i/4] >> ((3-(i%4))*8));
+				int temp = in[i / 4];
+				int shift = (3 - (i % 4)) * 8;
+				data[i] = (byte) (temp >> shift);
+//				data[i] = (byte)(in[i/4] >> ((3-(i%4))*8));
 			}			
 		}
 
@@ -1055,10 +1061,20 @@ public class KISA_SEED_CBC {
 
 		System.out.print("[ Test Encrypt mode : \uFFFD\uFFFD\uFFFD 1 ]" +"\n");
 		System.out.print("Key\t\t\t\t: ");
-	    for (int i=0; i<16; i++)	System.out.print(Integer.toHexString(0xff&pbUserKey[i])+" ");
+	    for (int i=0; i<16; i++) {
+			int intValue = 0xff & pbUserKey[i];
+			String hexString = Integer.toHexString(intValue);
+//			System.out.print(Integer.toHexString(0xff & pbUserKey[i]) + " ");
+			System.out.print(hexString + " ");
+		}
 	    System.out.print("\n");
 		System.out.print("Plaintext\t\t\t: ");
-	    for (int i=0; i<PLAINTEXT_LENGTH; i++)	System.out.print(Integer.toHexString(0xff&pbData[i])+" ");
+	    for (int i=0; i<PLAINTEXT_LENGTH; i++){
+			int intValue = 0xff & pbData[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//			System.out.print(Integer.toHexString(0xff&pbData[i])+" ");
+		}
 	    System.out.print("\n");
 
 	    
@@ -1071,18 +1087,30 @@ public class KISA_SEED_CBC {
 	    
 	    
 	    System.out.print("\nIV\t\t\t\t: ");
-	    for (int i=0; i<16; i++)
-	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+	    for (int i=0; i<16; i++){
+			int intValue = 0xff & bszIV[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+		}
 	    System.out.print("\n");
 	    
 		System.out.print("Ciphertext(SEED_CBC_Encrypt)\t: ");
-	    for (int i=0; i<CIPHERTEXT_LENGTH; i++)
-	    	System.out.print(Integer.toHexString(0xff&defaultCipherText[i])+" ");
+	    for (int i=0; i<CIPHERTEXT_LENGTH; i++){
+			int intValue = 0xff & defaultCipherText[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&defaultCipherText[i])+" ");
+		}
 	    System.out.print("\n");
 	    
 	    System.out.print("Plaintext(SEED_CBC_Decrypt)\t: ");
-	    for (int i=0; i<PLAINTEXT_LENGTH; i++)
-	    	System.out.print(Integer.toHexString(0xff&PPPPP[i])+" ");
+	    for (int i=0; i<PLAINTEXT_LENGTH; i++){
+			int intValue = 0xff & PPPPP[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&PPPPP[i])+" ");
+		}
 	    System.out.print("\n\n");
 	    
 	    
@@ -1091,18 +1119,30 @@ public class KISA_SEED_CBC {
 	    byte[] Plain1 = SEED_CBC_Decrypt(pbUserKey, bszIV, Cipher1, 0, 16);
 	    
 	    System.out.print("IV\t\t\t\t: ");
-	    for (int i=0; i<16; i++)
-	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+	    for (int i=0; i<16; i++){
+			int intValue = 0xff & bszIV[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+		}
 	    System.out.print("\n");
 	    
 		System.out.print("Ciphertext(SEED_CBC_Encrypt1)\t: ");
-	    for (int i=0; i<16; i++)
-	    	System.out.print(Integer.toHexString(0xff&Cipher1[i])+" ");
+	    for (int i=0; i<16; i++){
+			int intValue = 0xff & Cipher1[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&Cipher1[i])+" ");
+		}
 	    System.out.print("\n");
 	    
 	    System.out.print("Plaintext(SEED_CBC_Decrypt1)\t: ");
-	    for (int i=0; i<2; i++)
-	    	System.out.print(Integer.toHexString(0xff&Plain1[i])+" ");
+	    for (int i=0; i<2; i++){
+			int intValue = 0xff & Plain1[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&Plain1[i])+" ");
+		}
 	    System.out.print("\n\n");
 
 	    
@@ -1111,18 +1151,30 @@ public class KISA_SEED_CBC {
 	    byte[] Plain2 = SEED_CBC_Decrypt(pbUserKey, bszIV, Cipher2, 0, 32);
 	    
 	    System.out.print("IV\t\t\t\t: ");
-	    for (int i=0; i<16; i++)
-	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+	    for (int i=0; i<16; i++){
+			int intValue = 0xff & bszIV[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+		}
 	    System.out.print("\n\n");
 	    
 		System.out.print("Ciphertext(SEED_CBC_Encrypt)\t: ");
-	    for (int i=0; i<32; i++)
-	    	System.out.print(Integer.toHexString(0xff&Cipher2[i])+" ");
+	    for (int i=0; i<32; i++){
+			int intValue = 0xff & Cipher2[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&Cipher2[i])+" ");
+		}
 	    System.out.print("\n");
 	    
 	    System.out.print("Plaintext(SEED_CBC_Decrypt)\t: ");
-	    for (int i=0; i<16; i++)
-	    	System.out.print(Integer.toHexString(0xff&Plain2[i])+" ");
+	    for (int i=0; i<16; i++){
+			int intValue = 0xff & Plain2[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&Plain2[i])+" ");
+		}
 	    System.out.print("\n\n\n");
 	    
 	
@@ -1133,18 +1185,30 @@ public class KISA_SEED_CBC {
 	    byte[] Plain3 = SEED_CBC_Decrypt(pbUserKey, bszIV, Cipher3, 0, 32);
 	    
 	    System.out.print("IV\t\t\t\t: ");
-	    for (int i=0; i<16; i++)
-	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+	    for (int i=0; i<16; i++){
+			int intValue = 0xff & bszIV[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+		}
 	    System.out.print("\n");
 	    
 		System.out.print("Ciphertext(SEED_CBC_Encrypt3)\t: ");
-	    for (int i=0; i<32; i++)
-	    	System.out.print(Integer.toHexString(0xff&Cipher3[i])+" ");
+	    for (int i=0; i<32; i++){
+			int intValue = 0xff & Cipher3[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&Cipher3[i])+" ");
+		}
 	    System.out.print("\n");
 	    
 	    System.out.print("Plaintext(SEED_CBC_Decrypt3)\t: ");
-	    for (int i=0; i<18; i++)
-	    	System.out.print(Integer.toHexString(0xff&Plain3[i])+" ");
+	    for (int i=0; i<18; i++){
+			int intValue = 0xff & Plain3[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&Plain3[i])+" ");
+		}
 	    System.out.print("\n");
 
 		   
@@ -1173,10 +1237,20 @@ public class KISA_SEED_CBC {
 	    
 		System.out.print("\n\n[ Test Encrypt mode : \uFFFD\uFFFD\uFFFD 2 ]" +"\n");
 		System.out.print("Key\t\t\t\t: ");
-	    for (int i=0; i<16; i++)	System.out.print(Integer.toHexString(0xff&pbUserKey[i])+", ");
+	    for (int i=0; i<16; i++)	{
+			int intValue = 0xff & pbUserKey[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//			System.out.print(Integer.toHexString(0xff&pbUserKey[i])+", ");
+		}
 	    System.out.print("\n");
 		System.out.print("Plaintext\t\t\t: ");
-	    for (int i=0; i<PLAINTEXT_LENGTH; i++)	System.out.print(Integer.toHexString(0xff&pbData[i])+", ");
+	    for (int i=0; i<PLAINTEXT_LENGTH; i++){
+			int intValue = 0xff & pbData[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//			System.out.print(Integer.toHexString(0xff&pbData[i])+", ");
+		}
 	    System.out.print("\n");
 	    
 	    
@@ -1245,13 +1319,21 @@ public class KISA_SEED_CBC {
 
 	    
 	    System.out.print("IV\t\t\t\t: ");
-	    for (int i=0; i<16; i++)
-	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+", ");
+	    for (int i=0; i<16; i++){
+			int intValue = 0xff & bszIV[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+", ");
+		}
 	    System.out.print("\n");
 	    
 		System.out.print("Ciphertext(SEED_CBC_Encrypt 1)\t: ");
-	    for (int i=0; i<CIPHERTEXT_LENGTH; i++)
-	    	System.out.print(Integer.toHexString(0xff&pbszCipherText[i])+", ");
+	    for (int i=0; i<CIPHERTEXT_LENGTH; i++){
+			int intValue = 0xff & pbszCipherText[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&pbszCipherText[i])+", ");
+		}
 	    System.out.print("\n");
 	    
 	    
@@ -1348,8 +1430,12 @@ public class KISA_SEED_CBC {
 	    
 	    
 	    System.out.print("Plaintext(SEED_CBC_Decrypt 1)\t: ");
-	    for (int i=0; i<PLAINTEXT_LENGTH; i++)
-	    	System.out.print(Integer.toHexString(0xff&result[i])+", ");
+	    for (int i=0; i<PLAINTEXT_LENGTH; i++){
+			int intValue = 0xff & result[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&result[i])+", ");
+		}
 	    System.out.print("\n\n");
 	    
 		data = null;
@@ -1434,13 +1520,21 @@ public class KISA_SEED_CBC {
 		
 	    
 	    System.out.print("\n\nIV\t\t\t\t: ");
-	    for (int i=0; i<16; i++)
-	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+	    for (int i=0; i<16; i++){
+			int intValue = 0xff & bszIV[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+		}
 	    System.out.print("\n");
 	    
 		System.out.print("Ciphertext(SEED_CBC_Encrypt)\t: ");
-	    for (int i=0; i<16; i++)
-	    	System.out.print(Integer.toHexString(0xff&pbszCipherText[i])+" ");
+	    for (int i=0; i<16; i++){
+			int intValue = 0xff & pbszCipherText[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&pbszCipherText[i])+" ");
+		}
 	    System.out.print("\n");
 	    
 
@@ -1539,8 +1633,12 @@ public class KISA_SEED_CBC {
 	    
 	    
 	    System.out.print("Plaintext(SEED_CBC_Decrypt 1)\t: ");
-	    for (int i=0; i<PLAINTEXT_LENGTH; i++)
-	    	System.out.print(Integer.toHexString(0xff&result[i])+" ");
+	    for (int i=0; i<PLAINTEXT_LENGTH; i++){
+			int intValue = 0xff & result[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&result[i])+" ");
+		}
 	    System.out.print("\n\n");
 	    
 		data = null;
@@ -1610,13 +1708,21 @@ public class KISA_SEED_CBC {
 		
 	    
 	    System.out.print("\n\nIV\t\t\t\t: ");
-	    for (int i=0; i<16; i++)
-	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+	    for (int i=0; i<16; i++){
+			int intValue = 0xff & bszIV[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+		}
 	    System.out.print("\n");
 	    
 		System.out.print("Ciphertext(SEED_CBC_Encrypt)\t: ");
-	    for (int i=0; i<32; i++)
-	    	System.out.print(Integer.toHexString(0xff&pbszCipherText[i])+" ");
+	    for (int i=0; i<32; i++){
+			int intValue = 0xff & pbszCipherText[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&pbszCipherText[i])+" ");
+		}
 	    System.out.print("\n");
 	    
    
@@ -1714,8 +1820,12 @@ public class KISA_SEED_CBC {
 	    
 	    
 	    System.out.print("Plaintext(SEED_CBC_Decrypt 1)\t: ");
-	    for (int i=0; i<PLAINTEXT_LENGTH; i++)
-	    	System.out.print(Integer.toHexString(0xff&result[i])+" ");
+	    for (int i=0; i<PLAINTEXT_LENGTH; i++){
+			int intValue = 0xff & result[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&result[i])+" ");
+		}
 	    System.out.print("\n\n");
 	    
 		data = null;
@@ -1787,13 +1897,21 @@ public class KISA_SEED_CBC {
 		
 	    
 	    System.out.print("\n\nIV\t\t\t\t: ");
-	    for (int i=0; i<16; i++)
-	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+	    for (int i=0; i<16; i++){
+			int intValue = 0xff & bszIV[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&bszIV[i])+" ");
+		}
 	    System.out.print("\n");
 	    
 		System.out.print("Ciphertext(SEED_CBC_Encrypt)\t: ");
-	    for (int i=0; i<32; i++)
-	    	System.out.print(Integer.toHexString(0xff&pbszCipherText[i])+" ");
+	    for (int i=0; i<32; i++){
+			int intValue = 0xff & pbszCipherText[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&pbszCipherText[i])+" ");
+		}
 	    System.out.print("\n");
 	    
    
@@ -1892,8 +2010,12 @@ public class KISA_SEED_CBC {
 	    
 	    
 	    System.out.print("Plaintext(SEED_CBC_Decrypt 1)\t: ");
-	    for (int i=0; i<PLAINTEXT_LENGTH; i++)
-	    	System.out.print(Integer.toHexString(0xff&result[i])+" ");
+	    for (int i=0; i<PLAINTEXT_LENGTH; i++){
+			int intValue = 0xff & result[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//	    	System.out.print(Integer.toHexString(0xff&result[i])+" ");
+		}
 	    System.out.print("\n\n");
 	    
 		data = null;
diff --git a/src/main/java/com/palnet/server/encrptn/kisa/KISA_SHA256.java b/src/main/java/com/palnet/server/encrptn/kisa/KISA_SHA256.java
index 3a0767a..c21b838 100644
--- a/src/main/java/com/palnet/server/encrptn/kisa/KISA_SHA256.java
+++ b/src/main/java/com/palnet/server/encrptn/kisa/KISA_SHA256.java
@@ -396,14 +396,24 @@ public class KISA_SHA256 {
 	    {
 	    
 			System.out.print("Plaintext\t: ");
-		    for (int i=0; i<Plaintext_length; i++)	System.out.print(Integer.toHexString(0xff&pbData[i])+" ");
+		    for (int i=0; i<Plaintext_length; i++)	{
+				int intValue = 0xff & pbData[i];
+				String hexString = Integer.toHexString(intValue);
+				System.out.print(hexString + " ");
+//				System.out.print(Integer.toHexString(0xff&pbData[i])+" ");
+			}
 		    System.out.print("\n");
 		  
 		// Encryption		
 		   SHA256_Encrpyt( pbData, Plaintext_length, pbCipher );
 	
 			System.out.print("Ciphertext\t: ");
-		    for (int i=0; i<32; i++)	System.out.print(Integer.toHexString(0xff&pbCipher[i])+" ");
+		    for (int i=0; i<32; i++){
+				int intValue = 0xff & pbCipher[i];
+				String hexString = Integer.toHexString(intValue);
+				System.out.print(hexString +  " ");
+//				System.out.print(Integer.toHexString(0xff&pbCipher[i])+" ");
+			}
 		    System.out.print("\n\n");
 		    
 		    Plaintext_length++;
@@ -412,12 +422,22 @@ public class KISA_SHA256 {
 	    
 	    
 		System.out.print("Plaintext\t: ");
-	    for (int i=0; i<1; i++)	System.out.print(Integer.toHexString(0xff&pbData1[i])+" ");
+	    for (int i=0; i<1; i++){
+			int intValue = 0xff & pbData1[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.print(hexString + " ");
+//			System.out.print(Integer.toHexString(0xff&pbData1[i])+" ");
+		}
 	    System.out.print("\n");	  
 	// Encryption			    
 	    SHA256_Encrpyt( pbData1, 1, pbCipher );
 		System.out.print("Ciphertext\t: ");
-	    for (int i=0; i<32; i++)	System.out.print(Integer.toHexString(0xff&pbCipher[i])+" ");
+	    for (int i=0; i<32; i++){
+			int intValue = 0xff & pbCipher[i];
+			String hexString = Integer.toHexString(intValue);
+			System.out.println(hexString + " ");
+//			System.out.print(Integer.toHexString(0xff&pbCipher[i])+" ");
+		}
 	    System.out.print("\n\n");