Skip to content

8326609: New AES implementation with updates specified in FIPS 197 #27807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed

8326609: New AES implementation with updates specified in FIPS 197 #27807

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a8f2837
8326609: New AES implementation with updates specified in FIPS 197
smemery Oct 14, 2025
1f742c1
Implement the rest of the class name changes in intrinsics
smemery Oct 14, 2025
af0f9c4
Add vmIntrinsics.hpp updates
smemery Oct 14, 2025
e22da25
Revert AESCrypt to AES_Crypt
smemery Oct 15, 2025
0700371
encryptBlock/decryptBlock methods set to package-private
smemery Oct 15, 2025
3fc25ae
Add remaining files to be staged
smemery Oct 15, 2025
f48160c
Updates for code review comments from @valeriepeng
smemery Oct 15, 2025
fbf2117
Updates for code review comments from @valeriepeng
smemery Oct 16, 2025
9f00c35
Updates for code review comments from @valeriepeng
smemery Oct 16, 2025
a5991a2
Updates for code review comments from @valeriepeng
smemery Oct 16, 2025
2ce35b9
Updates for code review comments from @valeriepeng
smemery Oct 17, 2025
1102c60
Updates for code review comments from @valeriepeng
smemery Oct 17, 2025
e0741b1
Updates for code review comments from @valeriepeng
smemery Oct 17, 2025
5ea6933
Updates for code review comments from @valeriepeng
smemery Oct 19, 2025
fdfd389
Updates for code review comments from @valeriepeng
smemery Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 38 additions & 42 deletions src/java.base/share/classes/com/sun/crypto/provider/AES_Crypt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,14 +1037,14 @@ private static int subWord(int word) {
*
* @param p [in] the plaintext to be encrypted.
* @param po [in] the plaintext offset in the array of bytes.
* @param c [out] the encrypted ciphertext output.
* @param c [out] the ciphertext output.
* @param co [in] the ciphertext offset in the array of bytes.
*/
@IntrinsicCandidate
private void implEncryptBlock(byte[] p, int po, byte[] c, int co) {
int ti0, ti1, ti2, ti3;
int a0, a1, a2, a3;
int w = 40;
int w = K.length - 4;

a0 = ((p[po] & 0xFF) << 24) ^ ((p[po + 1] & 0xFF) << 16)
^ ((p[po + 2] & 0xFF) << 8) ^ (p[po + 3] & 0xFF) ^ K[0];
Expand Down Expand Up @@ -1138,43 +1138,41 @@ private void implEncryptBlock(byte[] p, int po, byte[] c, int co) {

if (rounds > AES_128_ROUNDS) {
a0 = T0[ti0 >>> 24] ^ T1[(ti1 >> 16) & 0xFF]
^ T2[(ti2 >> 8) & 0xFF] ^ T3[ti3 & 0xFF] ^ K[w];
^ T2[(ti2 >> 8) & 0xFF] ^ T3[ti3 & 0xFF] ^ K[40];
a1 = T0[ti1 >>> 24] ^ T1[(ti2 >> 16) & 0xFF]
^ T2[(ti3 >> 8) & 0xFF] ^ T3[ti0 & 0xFF] ^ K[w + 1];
^ T2[(ti3 >> 8) & 0xFF] ^ T3[ti0 & 0xFF] ^ K[41];
a2 = T0[ti2 >>> 24] ^ T1[(ti3 >> 16) & 0xFF]
^ T2[(ti0 >> 8) & 0xFF] ^ T3[ti1 & 0xFF] ^ K[w + 2];
^ T2[(ti0 >> 8) & 0xFF] ^ T3[ti1 & 0xFF] ^ K[42];
a3 = T0[ti3 >>> 24] ^ T1[(ti0 >> 16) & 0xFF]
^ T2[(ti1 >> 8) & 0xFF] ^ T3[ti2 & 0xFF] ^ K[w + 3];
^ T2[(ti1 >> 8) & 0xFF] ^ T3[ti2 & 0xFF] ^ K[43];

ti0 = T0[a0 >>> 24] ^ T1[(a1 >> 16) & 0xFF]
^ T2[(a2 >> 8) & 0xFF] ^ T3[a3 & 0xFF] ^ K[w + 4];
^ T2[(a2 >> 8) & 0xFF] ^ T3[a3 & 0xFF] ^ K[44];
ti1 = T0[a1 >>> 24] ^ T1[(a2 >> 16) & 0xFF]
^ T2[(a3 >> 8) & 0xFF] ^ T3[a0 & 0xFF] ^ K[w + 5];
^ T2[(a3 >> 8) & 0xFF] ^ T3[a0 & 0xFF] ^ K[45];
ti2 = T0[a2 >>> 24] ^ T1[(a3 >> 16) & 0xFF]
^ T2[(a0 >> 8) & 0xFF] ^ T3[a1 & 0xFF] ^ K[w + 6];
^ T2[(a0 >> 8) & 0xFF] ^ T3[a1 & 0xFF] ^ K[46];
ti3 = T0[a3 >>> 24] ^ T1[(a0 >> 16) & 0xFF]
^ T2[(a1 >> 8) & 0xFF] ^ T3[a2 & 0xFF] ^ K[w + 7];
w += 8;
^ T2[(a1 >> 8) & 0xFF] ^ T3[a2 & 0xFF] ^ K[47];
}
if (rounds > AES_192_ROUNDS) {
a0 = T0[ti0 >>> 24] ^ T1[(ti1 >> 16) & 0xFF]
^ T2[(ti2 >> 8) & 0xFF] ^ T3[ti3 & 0xFF] ^ K[w];
^ T2[(ti2 >> 8) & 0xFF] ^ T3[ti3 & 0xFF] ^ K[48];
a1 = T0[ti1 >>> 24] ^ T1[(ti2 >> 16) & 0xFF]
^ T2[(ti3 >> 8) & 0xFF] ^ T3[ti0 & 0xFF] ^ K[w + 1];
^ T2[(ti3 >> 8) & 0xFF] ^ T3[ti0 & 0xFF] ^ K[49];
a2 = T0[ti2 >>> 24] ^ T1[(ti3 >> 16) & 0xFF]
^ T2[(ti0 >> 8) & 0xFF] ^ T3[ti1 & 0xFF] ^ K[w + 2];
^ T2[(ti0 >> 8) & 0xFF] ^ T3[ti1 & 0xFF] ^ K[50];
a3 = T0[ti3 >>> 24] ^ T1[(ti0 >> 16) & 0xFF]
^ T2[(ti1 >> 8) & 0xFF] ^ T3[ti2 & 0xFF] ^ K[w + 3];
^ T2[(ti1 >> 8) & 0xFF] ^ T3[ti2 & 0xFF] ^ K[51];

ti0 = T0[a0 >>> 24] ^ T1[(a1 >> 16) & 0xFF]
^ T2[(a2 >> 8) & 0xFF] ^ T3[a3 & 0xFF] ^ K[w + 4];
^ T2[(a2 >> 8) & 0xFF] ^ T3[a3 & 0xFF] ^ K[52];
ti1 = T0[a1 >>> 24] ^ T1[(a2 >> 16) & 0xFF]
^ T2[(a3 >> 8) & 0xFF] ^ T3[a0 & 0xFF] ^ K[w + 5];
^ T2[(a3 >> 8) & 0xFF] ^ T3[a0 & 0xFF] ^ K[53];
ti2 = T0[a2 >>> 24] ^ T1[(a3 >> 16) & 0xFF]
^ T2[(a0 >> 8) & 0xFF] ^ T3[a1 & 0xFF] ^ K[w + 6];
^ T2[(a0 >> 8) & 0xFF] ^ T3[a1 & 0xFF] ^ K[54];
ti3 = T0[a3 >>> 24] ^ T1[(a0 >> 16) & 0xFF]
^ T2[(a1 >> 8) & 0xFF] ^ T3[a2 & 0xFF] ^ K[w + 7];
w += 8;
^ T2[(a1 >> 8) & 0xFF] ^ T3[a2 & 0xFF] ^ K[55];
}

a0 = T2[ti0 >>> 24] & 0xFF000000
Expand All @@ -1184,15 +1182,15 @@ private void implEncryptBlock(byte[] p, int po, byte[] c, int co) {
a1 = T2[ti1 >>> 24] & 0xFF000000
^ T3[(ti2 >> 16) & 0xFF] & 0xFF0000
^ T0[(ti3 >> 8) & 0xFF] & 0xFF00
^ T1[ti0 & 0xFF] & 0xFF ^ K[w+1];
^ T1[ti0 & 0xFF] & 0xFF ^ K[w + 1];
a2 = T2[ti2 >>> 24] & 0xFF000000
^ T3[(ti3 >> 16) & 0xFF] & 0xFF0000
^ T0[(ti0 >> 8) & 0xFF] & 0xFF00
^ T1[ti1 & 0xFF] & 0xFF ^ K[w+2];
^ T1[ti1 & 0xFF] & 0xFF ^ K[w + 2];
a3 = T2[ti3 >>> 24] & 0xFF000000
^ T3[(ti0 >> 16) & 0xFF] & 0xFF0000
^ T0[(ti1 >> 8) & 0xFF] & 0xFF00
^ T1[ti2 & 0xFF] & 0xFF ^ K[w+3];
^ T1[ti2 & 0xFF] & 0xFF ^ K[w + 3];

c[co] = (byte) (a0 >>> 24);
c[co + 1] = (byte) ((a0 >> 16) & 0xFF);
Expand All @@ -1217,14 +1215,13 @@ private void implEncryptBlock(byte[] p, int po, byte[] c, int co) {
*
* @param c [in] the ciphertext to be decrypted.
* @param co [in] the ciphertext offset in the array of bytes.
* @param p [out] the decrypted plaintext output.
* @param p [out] the plaintext output.
* @param po [in] the plaintext offset in the array of bytes.
*/
@IntrinsicCandidate
private void implDecryptBlock(byte[] c, int co, byte[] p, int po) {
int ti0, ti1, ti2, ti3;
int a0, a1, a2, a3;
int w = 44;

ti0 = ((c[co] & 0xFF) << 24) ^ ((c[co + 1] & 0xFF) << 16)
^ ((c[co + 2] & 0xFF) << 8) ^ (c[co + 3] & 0xFF) ^ K[4];
Expand Down Expand Up @@ -1318,42 +1315,41 @@ private void implDecryptBlock(byte[] c, int co, byte[] p, int po) {

if (rounds > AES_128_ROUNDS) {
ti0 = TI0[a0 >>> 24] ^ TI1[(a3 >> 16) & 0xFF]
^ TI2[(a2 >> 8) & 0xFF] ^ TI3[a1 & 0xFF] ^ K[w];
^ TI2[(a2 >> 8) & 0xFF] ^ TI3[a1 & 0xFF] ^ K[44];
ti1 = TI0[a1 >>> 24] ^ TI1[(a0 >> 16) & 0xFF]
^ TI2[(a3 >> 8) & 0xFF] ^ TI3[a2 & 0xFF] ^ K[w + 1];
^ TI2[(a3 >> 8) & 0xFF] ^ TI3[a2 & 0xFF] ^ K[45];
ti2 = TI0[a2 >>> 24] ^ TI1[(a1 >> 16) & 0xFF]
^ TI2[(a0 >> 8) & 0xFF] ^ TI3[a3 & 0xFF] ^ K[w + 2];
^ TI2[(a0 >> 8) & 0xFF] ^ TI3[a3 & 0xFF] ^ K[46];
ti3 = TI0[a3 >>> 24] ^ TI1[(a2 >> 16) & 0xFF]
^ TI2[(a1 >> 8) & 0xFF] ^ TI3[a0 & 0xFF] ^ K[w + 3];
^ TI2[(a1 >> 8) & 0xFF] ^ TI3[a0 & 0xFF] ^ K[47];

a0 = TI0[ti0 >>> 24] ^ TI1[(ti3 >> 16) & 0xFF]
^ TI2[(ti2 >> 8) & 0xFF] ^ TI3[ti1 & 0xFF] ^ K[w + 4];
^ TI2[(ti2 >> 8) & 0xFF] ^ TI3[ti1 & 0xFF] ^ K[48];
a1 = TI0[ti1 >>> 24] ^ TI1[(ti0 >> 16) & 0xFF]
^ TI2[(ti3 >> 8) & 0xFF] ^ TI3[ti2 & 0xFF] ^ K[w + 5];
^ TI2[(ti3 >> 8) & 0xFF] ^ TI3[ti2 & 0xFF] ^ K[49];
a2 = TI0[ti2 >>> 24] ^ TI1[(ti1 >> 16) & 0xFF]
^ TI2[(ti0 >> 8) & 0xFF] ^ TI3[ti3 & 0xFF] ^ K[w + 6];
^ TI2[(ti0 >> 8) & 0xFF] ^ TI3[ti3 & 0xFF] ^ K[50];
a3 = TI0[ti3 >>> 24] ^ TI1[(ti2 >> 16) & 0xFF]
^ TI2[(ti1 >> 8) & 0xFF] ^ TI3[ti0 & 0xFF] ^ K[w + 7];
w += 8;
^ TI2[(ti1 >> 8) & 0xFF] ^ TI3[ti0 & 0xFF] ^ K[51];
}
if (rounds > AES_192_ROUNDS) {
ti0 = TI0[a0 >>> 24] ^ TI1[(a3 >> 16) & 0xFF]
^ TI2[(a2 >> 8) & 0xFF] ^ TI3[a1 & 0xFF] ^ K[w];
^ TI2[(a2 >> 8) & 0xFF] ^ TI3[a1 & 0xFF] ^ K[52];
ti1 = TI0[a1 >>> 24] ^ TI1[(a0 >> 16) & 0xFF]
^ TI2[(a3 >> 8) & 0xFF] ^ TI3[a2 & 0xFF] ^ K[w + 1];
^ TI2[(a3 >> 8) & 0xFF] ^ TI3[a2 & 0xFF] ^ K[53];
ti2 = TI0[a2 >>> 24] ^ TI1[(a1 >> 16) & 0xFF]
^ TI2[(a0 >> 8) & 0xFF] ^ TI3[a3 & 0xFF] ^ K[w + 2];
^ TI2[(a0 >> 8) & 0xFF] ^ TI3[a3 & 0xFF] ^ K[54];
ti3 = TI0[a3 >>> 24] ^ TI1[(a2 >> 16) & 0xFF]
^ TI2[(a1 >> 8) & 0xFF] ^ TI3[a0 & 0xFF] ^ K[w + 3];
^ TI2[(a1 >> 8) & 0xFF] ^ TI3[a0 & 0xFF] ^ K[55];

a0 = TI0[ti0 >>> 24] ^ TI1[(ti3 >> 16) & 0xFF]
^ TI2[(ti2 >> 8) & 0xFF] ^ TI3[ti1 & 0xFF] ^ K[w + 4];
^ TI2[(ti2 >> 8) & 0xFF] ^ TI3[ti1 & 0xFF] ^ K[56];
a1 = TI0[ti1 >>> 24] ^ TI1[(ti0 >> 16) & 0xFF]
^ TI2[(ti3 >> 8) & 0xFF] ^ TI3[ti2 & 0xFF] ^ K[w + 5];
^ TI2[(ti3 >> 8) & 0xFF] ^ TI3[ti2 & 0xFF] ^ K[57];
a2 = TI0[ti2 >>> 24] ^ TI1[(ti1 >> 16) & 0xFF]
^ TI2[(ti0 >> 8) & 0xFF] ^ TI3[ti3 & 0xFF] ^ K[w + 6];
^ TI2[(ti0 >> 8) & 0xFF] ^ TI3[ti3 & 0xFF] ^ K[58];
a3 = TI0[ti3 >>> 24] ^ TI1[(ti2 >> 16) & 0xFF]
^ TI2[(ti1 >> 8) & 0xFF] ^ TI3[ti0 & 0xFF] ^ K[w + 7];
^ TI2[(ti1 >> 8) & 0xFF] ^ TI3[ti0 & 0xFF] ^ K[59];
}

ti0 = TI4[a0 >>> 24] & 0xFF000000 ^ TI4[(a3 >> 16) & 0xFF] & 0xFF0000
Expand Down