Implemented the remaining Crypt/BSD tests.

Author: MHumm

Unit Tests/Tests/TestDECFormat.pas

@@ -397,6 +397,7 @@   TestTFormat_BCryptBSD = class(TFormatTestsBase)
     FFormat_BCryptBSD: TFormat_BCryptBSD;
 
     const
+      // Source of test data: Wolfgang Erhardt's implementation
       cTestDataEncode : array[1..22] of TestRecRawByteString = (
         (Input:  RawByteString('');
          Output: ''),
@@ -464,6 +465,7 @@   TestTFormat_BCryptBSD = class(TFormatTestsBase)
                                #$86#$93#$86#$99#$AD+'E');
          Output: 'WApznUOJfkEGSmYRfnkrPO'));
 
+      // Source of test data: Wolfgang Erhardt's implementation
       cTestDataDecode : array[1..22] of TestRecRawByteString = (
         (Input:  '';
          Output: RawByteString('')),

Unit Tests/Tests/TestDECHash.pas

@@ -664,11 +664,13 @@   TestTHash_Sapphire = class(THash_TestBaseExtended)
   TestTHash_BCrypt = class(THash_TestPasswordBase)
   private
     type
+      // Extract only the interesting parts
       TBCryptBSDTestData = record
-        Password : string;
         Salt     : RawByteString;
         Cost     : UInt8;
       end;
+
+    function SplitTestVector(Vector: string):TBCryptBSDTestData;
   protected
     procedure ConfigHashClass(aHashClass: TDECHash; aIdxTestData:Integer); override;
   public
@@ -6206,6 +6208,15 @@ procedure TestTHash_BCrypt.SetUp;
   lDataRow.AddInputVector('~!@#$%^&*()      ~!@#$%^&*()PNBFRD');
 end;
 
+function TestTHash_BCrypt.SplitTestVector(Vector: string): TBCryptBSDTestData;
+var
+  Parts : TArray<string>;
+begin
+  Parts := Vector.Split(['$']);
+  Result.Cost := Copy(Parts[2], Low(Parts[2]), Length(Parts[2])).ToInteger;
+  Result.Salt := Copy(Parts[3], Low(Parts[3]), 22);
+end;
+
 procedure TestTHash_BCrypt.TestBlockSize;
 begin
   CheckEquals(8, FHash.BlockSize);
@@ -6227,21 +6238,58 @@ procedure TestTHash_BCrypt.TestCostFactorTooShortException;
 end;
 
 procedure TestTHash_BCrypt.TestCryptBSDFormat;
+type
+  TPair = record
+            pn: byte;
+            bs: string[60];
+          end;
+const
+  PW: array[0..4] of string[40] = ('', 'a', 'abc',
+         'abcdefghijklmnopqrstuvwxyz', '~!@#$%^&*()      ~!@#$%^&*()PNBFRD');
+const
+  // Source of test data: Wolfgang Erhardt's implementation. pn is the index
+  // into PW
+  TestData: array[1..20] of TPair = (
+    (pn: 0; bs: '$2a$06$DCq7YPn5Rq63x1Lad4cll.TV4S6ytwfsfvkgY8jIucDrjc8deX1s.'),
+    (pn: 0; bs: '$2a$08$HqWuK6/Ng6sg9gQzbLrgb.Tl.ZHfXLhvt/SgVyWhQqgqcZ7ZuUtye'),
+    (pn: 0; bs: '$2a$10$k1wbIrmNyFAPwPVPSVa/zecw2BCEnBwVS2GbrmgzxFUOqW9dk4TCW'),
+    (pn: 0; bs: '$2a$12$k42ZFHFWqBp3vWli.nIn8uYyIkbvYRvodzbfbK18SSsY.CsIQPlxO'),
+    (pn: 1; bs: '$2a$06$m0CrhHm10qJ3lXRY.5zDGO3rS2KdeeWLuGmsfGlMfOxih58VYVfxe'),
+    (pn: 1; bs: '$2a$08$cfcvVd2aQ8CMvoMpP2EBfeodLEkkFJ9umNEfPD18.hUF62qqlC/V.'),
+    (pn: 1; bs: '$2a$10$k87L/MF28Q673VKh8/cPi.SUl7MU/rWuSiIDDFayrKk/1tBsSQu4u'),
+    (pn: 1; bs: '$2a$12$8NJH3LsPrANStV6XtBakCez0cKHXVxmvxIlcz785vxAIZrihHZpeS'),
+    (pn: 2; bs: '$2a$06$If6bvum7DFjUnE9p2uDeDu0YHzrHM6tf.iqN8.yx.jNN1ILEf7h0i'),
+    (pn: 2; bs: '$2a$08$Ro0CUfOqk6cXEKf3dyaM7OhSCvnwM9s4wIX9JeLapehKK5YdLxKcm'),
+    (pn: 2; bs: '$2a$10$WvvTPHKwdBJ3uk0Z37EMR.hLA2W6N9AEBhEgrAOljy2Ae5MtaSIUi'),
+    (pn: 2; bs: '$2a$12$EXRkfkdmXn2gzds2SSitu.MW9.gAVqa9eLS1//RYtYCmB1eLHg.9q'),
+    (pn: 3; bs: '$2a$06$.rCVZVOThsIa97pEDOxvGuRRgzG64bvtJ0938xuqzv18d3ZpQhstC'),
+    (pn: 3; bs: '$2a$08$aTsUwsyowQuzRrDqFflhgekJ8d9/7Z3GV3UcgvzQW3J5zMyrTvlz.'),
+    (pn: 3; bs: '$2a$10$fVH8e28OQRj9tqiDXs1e1uxpsjN0c7II7YPKXua2NAKYvM6iQk7dq'),
+    (pn: 3; bs: '$2a$12$D4G5f18o7aMMfwasBL7GpuQWuP3pkrZrOAnqP.bmezbMng.QwJ/pG'),
+    (pn: 4; bs: '$2a$06$fPIsBO8qRqkjj273rfaOI.HtSV9jLDpTbZn782DC6/t7qT67P6FfO'),
+    (pn: 4; bs: '$2a$08$Eq2r4G/76Wv39MzSX262huzPz612MZiYHVUJe/OcOql2jo4.9UxTW'),
+    (pn: 4; bs: '$2a$10$LgfYWkbzEvQ4JakH7rOvHe0y8pHKF9OaFgwUZ2q7W2FFZmZzJYlfS'),
+    (pn: 4; bs: '$2a$12$WApznUOJfkEGSmYRfnkrPOr466oFDCaj4b6HY3EXGvfxm43seyhgC'));
+
 var
   BCrypt : THash_BCrypt;
   Result : string;
+  i      : Integer;
+  SplitData :TBCryptBSDTestData;
 begin
   BCrypt := THash_BCrypt(FHash);
-  BCrypt.Cost := 6;
-  BCrypt.Salt := TFormat_BCryptBSD.Decode(BytesOf('DCq7YPn5Rq63x1Lad4cll.'));
 
-  Result := string(BCrypt.GetDigestInCryptFormat('', TFormat_BCryptBSD));
-
-  CheckEquals('$2a$06$DCq7YPn5Rq63x1Lad4cll.TV4S6ytwfsfvkgY8jIucDrjc8deX1s.', Result);
+  for i := Low(TestData) to High(TestData) do
+  begin
+    SplitData := SplitTestVector(TestData[i].bs);
+    BCrypt.Cost := SplitData.Cost;
+    BCrypt.Salt := TFormat_BCryptBSD.Decode(BytesOf(SplitData.Salt));
 
+    Result := string(BCrypt.GetDigestInCryptFormat(
+                RawByteString(PW[TestData[i].pn]), TFormat_BCryptBSD));
 
-//function TDECPasswordHash.GetDigestInCryptFormat(Password : RawByteString;
-//                                                 Format   : TDECFormatClass): RawByteString;
+    CheckEquals(TestData[i].bs, Result);
+  end;
 end;
 
 procedure TestTHash_BCrypt.TestDigestSize;