* Dotted filenames for package fcl-hash

packages/fcl-hash/namespaced/System.Hash.Asn.pp

@@ -0,0 +1,3 @@
+unit System.Hash.Asn;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpasn.pp}

packages/fcl-hash/namespaced/System.Hash.Ecc.pp

@@ -0,0 +1,3 @@
+unit System.Hash.Ecc;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpecc.pp}

packages/fcl-hash/namespaced/System.Hash.Ecdsa.pp

@@ -0,0 +1,3 @@
+unit System.Hash.Ecdsa;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpecdsa.pp}

packages/fcl-hash/namespaced/System.Hash.Onetimepass.pp

@@ -0,0 +1,3 @@
+unit System.Hash.Onetimepass;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i onetimepass.pp}

packages/fcl-hash/namespaced/System.Hash.Pem.pp

@@ -0,0 +1,3 @@
+unit System.Hash.Pem;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fppem.pp}

packages/fcl-hash/namespaced/System.Hash.Rsa.pas

@@ -0,0 +1,3 @@
+unit System.Hash.Rsa;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fprsa.pas}

packages/fcl-hash/namespaced/System.Hash.Sha256.pp

@@ -0,0 +1,3 @@
+unit System.Hash.Sha256;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpsha256.pp}

packages/fcl-hash/namespaced/System.Hash.Sha512.pp

@@ -0,0 +1,3 @@
+unit System.Hash.Sha512;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpsha512.pp}

packages/fcl-hash/namespaced/System.Hash.Tlsbigint.pas

@@ -0,0 +1,3 @@
+unit System.Hash.Tlsbigint;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fptlsbigint.pas}

packages/fcl-hash/namespaced/System.Hash.Utils.pp

@@ -0,0 +1,3 @@
+unit System.Hash.Utils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fphashutils.pp}

packages/fcl-hash/namespaces.lst

@@ -0,0 +1,12 @@
+src/onetimepass.pp=namespaced/System.Hash.Onetimepass.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/fptlsbigint.pas=namespaced/System.Hash.Tlsbigint.pas
+src/fpsha512.pp=namespaced/System.Hash.Sha512.pp
+src/fpecc.pp=namespaced/System.Hash.Ecc.pp
+src/fpsha256.pp=namespaced/System.Hash.Sha256.pp
+src/fprsa.pas=namespaced/System.Hash.Rsa.pas
+src/fppem.pp=namespaced/System.Hash.Pem.pp
+src/fphashutils.pp=namespaced/System.Hash.Utils.pp
+src/fpecdsa.pp=namespaced/System.Hash.Ecdsa.pp
+src/fpasn.pp=namespaced/System.Hash.Asn.pp

packages/fcl-hash/src/fpasn.pp

@@ -1,12 +1,19 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpasn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 {$modeswitch advancedrecords}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Fcl.BaseNEnc, System.Classes, System.SysUtils, System.Hash.Utils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Basenenc, Classes, SysUtils, fphashutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   ASN1_BOOL       = $01;

packages/fcl-hash/src/fpecc.pp

@@ -15,7 +15,9 @@
 
 
 {$mode delphi}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpECC;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
@@ -76,7 +78,11 @@ var
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Hash.Utils;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils, fphashutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   UInt128 = record

packages/fcl-hash/src/fpecdsa.pp

@@ -1,11 +1,18 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpecdsa;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 {$modeswitch advancedrecords}
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Hash.Ecc, System.Hash.Sha256;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   sysutils, fpecc, fpsha256;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   { TECDSA }

packages/fcl-hash/src/fphashutils.pp

@@ -14,15 +14,22 @@
 }
 
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fphashutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 {$modeswitch advancedrecords}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   EHashUtil = Class(Exception);

packages/fcl-hash/src/fppem.pp

@@ -1,11 +1,18 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fppem;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, Fcl.BaseNEnc, System.Hash.Sha256, System.Hash.Asn, System.Hash.Utils, System.Hash.Ecc;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, basenenc, fpsha256, fpasn, fphashutils, fpecc;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   _BEGIN_CERTIFICATE = '-----BEGIN CERTIFICATE-----';
@@ -340,7 +347,7 @@ begin
         raise Exception.Create('20220428220523');
       TxtBase64:=TxtBase64+Line;
     end;
-    Result:=basenenc.Base64.Decode(TxtBase64,True);
+    Result:={$ifdef FPC_DOTTEDUNITS}Fcl.{$ENDIF}basenenc.Base64.Decode(TxtBase64,True);
   finally
     sl.Free;
   end;

packages/fcl-hash/src/fprsa.pas

@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fprsa;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}
 {$H+}
@@ -8,8 +10,13 @@ interface
 
 {off $DEFINE CRYPTO_DEBUG}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes, System.Hash.Sha1, System.Hash.Sha512, System.Hash.Sha256, System.Hash.Tlsbigint, System.Hash.Utils, System.Hash.Asn, Fcl.BaseNEnc;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   sysutils, Classes, sha1, fpsha512, fpsha256, fpTLSBigInt, fphashutils, fpasn, basenenc;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   RSAPublicKeyOID = '1.2.840.113549.1.1.1';

packages/fcl-hash/src/fpsha256.pp

@@ -11,15 +11,22 @@
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpsha256;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 {$MODESWITCH advancedrecords}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TSHA256Digest = packed array[0..31] of Byte;
@@ -68,7 +75,11 @@ Const
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Hash.Utils;
+{$ELSE FPC_DOTTEDUNITS}
 uses fphashutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 //------------------------------------------------------------------------------
 // SHA256

packages/fcl-hash/src/fpsha512.pp

@@ -11,7 +11,9 @@
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpsha512;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 {$modeswitch advancedrecords}
@@ -19,8 +21,13 @@ unit fpsha512;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Hash.Utils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, fphashutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   THashBuffer = array[0..127] of Byte;

packages/fcl-hash/src/fptlsbigint.pas

@@ -10,13 +10,19 @@
 {$R-}
 {$Q-}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpTLSBigInt;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {off $DEFINE BIGINT_DEBUG}         // Enable debug output/functions for BitInt unit
 

packages/fcl-hash/src/onetimepass.pp

@@ -12,14 +12,21 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit onetimepass;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils , Fcl.BaseNEnc, System.Types, System.DateUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils , basenenc, types, DateUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   TOTP_Mod = 1000000;
@@ -36,7 +43,11 @@ Function TOTPSharedSecret(aRandom : TRandomBytes = Nil) : AnsiString;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Hash.Sha1, System.Hash.Hmac;
+{$ELSE FPC_DOTTEDUNITS}
 uses sha1, hmac;
+{$ENDIF FPC_DOTTEDUNITS}
 
 // @Result[8]
 Function Int64ToRawString(const Value: Int64) : AnsiString;