summaryrefslogtreecommitdiff
path: root/bcprov/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java
diff options
context:
space:
mode:
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java')
-rw-r--r--bcprov/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java149
1 files changed, 74 insertions, 75 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java
index 021b0f7d..0b491ab5 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java
@@ -11,7 +11,7 @@ import org.bouncycastle.util.Pack;
/**
* an implementation of the AES (Rijndael), from FIPS-197.
* <p>
- * For further details see: <a href="http://csrc.nist.gov/encryption/aes/">http://csrc.nist.gov/encryption/aes/</a>.
+ * For further details see: <a href="https://csrc.nist.gov/encryption/aes/">https://csrc.nist.gov/encryption/aes/</a>.
*
* This implementation is based on optimizations from Dr. Brian Gladman's paper and C code at
* <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">http://fp.gladman.plus.com/cryptography_technology/rijndael/</a>
@@ -296,98 +296,97 @@ private static final int[] Tinv0 =
{
case 4:
{
- int t0 = Pack.littleEndianToInt(key, 0); W[0][0] = t0;
- int t1 = Pack.littleEndianToInt(key, 4); W[0][1] = t1;
- int t2 = Pack.littleEndianToInt(key, 8); W[0][2] = t2;
- int t3 = Pack.littleEndianToInt(key, 12); W[0][3] = t3;
+ int col0 = Pack.littleEndianToInt(key, 0); W[0][0] = col0;
+ int col1 = Pack.littleEndianToInt(key, 4); W[0][1] = col1;
+ int col2 = Pack.littleEndianToInt(key, 8); W[0][2] = col2;
+ int col3 = Pack.littleEndianToInt(key, 12); W[0][3] = col3;
for (int i = 1; i <= 10; ++i)
{
- int u = subWord(shift(t3, 8)) ^ rcon[i - 1];
- t0 ^= u; W[i][0] = t0;
- t1 ^= t0; W[i][1] = t1;
- t2 ^= t1; W[i][2] = t2;
- t3 ^= t2; W[i][3] = t3;
+ int colx = subWord(shift(col3, 8)) ^ rcon[i - 1];
+ col0 ^= colx; W[i][0] = col0;
+ col1 ^= col0; W[i][1] = col1;
+ col2 ^= col1; W[i][2] = col2;
+ col3 ^= col2; W[i][3] = col3;
}
break;
}
case 6:
{
- int t0 = Pack.littleEndianToInt(key, 0); W[0][0] = t0;
- int t1 = Pack.littleEndianToInt(key, 4); W[0][1] = t1;
- int t2 = Pack.littleEndianToInt(key, 8); W[0][2] = t2;
- int t3 = Pack.littleEndianToInt(key, 12); W[0][3] = t3;
- int t4 = Pack.littleEndianToInt(key, 16); W[1][0] = t4;
- int t5 = Pack.littleEndianToInt(key, 20); W[1][1] = t5;
-
- int rcon = 1;
- int u = subWord(shift(t5, 8)) ^ rcon; rcon <<= 1;
- t0 ^= u; W[1][2] = t0;
- t1 ^= t0; W[1][3] = t1;
- t2 ^= t1; W[2][0] = t2;
- t3 ^= t2; W[2][1] = t3;
- t4 ^= t3; W[2][2] = t4;
- t5 ^= t4; W[2][3] = t5;
-
- for (int i = 3; i < 12; i += 3)
+ int col0 = Pack.littleEndianToInt(key, 0); W[0][0] = col0;
+ int col1 = Pack.littleEndianToInt(key, 4); W[0][1] = col1;
+ int col2 = Pack.littleEndianToInt(key, 8); W[0][2] = col2;
+ int col3 = Pack.littleEndianToInt(key, 12); W[0][3] = col3;
+
+ int col4 = Pack.littleEndianToInt(key, 16);
+ int col5 = Pack.littleEndianToInt(key, 20);
+
+ int i = 1, rcon = 1, colx;
+ for (;;)
{
- u = subWord(shift(t5, 8)) ^ rcon; rcon <<= 1;
- t0 ^= u; W[i ][0] = t0;
- t1 ^= t0; W[i ][1] = t1;
- t2 ^= t1; W[i ][2] = t2;
- t3 ^= t2; W[i ][3] = t3;
- t4 ^= t3; W[i + 1][0] = t4;
- t5 ^= t4; W[i + 1][1] = t5;
- u = subWord(shift(t5, 8)) ^ rcon; rcon <<= 1;
- t0 ^= u; W[i + 1][2] = t0;
- t1 ^= t0; W[i + 1][3] = t1;
- t2 ^= t1; W[i + 2][0] = t2;
- t3 ^= t2; W[i + 2][1] = t3;
- t4 ^= t3; W[i + 2][2] = t4;
- t5 ^= t4; W[i + 2][3] = t5;
- }
+ W[i ][0] = col4;
+ W[i ][1] = col5;
+ colx = subWord(shift(col5, 8)) ^ rcon; rcon <<= 1;
+ col0 ^= colx; W[i ][2] = col0;
+ col1 ^= col0; W[i ][3] = col1;
+
+ col2 ^= col1; W[i + 1][0] = col2;
+ col3 ^= col2; W[i + 1][1] = col3;
+ col4 ^= col3; W[i + 1][2] = col4;
+ col5 ^= col4; W[i + 1][3] = col5;
+
+ colx = subWord(shift(col5, 8)) ^ rcon; rcon <<= 1;
+ col0 ^= colx; W[i + 2][0] = col0;
+ col1 ^= col0; W[i + 2][1] = col1;
+ col2 ^= col1; W[i + 2][2] = col2;
+ col3 ^= col2; W[i + 2][3] = col3;
+
+ if ((i += 3) >= 13)
+ {
+ break;
+ }
- u = subWord(shift(t5, 8)) ^ rcon;
- t0 ^= u; W[12][0] = t0;
- t1 ^= t0; W[12][1] = t1;
- t2 ^= t1; W[12][2] = t2;
- t3 ^= t2; W[12][3] = t3;
+ col4 ^= col3;
+ col5 ^= col4;
+ }
break;
}
case 8:
{
- int t0 = Pack.littleEndianToInt(key, 0); W[0][0] = t0;
- int t1 = Pack.littleEndianToInt(key, 4); W[0][1] = t1;
- int t2 = Pack.littleEndianToInt(key, 8); W[0][2] = t2;
- int t3 = Pack.littleEndianToInt(key, 12); W[0][3] = t3;
- int t4 = Pack.littleEndianToInt(key, 16); W[1][0] = t4;
- int t5 = Pack.littleEndianToInt(key, 20); W[1][1] = t5;
- int t6 = Pack.littleEndianToInt(key, 24); W[1][2] = t6;
- int t7 = Pack.littleEndianToInt(key, 28); W[1][3] = t7;
-
- int u, rcon = 1;
-
- for (int i = 2; i < 14; i += 2)
+ int col0 = Pack.littleEndianToInt(key, 0); W[0][0] = col0;
+ int col1 = Pack.littleEndianToInt(key, 4); W[0][1] = col1;
+ int col2 = Pack.littleEndianToInt(key, 8); W[0][2] = col2;
+ int col3 = Pack.littleEndianToInt(key, 12); W[0][3] = col3;
+
+ int col4 = Pack.littleEndianToInt(key, 16); W[1][0] = col4;
+ int col5 = Pack.littleEndianToInt(key, 20); W[1][1] = col5;
+ int col6 = Pack.littleEndianToInt(key, 24); W[1][2] = col6;
+ int col7 = Pack.littleEndianToInt(key, 28); W[1][3] = col7;
+
+ int i = 2, rcon = 1, colx;
+ for (;;)
{
- u = subWord(shift(t7, 8)) ^ rcon; rcon <<= 1;
- t0 ^= u; W[i ][0] = t0;
- t1 ^= t0; W[i ][1] = t1;
- t2 ^= t1; W[i ][2] = t2;
- t3 ^= t2; W[i ][3] = t3;
- u = subWord(t3);
- t4 ^= u; W[i + 1][0] = t4;
- t5 ^= t4; W[i + 1][1] = t5;
- t6 ^= t5; W[i + 1][2] = t6;
- t7 ^= t6; W[i + 1][3] = t7;
- }
+ colx = subWord(shift(col7, 8)) ^ rcon; rcon <<= 1;
+ col0 ^= colx; W[i][0] = col0;
+ col1 ^= col0; W[i][1] = col1;
+ col2 ^= col1; W[i][2] = col2;
+ col3 ^= col2; W[i][3] = col3;
+ ++i;
+
+ if (i >= 15)
+ {
+ break;
+ }
- u = subWord(shift(t7, 8)) ^ rcon;
- t0 ^= u; W[14][0] = t0;
- t1 ^= t0; W[14][1] = t1;
- t2 ^= t1; W[14][2] = t2;
- t3 ^= t2; W[14][3] = t3;
+ colx = subWord(col3);
+ col4 ^= colx; W[i][0] = col4;
+ col5 ^= col4; W[i][1] = col5;
+ col6 ^= col5; W[i][2] = col6;
+ col7 ^= col6; W[i][3] = col7;
+ ++i;
+ }
break;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 15:05:10 +0000