SHA2 refactoring, add skeletons for 'big' SHA

tuokri · Aug 6, 2024 · ca4f737 · ca4f737
1 parent 9c4faa6
commit ca4f737
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 11 deletions.
diff --git a/Classes/FCryptoMemory.uc b/Classes/FCryptoMemory.uc
@@ -144,8 +144,6 @@ static final function MemCpy_SInts_SInts_8(
 
     for (ByteIndex = 0; ByteIndex < NumBytes; ++ByteIndex)
     {
-        // `fcsdebug("IntIndex=" $ IntIndex);
-
         // TODO: is DstTmp needed? (Also check other memory functions).
         DstTmp = (Dst[IntIndex] & ~Mask) | ((DstBytes[ByteIndex] & 0xff) << Shift);
         Dst[IntIndex] = DstTmp;

diff --git a/Classes/FCryptoSHA2.uc b/Classes/FCryptoSHA2.uc
@@ -38,7 +38,8 @@ class FCryptoSHA2 extends Object;
 
 var const array<int> SHA224_IV;
 var const array<int> SHA256_IV;
-var const array<int> K;
+var const array<int> K_SMALL;
+// var const array<QWORD> K_BIG; // TODO
 
 static final function Sha2SmallRound(
     const out array<byte> Buf,
@@ -227,8 +228,8 @@ static final function Enc64BE_Static64(
 )
 {
     // TODO: QWORD impl here?
-	// br_enc32be(buf, (uint32_t)(x >> 32));
-	// br_enc32be(buf + 4, (uint32_t)x);
+    // br_enc32be(buf, (uint32_t)(x >> 32));
+    // br_enc32be(buf + 4, (uint32_t)x);
 
     Enc32BE_Static64(Dst, X, Offset);
 }
@@ -322,7 +323,7 @@ DefaultProperties
         0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19
     )}
 
-    K={(
+    K_SMALL={(
         0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5,
         0x3956C25B, 0x59F111F1, 0x923F82A4, 0xAB1C5ED5,
         0xD807AA98, 0x12835B01, 0x243185BE, 0x550C7DC3,
@@ -340,4 +341,48 @@ DefaultProperties
         0x748F82EE, 0x78A5636F, 0x84C87814, 0x8CC70208,
         0x90BEFFFA, 0xA4506CEB, 0xBEF9A3F7, 0xC67178F2
     )}
+
+    // TODO: QWORDs needed?
+    // K_BIG={(
+    //     0x428A2F98D728AE22, 0x7137449123EF65CD,
+    //     0xB5C0FBCFEC4D3B2F, 0xE9B5DBA58189DBBC,
+    //     0x3956C25BF348B538, 0x59F111F1B605D019,
+    //     0x923F82A4AF194F9B, 0xAB1C5ED5DA6D8118,
+    //     0xD807AA98A3030242, 0x12835B0145706FBE,
+    //     0x243185BE4EE4B28C, 0x550C7DC3D5FFB4E2,
+    //     0x72BE5D74F27B896F, 0x80DEB1FE3B1696B1,
+    //     0x9BDC06A725C71235, 0xC19BF174CF692694,
+    //     0xE49B69C19EF14AD2, 0xEFBE4786384F25E3,
+    //     0x0FC19DC68B8CD5B5, 0x240CA1CC77AC9C65,
+    //     0x2DE92C6F592B0275, 0x4A7484AA6EA6E483,
+    //     0x5CB0A9DCBD41FBD4, 0x76F988DA831153B5,
+    //     0x983E5152EE66DFAB, 0xA831C66D2DB43210,
+    //     0xB00327C898FB213F, 0xBF597FC7BEEF0EE4,
+    //     0xC6E00BF33DA88FC2, 0xD5A79147930AA725,
+    //     0x06CA6351E003826F, 0x142929670A0E6E70,
+    //     0x27B70A8546D22FFC, 0x2E1B21385C26C926,
+    //     0x4D2C6DFC5AC42AED, 0x53380D139D95B3DF,
+    //     0x650A73548BAF63DE, 0x766A0ABB3C77B2A8,
+    //     0x81C2C92E47EDAEE6, 0x92722C851482353B,
+    //     0xA2BFE8A14CF10364, 0xA81A664BBC423001,
+    //     0xC24B8B70D0F89791, 0xC76C51A30654BE30,
+    //     0xD192E819D6EF5218, 0xD69906245565A910,
+    //     0xF40E35855771202A, 0x106AA07032BBD1B8,
+    //     0x19A4C116B8D2D0C8, 0x1E376C085141AB53,
+    //     0x2748774CDF8EEB99, 0x34B0BCB5E19B48A8,
+    //     0x391C0CB3C5C95A63, 0x4ED8AA4AE3418ACB,
+    //     0x5B9CCA4F7763E373, 0x682E6FF3D6B2B8A3,
+    //     0x748F82EE5DEFB2FC, 0x78A5636F43172F60,
+    //     0x84C87814A1F0AB72, 0x8CC702081A6439EC,
+    //     0x90BEFFFA23631E28, 0xA4506CEBDE82BDE9,
+    //     0xBEF9A3F7B2C67915, 0xC67178F2E372532B,
+    //     0xCA273ECEEA26619C, 0xD186B8C721C0C207,
+    //     0xEADA7DD6CDE0EB1E, 0xF57D4F7FEE6ED178,
+    //     0x06F067AA72176FBA, 0x0A637DC5A2C898A6,
+    //     0x113F9804BEF90DAE, 0x1B710B35131C471B,
+    //     0x28DB77F523047D84, 0x32CAAB7B40C72493,
+    //     0x3C9EBE0A15C9BEBC, 0x431D67C49C100D4C,
+    //     0x4CC5D4BECB3E42B6, 0x597F299CFC657E2A,
+    //     0x5FCB6FAB3AD6FAEC, 0x6C44198C4A475817
+    // )}
 }
diff --git a/Classes/FCryptoSHA2Macros.uci b/Classes/FCryptoSHA2Macros.uci
@@ -9,11 +9,11 @@
 `define SSG2_1(x)       (`ROTR(`x, 17) ^ `ROTR(`x, 19) ^ ((`x) >>> 10))
 
 
-`define SHA2_STEP(A, B, C, D, E, F, G, H, j)                            \
-        T1 = `H + `BSG2_1(E) + `CH(`E, `F, `G) + default.K[`j] + w[`j]; \
-        T2 = `BSG2_0(`A) + `MAJ(`A, `B, `C);                            \
-        `D += T1;                                                       \
-        `H = T1 + T2;                                                   \
+`define SHA2_STEP(A, B, C, D, E, F, G, H, j)                                  \
+        T1 = `H + `BSG2_1(E) + `CH(`E, `F, `G) + default.K_SMALL[`j] + w[`j]; \
+        T2 = `BSG2_0(`A) + `MAJ(`A, `B, `C);                                  \
+        `D += T1;                                                             \
+        `H = T1 + T2;                                                         \
 
 // for (i = 16; i < 64; ++i)
 // {