Shake128 test file fixed. Keccak still has UnicodeString test problems

Author: Markus Humm

Unit Tests/Data/ShortMsgKAT_SHAKE128.txt

@@ -2,7 +2,6 @@
 
 Len = 0
 Msg = 00
-MDuni = 
 Squeezed = 7F9C2BA4E88F827D616045507605853ED73B8093F6EFBC88EB1A6EACFA66EF263CB1EEA988004B93103CFB0AEEFD2A686E01FA4A58E8A3639CA8A1E3F9AE57E235B8CC873C23DC62B8D260169AFA2F75AB916A58D974918835D25E6A435085B2BADFD6DFAAC359A5EFBB7BCC4B59D538DF9A04302E10C8BC1CBF1A0B3A5120EA17CDA7CFAD765F5623474D368CCCA8AF0007CD9F5E4C849F167A580B14AABDEFAEE7EEF47CB0FCA9767BE1FDA69419DFB927E9DF07348B196691ABAEB580B32DEF58538B8D23F87732EA63B02B4FA0F4873360E2841928CD60DD4CEE8CC0D4C922A96188D032675C8AC850933C7AFF1533B94C834ADBB69C6115BAD4692D8619F90B0CDF8A7B9C264029AC185B70B83F2801F2F4B3F70C593EA3AEEB613A7F1B1DE33FD75081F592305F2E4526EDC09631B10958F464D889F31BA010250FDA7F1368EC2967FC84EF2AE9AFF268E0B1700AFFC6820B523A3D917135F2DFF2EE06BFE72B3124721D4A26C04E53A75E30E73A7A9C4A95D91C55D495E9F51DD0B5E9D83C6D5E8CE803AA62B8D654DB53D09B8DCFF273CDFEB573FAD8BCD45578BEC2E770D01EFDE86E721A3F7C6CCE275DABE6E2143F1AF18DA7EFDDC4C7B70B5E345DB93CC936BEA323491CCB38A388F546A9FF00DD4E1300B9B2153D2041D205B443E41B45A653F2A5C4492C1ADD544512DDA2529833462B71A41A45BE97290B6F
 MDuni = 7f9c2ba4e88f827d616045507605853ed73b8093f6efbc88eb1a6eacfa66ef263cb1eea988004b93103cfb0aeefd2a686e01fa4a58e8a3639ca8a1e3f9ae57e235b8cc873c23dc62b8d260169afa2f75ab916a58d974918835d25e6a435085b2badfd6dfaac359a5efbb7bcc4b59d538df9a04302e10c8bc1cbf1a0b3a5120ea17cda7cfad765f5623474d368ccca8af0007cd9f5e4c849f167a580b14aabdefaee7eef47cb0fca9767be1fda69419dfb927e9df07348b196691abaeb580b32def58538b8d23f87732ea63b02b4fa0f4873360e2841928cd60dd4cee8cc0d4c922a96188d032675c8ac850933c7aff1533b94c834adbb69c6115bad4692d8619f90b0cdf8a7b9c264029ac185b70b83f2801f2f4b3f70c593ea3aeeb613a7f1b1de33fd75081f592305f2e4526edc09631b10958f464d889f31ba010250fda7f1368ec2967fc84ef2ae9aff268e0b1700affc6820b523a3d917135f2dff2ee06bfe72b3124721d4a26c04e53a75e30e73a7a9c4a95d91c55d495e9f51dd0b5e9d83c6d5e8ce803aa62b8d654db53d09b8dcff273cdfeb573fad8bcd45578bec2e770d01efde86e721a3f7c6cce275dabe6e2143f1af18da7efddc4c7b70b5e345db93cc936bea323491ccb38a388f546a9ff00dd4e1300b9b2153d2041d205b443e41b45a653f2a5c4492c1add544512dda2529833462b71a41a45be97290b6f
 

Unit Tests/Tests/TestDECHashSHA3.pas

@@ -508,12 +508,12 @@ procedure TestTHash_SHA3_Base.LoadTestDataFile(FileName : string;
   HashLength   : Int16;
   lDataRow     : IHashTestDataRowSetup;
 
-NewContents: TStringList;
+//NewContents: TStringList;
 U : RawByteString;
 begin
   Len      := 0;
   Contents := TStringList.Create;
-NewContents := TStringList.Create;
+//NewContents := TStringList.Create;
   try
     Contents.LoadFromFile(FileName);
 
@@ -565,8 +565,8 @@ procedure TestTHash_SHA3_Base.LoadTestDataFile(FileName : string;
           // hash length
 //U := CalcUnicodeHash(string(TFormat_HexL.Encode(MsgWithFixup)), HashInst);
 //NewContents.Add('MDuni = ' + string(U));
-          lDataRow.ExpectedOutputUTFStrTest :=
-            CalcUnicodeHash(string(TFormat_HexL.Encode(MsgWithFixup)), HashInst);
+//          lDataRow.ExpectedOutputUTFStrTest :=
+//            CalcUnicodeHash(string(TFormat_HexL.Encode(MsgWithFixup)), HashInst);
         end
         else
         begin
@@ -575,13 +575,13 @@ procedure TestTHash_SHA3_Base.LoadTestDataFile(FileName : string;
           lDataRow.AddInputVector(MsgWithFixup);
           lDataRow.FinalBitLength := FinalByteLen;
           THash_SHA3Base(HashInst).FinalByteLength := FinalByteLen;
-
+//
           FinalByteLen := 0;
-//U := CalcUnicodeHash(string(TFormat_HexL.Encode(MsgWithFixup)), HashInst);
+U := CalcUnicodeHash(string(TFormat_HexL.Encode(MsgWithFixup)), HashInst);
 //NewContents.Add('MDuni = ' + string(U));
 
-          lDataRow.ExpectedOutputUTFStrTest :=
-            CalcUnicodeHash(string(TFormat_HexL.Encode(MsgWithFixup)), HashInst);
+          lDataRow.ExpectedOutputUTFStrTest := U;
+//            CalcUnicodeHash(string(TFormat_HexL.Encode(MsgWithFixup)), HashInst);
         end;
 
         Continue;
@@ -600,14 +600,17 @@ procedure TestTHash_SHA3_Base.LoadTestDataFile(FileName : string;
           lDataRow.ExpectedOutput            := RawByteString(s1);
           HashLength                         := Length(RawByteString(s1)) div 2;
           lDataRow.HashResultByteLength      := HashLength;
-
-          // Shake can caculate unicode test data only after hash length is known
-          THash_ShakeBase(HashInst).HashSize := HashLength;
-
-          if (Len > 0) then
-            lDataRow.ExpectedOutputUTFStrTest  := CalcUnicodeHash(msg, HashInst)
-          else
-            lDataRow.ExpectedOutputUTFStrTest  := CalcUnicodeHash('', HashInst);
+//
+//          // Shake can caculate unicode test data only after hash length is known
+//          THash_ShakeBase(HashInst).HashSize := HashLength;
+////
+//          if (Len > 0) then
+////U := CalcUnicodeHash(msg, HashInst)
+//////            lDataRow.ExpectedOutputUTFStrTest  := CalcUnicodeHash(msg, HashInst)
+//          else
+////U := CalcUnicodeHash('', HashInst);
+//////            lDataRow.ExpectedOutputUTFStrTest  := CalcUnicodeHash('', HashInst);
+////NewContents.Add('MDuni = ' + string(U));
         end
         else
           // md from the SHA3 ones
@@ -627,7 +630,7 @@ procedure TestTHash_SHA3_Base.LoadTestDataFile(FileName : string;
   finally
     Contents.Free;
 //NewContents.SaveToFile(FileName + ' 2');
-NewContents.Free;
+//NewContents.Free;
   end;
 end;