From eae3ae285aa99e4a0235e91f83028d8c5216ca59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?leehagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?= Date: Tue, 26 Sep 2023 13:42:59 +0900 Subject: [PATCH] =?UTF-8?q?[LDRA]=20585=20S:=20=EB=8F=99=EC=9D=BC=ED=95=9C?= =?UTF-8?q?=20=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=20?= =?UTF-8?q?=ED=95=9C=EC=A4=84=EB=A1=9C=20=EC=9E=91=EC=97=85=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EB=B6=80=EB=B6=84=EB=93=A4=20=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=A1=9C=20=EB=82=98=EB=88=A0=EC=84=9C=20?= =?UTF-8?q?=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 | 16 ++++++++++------ .../palnet/server/encrptn/kisa/KISA_SHA256.java | 10 ++++++++-- 2 files changed, 18 insertions(+), 8 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 7faad63..7c6045f 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 @@ -849,12 +849,18 @@ public class KISA_SEED_CBC { if(ENDIAN == BIG_ENDIAN) { int shift_value = (3-b_offset%4)*8; int mask_value = 0x0ff << shift_value; - int value = (src[b_offset/4] & mask_value) >> shift_value; + int mask_value2 = src[b_offset/4]; + int value2 = mask_value2 & mask_value; + int value = value2 >> shift_value; +// int value = (src[b_offset/4] & mask_value) >> shift_value; return (byte)value; } else { int shift_value = (b_offset%4)*8; int mask_value = 0x0ff << shift_value; - int value = (src[b_offset/4] & mask_value) >> shift_value; + int mask_value2 = src[b_offset/4]; + int value2 = mask_value2 & mask_value; + int value = value2 >> shift_value; +// int value = (src[b_offset/4] & mask_value) >> shift_value; return (byte)value; } @@ -871,13 +877,11 @@ public class KISA_SEED_CBC { } public static void byte_to_int(int[] dst, int dst_offset, byte[] src, int src_offset, int ENDIAN) { - int value = 0; if(ENDIAN == BIG_ENDIAN) { - value = ((0x0ff&src[src_offset]) << 24) | ((0x0ff&src[src_offset+1]) << 16) | ((0x0ff&src[src_offset+2]) << 8) | ((0x0ff&src[src_offset+3])); + dst[dst_offset] = ((0x0ff&src[src_offset]) << 24) | ((0x0ff&src[src_offset+1]) << 16) | ((0x0ff&src[src_offset+2]) << 8) | ((0x0ff&src[src_offset+3])); } else { - value = ((0x0ff&src[src_offset])) | ((0x0ff&src[src_offset+1]) << 8) | ((0x0ff&src[src_offset+2]) << 16) | ((0x0ff&src[src_offset+3]) << 24); + dst[dst_offset] = ((0x0ff&src[src_offset])) | ((0x0ff&src[src_offset+1]) << 8) | ((0x0ff&src[src_offset+2]) << 16) | ((0x0ff&src[src_offset+3]) << 24); } - dst[dst_offset] = value; } public static int byte_to_int(byte[] src, int src_offset, int ENDIAN) { 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 8a790fa..a8b91af 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 @@ -294,12 +294,18 @@ public class KISA_SHA256 { if(ENDIAN == BIG_ENDIAN) { int shift_value = (3-b_offset%4)*8; int mask_value = 0x0ff << shift_value; - int value = (src[b_offset/4] & mask_value) >> shift_value; + int mask_value2 = src[b_offset/4]; + int value2 = mask_value2 & mask_value; + int value = value2 >> shift_value; +// int value = (src[b_offset/4] & mask_value) >> shift_value; return (byte)value; } else { int shift_value = (b_offset%4)*8; int mask_value = 0x0ff << shift_value; - int value = (src[b_offset/4] & mask_value) >> shift_value; + int mask_value2 = src[b_offset/4]; + int value2 = mask_value2 & mask_value; + int value = value2 >> shift_value; +// int value = (src[b_offset/4] & mask_value) >> shift_value; return (byte)value; }