Merge pull request #8 from BastianTeufel-GTR/master

Added suppot for 2b Bcrypt Hash type and increased Cost to 12

Author: viniciussanchez

src/BCrypt.Consts.pas

@@ -7,7 +7,7 @@ interface
 const
   BCRYPT_SALT_LEN = 16;
   BLOWFISH_NUM_ROUNDS = 16;
-  BCRYPT_DEFAULT_COST = 10;
+  BCRYPT_DEFAULT_COST = 12;
 
   PBoxOrg: array [0 .. 17] of DWORD = (
     $243f6a88, $85a308d3, $13198a2e, $03707344, $a4093822, $299f31d0, $082efa98,

src/BCrypt.Core.pas

@@ -219,8 +219,10 @@ function TBCryptImpl.FormatPasswordHash(const ASalt, AHash: TBytes; ACost: Byte;
   case AHashType of
     THashType.BSD:
       LPrefix := '2a';
-    THashType.PHP, THashType.Default:
+    THashType.PHP :
       LPrefix := '2y';
+    THashType.Default:
+      LPrefix := '2b';
   end;
   LSalt := BsdBase64Encode(ASalt, Length(ASalt));
   LHash := BsdBase64Encode(AHash, Length(MagicText) * 4 - 1);
@@ -338,11 +340,13 @@ function TBCryptImpl.Crypt(const APassword: UTF8String; const ASalt: string; ACo
 
 function TBCryptImpl.ResolveHashType(const AHashType: string): THashType;
 begin
-  case AnsiIndexStr(AHashType, ['$2y$', '$2a$']) of
+  case AnsiIndexStr(AHashType, ['$2y$', '$2a$','$2b$']) of
     0:
       Result := THashType.PHP;
     1:
       Result := THashType.BSD;
+    2:
+      Result := THashType.Default; // added as being current default
     else
       Result := THashType.Unknown;
   end;

src/BCrypt.pas

@@ -22,7 +22,7 @@ implementation
 
 class function TBCrypt.GenerateHash(const APassword: string): string;
 begin
-  Result := TBCryptImpl.New.GenerateHash(UTF8String(APassword), THashType.BSD, BCRYPT_DEFAULT_COST);
+  Result := TBCryptImpl.New.GenerateHash(UTF8String(APassword), THashType.Default, BCRYPT_DEFAULT_COST);
 end;
 
 class function TBCrypt.GenerateHash(const APassword: string; ACost: Byte): string;