Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

AES cleanup

Browse Source
This commit is contained in:
David Harris 2024-05-24 14:28:30 -07:00
parent b2689b4f01
commit a95977590d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ieu/aes/aes64d.sv
View File

@ -32,7 +32,7 @@ module aes64d(
output logic [63:0] result
);
logic [63:0] ShiftRowsOut, SboxOut, MixcolIn, MixcolOut;
logic [63:0] ShiftRowsOut, SboxOut, MixcolsIn, MixcolsOut;
// Apply inverse shiftrows to rs2 and rs1
aesinvshiftrows64 srow({rs2, rs1}, ShiftRowsOut);
@ -40,12 +40,12 @@ module aes64d(
// Apply full word inverse substitution to lower doubleord of shiftrow out
aesinvsbox64 invsbox(ShiftRowsOut, SboxOut);
mux2 #(64) mixcolmux(SboxOut, rs1, aes64im, MixcolIn);
mux2 #(64) mixcolmux(SboxOut, rs1, aes64im, MixcolsIn);
// Apply inverse MixColumns to sbox outputs
aesinvmixcolumns32 invmw0(MixcolIn[31:0], MixcolOut[31:0]);
aesinvmixcolumns32 invmw1(MixcolIn[63:32], MixcolOut[63:32]);
aesinvmixcolumns32 invmw0(MixcolsIn[31:0], MixcolsOut[31:0]);
aesinvmixcolumns32 invmw1(MixcolsIn[63:32], MixcolsOut[63:32]);
// Final round skips mixcolumns.
mux2 #(64) resultmux(MixcolOut, SboxOut, finalround, result);
mux2 #(64) resultmux(MixcolsOut, SboxOut, finalround, result);
endmodule

8
src/ieu/aes/aes64e.sv
View File

@ -34,7 +34,7 @@ module aes64e(
output logic [63:0] result
);
logic [63:0] ShiftRowsOut, SboxOut, MixcolOut;
logic [63:0] ShiftRowsOut, SboxOut, MixcolsOut;
// AES shiftrow unit
aesshiftrows64 srow({rs2,rs1}, ShiftRowsOut);
@ -47,9 +47,9 @@ module aes64e(
aessbox32 sbox1(ShiftRowsOut[63:32], SboxOut[63:32]); // instantiate second sbox
// Apply MixColumns operations
aesmixcolumns32 mw0(SboxOut[31:0], MixcolOut[31:0]);
aesmixcolumns32 mw1(SboxOut[63:32], MixcolOut[63:32]);
aesmixcolumns32 mw0(SboxOut[31:0], MixcolsOut[31:0]);
aesmixcolumns32 mw1(SboxOut[63:32], MixcolsOut[63:32]);
// Skip mixcolumns on last round
mux2 #(64) resultmux(MixcolOut, SboxOut, finalround, result);
mux2 #(64) resultmux(MixcolsOut, SboxOut, finalround, result);
endmodule