lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor code cleanup.

Browse Source
This commit is contained in:
MobiusDev
2018-05-13 21:57:11 +00:00
parent 70ecacd484
commit 163e544aab
5 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
L2ClientDat/java/com/l2jmobius/L2ClientDat.java
View File

@@ -78,7 +78,6 @@ public class L2ClientDat extends JFrame
setLocationRelativeTo(null); setLocationRelativeTo(null);
addWindowListener(new WindowAdapter() addWindowListener(new WindowAdapter()
{ {
@Override @Override
public void windowClosing(WindowEvent evt) public void windowClosing(WindowEvent evt)
{ {

68
L2ClientDat/java/com/l2jmobius/clientcryptor/crypt/BlowfishEngine.java
View File

@@ -1088,14 +1088,14 @@ public final class BlowfishEngine
public void init(boolean encryption, byte[] key) public void init(boolean encryption, byte[] key)
{ {
this.encrypting = encryption; encrypting = encryption;
this.workingKey = key; workingKey = key;
this.setKey(this.workingKey); setKey(workingKey);
} }
public final int processBlock(byte[] in, int inOff, byte[] out, int outOff) throws IllegalBlockSizeException, ShortBufferException public final int processBlock(byte[] in, int inOff, byte[] out, int outOff) throws IllegalBlockSizeException, ShortBufferException
{ {
if (this.workingKey == null) if (workingKey == null)
{ {
throw new IllegalStateException("Blowfish not initialised"); throw new IllegalStateException("Blowfish not initialised");
} }
@@ -1107,20 +1107,20 @@ public final class BlowfishEngine
{ {
throw new ShortBufferException("output buffer too short"); throw new ShortBufferException("output buffer too short");
} }
if (this.encrypting) if (encrypting)
{ {
this.encryptBlock(in, inOff, out, outOff); encryptBlock(in, inOff, out, outOff);
} }
else else
{ {
this.decryptBlock(in, inOff, out, outOff); decryptBlock(in, inOff, out, outOff);
} }
return 8; return 8;
} }
private int F(int x) private int F(int x)
{ {
return ((this.S0[x >>> 24] + this.S1[(x >>> 16) & 255]) ^ this.S2[(x >>> 8) & 255]) + this.S3[x & 255]; return ((S0[x >>> 24] + S1[(x >>> 16) & 255]) ^ S2[(x >>> 8) & 255]) + S3[x & 255];
} }
private void processTable(int xl, int xr, int[] table) private void processTable(int xl, int xr, int[] table)
@@ -1128,12 +1128,12 @@ public final class BlowfishEngine
int size = table.length; int size = table.length;
for (int s = 0; s < size; s += 2) for (int s = 0; s < size; s += 2)
{ {
xl ^= this.P[0]; xl ^= P[0];
for (int i = 1; i < 16; i += 2) for (int i = 1; i < 16; i += 2)
{ {
xl ^= this.F(xr ^= this.F(xl) ^ this.P[i]) ^ this.P[i + 1]; xl ^= F(xr ^= F(xl) ^ P[i]) ^ P[i + 1];
} }
table[s] = xr ^= this.P[17]; table[s] = xr ^= P[17];
table[s + 1] = xl; table[s + 1] = xl;
xr = xl; xr = xl;
xl = table[s]; xl = table[s];
@@ -1142,11 +1142,11 @@ public final class BlowfishEngine
private void setKey(byte[] key) private void setKey(byte[] key)
{ {
System.arraycopy(KS0, 0, this.S0, 0, 256); System.arraycopy(KS0, 0, S0, 0, 256);
System.arraycopy(KS1, 0, this.S1, 0, 256); System.arraycopy(KS1, 0, S1, 0, 256);
System.arraycopy(KS2, 0, this.S2, 0, 256); System.arraycopy(KS2, 0, S2, 0, 256);
System.arraycopy(KS3, 0, this.S3, 0, 256); System.arraycopy(KS3, 0, S3, 0, 256);
System.arraycopy(KP, 0, this.P, 0, 18); System.arraycopy(KP, 0, P, 0, 18);
int keyLength = key.length; int keyLength = key.length;
int keyIndex = 0; int keyIndex = 0;
int i = 0; int i = 0;
@@ -1162,41 +1162,41 @@ public final class BlowfishEngine
} }
keyIndex = 0; keyIndex = 0;
} }
int[] arrn = this.P; int[] arrn = P;
int n = i++; int n = i++;
arrn[n] = arrn[n] ^ data; arrn[n] = arrn[n] ^ data;
} }
this.processTable(0, 0, this.P); processTable(0, 0, P);
this.processTable(this.P[16], this.P[17], this.S0); processTable(P[16], P[17], S0);
this.processTable(this.S0[254], this.S0[255], this.S1); processTable(S0[254], S0[255], S1);
this.processTable(this.S1[254], this.S1[255], this.S2); processTable(S1[254], S1[255], S2);
this.processTable(this.S2[254], this.S2[255], this.S3); processTable(S2[254], S2[255], S3);
} }
private void encryptBlock(byte[] src, int srcIndex, byte[] dst, int dstIndex) private void encryptBlock(byte[] src, int srcIndex, byte[] dst, int dstIndex)
{ {
int xl = this.BytesTo32bits(src, srcIndex); int xl = BytesTo32bits(src, srcIndex);
int xr = this.BytesTo32bits(src, srcIndex + 4); int xr = BytesTo32bits(src, srcIndex + 4);
xl ^= this.P[0]; xl ^= P[0];
for (int i = 1; i < 16; i += 2) for (int i = 1; i < 16; i += 2)
{ {
xl ^= this.F(xr ^= this.F(xl) ^ this.P[i]) ^ this.P[i + 1]; xl ^= F(xr ^= F(xl) ^ P[i]) ^ P[i + 1];
} }
this.Bits32ToBytes(xr ^= this.P[17], dst, dstIndex); Bits32ToBytes(xr ^= P[17], dst, dstIndex);
this.Bits32ToBytes(xl, dst, dstIndex + 4); Bits32ToBytes(xl, dst, dstIndex + 4);
} }
private void decryptBlock(byte[] src, int srcIndex, byte[] dst, int dstIndex) private void decryptBlock(byte[] src, int srcIndex, byte[] dst, int dstIndex)
{ {
int xl = this.BytesTo32bits(src, srcIndex); int xl = BytesTo32bits(src, srcIndex);
int xr = this.BytesTo32bits(src, srcIndex + 4); int xr = BytesTo32bits(src, srcIndex + 4);
xl ^= this.P[17]; xl ^= P[17];
for (int i = 16; i > 0; i -= 2) for (int i = 16; i > 0; i -= 2)
{ {
xl ^= this.F(xr ^= this.F(xl) ^ this.P[i]) ^ this.P[i - 1]; xl ^= F(xr ^= F(xl) ^ P[i]) ^ P[i - 1];
} }
this.Bits32ToBytes(xr ^= this.P[0], dst, dstIndex); Bits32ToBytes(xr ^= P[0], dst, dstIndex);
this.Bits32ToBytes(xl, dst, dstIndex + 4); Bits32ToBytes(xl, dst, dstIndex + 4);
} }
private int BytesTo32bits(byte[] b, int i) private int BytesTo32bits(byte[] b, int i)

1
L2ClientDat/java/com/l2jmobius/data/GameDataName.java
View File

@@ -234,5 +234,4 @@ public class GameDataName
{ {
} }
} }
} }

1
L2ClientDat/java/com/l2jmobius/xml/DescriptorReader.java
View File

@@ -391,5 +391,4 @@ public class DescriptorReader
} }
} }
} }
} }

1
L2ClientDat/java/com/l2jmobius/xml/DescriptorWriter.java
View File

@@ -358,5 +358,4 @@ public class DescriptorWriter
} }
} }
} }
} }