echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Crypto: Initialize array earlier (ticket #1989)

Browse Source
This commit is contained in:
zzz
2017-05-14 11:57:48 +00:00
parent 040af114e1
commit e973185be1
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/src/net/i2p/crypto/CryptixRijndael_Algorithm.java
View File

@ -569,15 +569,19 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor
int KC = k.length / 4; int KC = k.length / 4;
int[] tk; // new int[KC]; int[] tk; // new int[KC];
int i, j; int i, j;
// the return value
Object[] sessionKey;
if (keyData == null) { if (keyData == null) {
Ke = new int[ROUNDS + 1][BC]; Ke = new int[ROUNDS + 1][BC];
Kd = new int[ROUNDS + 1][BC]; Kd = new int[ROUNDS + 1][BC];
tk = new int[KC]; tk = new int[KC];
sessionKey = new Object[] { Ke, Kd};
} else { } else {
Ke = keyData.Ke; Ke = keyData.Ke;
Kd = keyData.Kd; Kd = keyData.Kd;
tk = keyData.tk; tk = keyData.tk;
sessionKey = keyData.key;
} }
// copy user material bytes into temporary ints // copy user material bytes into temporary ints
@ -636,14 +640,6 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor
Kd[r][j] = _U1[(tt >>> 24) & 0xFF] ^ _U2[(tt >>> 16) & 0xFF] ^ _U3[(tt >>> 8) & 0xFF] ^ _U4[tt & 0xFF]; Kd[r][j] = _U1[(tt >>> 24) & 0xFF] ^ _U2[(tt >>> 16) & 0xFF] ^ _U3[(tt >>> 8) & 0xFF] ^ _U4[tt & 0xFF];
} }
} }
// assemble the encryption (Ke) and decryption (Kd) round keys into
// one sessionKey object
Object[] sessionKey;
if (keyData == null)
sessionKey = new Object[] { Ke, Kd};
else
sessionKey = keyData.key;
//if (_RDEBUG) trace(_OUT, "makeKey()");
return sessionKey; return sessionKey;
} }