Bug fix - Cost less than 10

viniciussanchez · Apr 14, 2020 · 4fe20c0 · 4fe20c0
1 parent 35b548c
commit 4fe20c0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/samples/Samples.res b/samples/Samples.res
diff --git a/samples/src/Samples.Main.dfm b/samples/src/Samples.Main.dfm
@@ -20,13 +20,11 @@ object FrmSamples: TFrmSamples
     Top = 0
     Width = 649
     Height = 226
-    ActivePage = tabNeedsRehash
+    ActivePage = tabCompare
     Align = alClient
     TabOrder = 0
     object tabGenerate: TTabSheet
       Caption = 'Generate hash'
-      ExplicitWidth = 281
-      ExplicitHeight = 165
       object Panel1: TPanel
         Left = 0
         Top = 0
@@ -35,10 +33,6 @@ object FrmSamples: TFrmSamples
         Align = alClient
         BevelOuter = bvNone
         TabOrder = 0
-        ExplicitLeft = 232
-        ExplicitTop = 200
-        ExplicitWidth = 185
-        ExplicitHeight = 41
         object edtPassword: TLabeledEdit
           Left = 12
           Top = 23
@@ -71,8 +65,6 @@ object FrmSamples: TFrmSamples
     object tabCompare: TTabSheet
       Caption = 'Compare hash'
       ImageIndex = 1
-      ExplicitLeft = 0
-      ExplicitTop = 28
       object lblCompareTrue: TLabel
         Left = 93
         Top = 114
@@ -134,8 +126,6 @@ object FrmSamples: TFrmSamples
     object tabHashInfo: TTabSheet
       Caption = 'Get hash info'
       ImageIndex = 2
-      ExplicitLeft = 0
-      ExplicitTop = 28
       object Label1: TLabel
         Left = 12
         Top = 64

diff --git a/src/BCrypt.Core.pas b/src/BCrypt.Core.pas
@@ -212,7 +212,7 @@ procedure TBCryptImpl.Encipher(var lr: array of DWORD; const AOffset: Longint);
 
 function TBCryptImpl.FormatPasswordHash(const ASalt, AHash: TBytes; ACost: Byte; AHashType: THashType): string;
 var
-  LHash, LPrefix, LSalt: string;
+  LHash, LPrefix, LSalt, LCost: string;
 begin
   case AHashType of
     THashType.BSD:
@@ -222,7 +222,8 @@ function TBCryptImpl.FormatPasswordHash(const ASalt, AHash: TBytes; ACost: Byte;
   end;
   LSalt := BsdBase64Encode(ASalt, Length(ASalt));
   LHash := BsdBase64Encode(AHash, Length(MagicText) * 4 - 1);
-  Result := Format('$%s$%d$%s%s', [LPrefix, ACost, LSalt, LHash]);
+  LCost := ACost.ToString.PadLeft(2, '0');
+  Result := Format('$%s$%s$%s%s', [LPrefix, LCost, LSalt, LHash]);
 end;
 
 procedure TBCryptImpl.InitializeKey();
@@ -313,8 +314,6 @@ function TBCryptImpl.GenerateHash(const APassword: UTF8String; AHashType: THashT
 var
   LPasswordKey, LSaltBytes, LHash: TBytes;
 begin
-  if (ACost < 10) or (ACost > 30) then
-    raise EBCrypt.Create('Invalid value for cost. It must be between 10 and 30.');
   SetLength(LPasswordKey, Length(APassword) + 1);
   Move(APassword[1], LPasswordKey[0], Length(APassword));
   LPasswordKey[high(LPasswordKey)] := 0;