Browse Source

minor refactoring

Ugochukwu Mmaduekwe 6 years ago
parent
commit
70fea6d49e

+ 4 - 4
CryptoLib.Tests/src/Security/DigestUtilitiesTests.pas

@@ -203,10 +203,10 @@ begin
     TDigest.Create(THashFactory.TCrypto.CreateSHA3_512()) as IDigest);
 
   CheckXofDigestAlgorithm('SHAKE128',
-    TDigest.Create(THashFactory.TCrypto.CreateShake_128(128)) as IDigest);
+    TDigest.Create(THashFactory.TXOF.CreateShake_128(128)) as IDigest);
 
   CheckXofDigestAlgorithm('SHAKE256',
-    TDigest.Create(THashFactory.TCrypto.CreateShake_256(256)) as IDigest);
+    TDigest.Create(THashFactory.TXOF.CreateShake_256(256)) as IDigest);
 
   CheckPlainDigestAlgorithm('RIPEMD128',
     TDigest.Create(THashFactory.TCrypto.CreateRIPEMD128()) as IDigest);
@@ -261,10 +261,10 @@ begin
 
   // Xof test
   CheckXofDigestAlgorithm('SHAKE128',
-    TDigest.Create(THashFactory.TCrypto.CreateShake_128(128)) as IDigest);
+    TDigest.Create(THashFactory.TXOF.CreateShake_128(128)) as IDigest);
 
   CheckXofDigestAlgorithm('SHAKE256',
-    TDigest.Create(THashFactory.TCrypto.CreateShake_256(256)) as IDigest);
+    TDigest.Create(THashFactory.TXOF.CreateShake_256(256)) as IDigest);
 end;
 
 initialization

+ 2 - 2
CryptoLib/src/Security/ClpDigestUtilities.pas

@@ -345,13 +345,13 @@ begin
 
     TDigestAlgorithm.SHAKE128:
       begin
-        result := TDigest.Create(THashFactory.TCrypto.CreateShake_128(128));
+        result := TDigest.Create(THashFactory.TXOF.CreateShake_128(128));
         Exit;
       end;
 
     TDigestAlgorithm.SHAKE256:
       begin
-        result := TDigest.Create(THashFactory.TCrypto.CreateShake_256(256));
+        result := TDigest.Create(THashFactory.TXOF.CreateShake_256(256));
         Exit;
       end;