Przeglądaj źródła

* Rename units using fp prefix

(cherry picked from commit 009c19a4009c68817e73f46f4035a0a651f3f91f)
Michaël Van Canneyt 3 lat temu
rodzic
commit
b99b6808b5

+ 1 - 1
packages/fcl-hash/examples/demosha256.pp

@@ -3,7 +3,7 @@ program demosha256;
 {$mode objfpc}
 {$h+}
 
-uses SysUtils, sha256, hashutils;
+uses SysUtils, fpsha256, fphashutils;
 
 procedure SHA256Test;
 

+ 16 - 16
packages/fcl-hash/fpmake.pp

@@ -31,22 +31,22 @@ begin
     P.Dependencies.Add('rtl-extra');
 
     P.Version:='3.3.1';
-    T:=P.Targets.AddUnit('src/ecc.pp');
-    T:=P.Targets.AddUnit('src/hashutils.pp');
-    T.Dependencies.AddUnit('ecc');
-    T:=P.Targets.AddUnit('src/sha256.pp');
-    T.Dependencies.AddUnit('hashutils');
-    T:=P.Targets.AddUnit('src/sha512.pp');
-    T.Dependencies.AddUnit('hashutils');
-    T:=P.Targets.AddUnit('src/asn.pp');
-    T.Dependencies.AddUnit('hashutils');
-    T:=P.Targets.AddUnit('src/pem.pp');
-    T.Dependencies.AddUnit('hashutils');
-    T.Dependencies.AddUnit('asn');
-    T:=P.Targets.AddUnit('src/ecdsa.pp');
-    T.Dependencies.AddUnit('hashutils');
-    T.Dependencies.AddUnit('ecc');
-    T.Dependencies.AddUnit('sha256');
+    T:=P.Targets.AddUnit('src/fpecc.pp');
+    T:=P.Targets.AddUnit('src/fphashutils.pp');
+    T.Dependencies.AddUnit('fpecc');
+    T:=P.Targets.AddUnit('src/fpsha256.pp');
+    T.Dependencies.AddUnit('fphashutils');
+    T:=P.Targets.AddUnit('src/fpsha512.pp');
+    T.Dependencies.AddUnit('fphashutils');
+    T:=P.Targets.AddUnit('src/fpasn.pp');
+    T.Dependencies.AddUnit('fphashutils');
+    T:=P.Targets.AddUnit('src/fppem.pp');
+    T.Dependencies.AddUnit('fphashutils');
+    T.Dependencies.AddUnit('fpasn');
+    T:=P.Targets.AddUnit('src/fpecdsa.pp');
+    T.Dependencies.AddUnit('fphashutils');
+    T.Dependencies.AddUnit('fpecc');
+    T.Dependencies.AddUnit('fpsha256');
     T:=P.Targets.AddUnit('src/onetimepass.pp');
     
     T:=P.Targets.AddExampleunit('examples/demosha256.pp');

+ 1 - 1
packages/fcl-hash/src/asn.pp → packages/fcl-hash/src/fpasn.pp

@@ -1,4 +1,4 @@
-unit asn;
+unit fpasn;
 
 {$mode ObjFPC}{$H+}
 {$modeswitch advancedrecords}

+ 2 - 2
packages/fcl-hash/src/ecc.pp → packages/fcl-hash/src/fpecc.pp

@@ -10,7 +10,7 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
 {$mode delphi}
-unit ECC;
+unit fpECC;
 
 interface
 
@@ -71,7 +71,7 @@ var
 
 implementation
 
-uses sysutils, hashutils;
+uses sysutils, fphashutils;
 
 type
   UInt128 = record

+ 2 - 2
packages/fcl-hash/src/ecdsa.pp → packages/fcl-hash/src/fpecdsa.pp

@@ -1,11 +1,11 @@
-unit ecdsa;
+unit fpecdsa;
 
 {$mode ObjFPC}{$H+}
 {$modeswitch advancedrecords}
 interface
 
 uses
-  sysutils, ecc, sha256;
+  sysutils, fpecc, fpsha256;
 
 Type
   { TECDSA }

+ 1 - 1
packages/fcl-hash/src/hashutils.pp → packages/fcl-hash/src/fphashutils.pp

@@ -9,7 +9,7 @@
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
-unit hashutils;
+unit fphashutils;
 
 {$mode ObjFPC}{$H+}
 {$modeswitch advancedrecords}

+ 3 - 3
packages/fcl-hash/src/pem.pp → packages/fcl-hash/src/fppem.pp

@@ -1,11 +1,11 @@
-unit pem;
+unit fppem;
 
 {$mode ObjFPC}{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, ecc;
+  Classes, SysUtils, fpecc;
 
 const
   _BEGIN_CERTIFICATE = '-----BEGIN CERTIFICATE-----';
@@ -34,7 +34,7 @@ Function PemLoadECDSA(const aStream : TStream; out PrivateKey: TEccPrivateKey; o
 
 implementation
 
-uses basenenc, sha256, asn, hashutils;
+uses basenenc, fpsha256, fpasn, fphashutils;
 
 procedure PemLoadPublicKey64FromList(List: TStrings; out PrivateKey: TEccPrivateKey; out PublicKey: TEccPublicKey; out PublicKeyX64, PublicKeyY64, ThumbPrint: AnsiString);
 

+ 2 - 2
packages/fcl-hash/src/sha256.pp → packages/fcl-hash/src/fpsha256.pp

@@ -11,7 +11,7 @@
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
-unit sha256;
+unit fpsha256;
 
 {$mode ObjFPC}{$H+}
 {$MODESWITCH advancedrecords}
@@ -68,7 +68,7 @@ Const
 
 implementation
 
-uses hashutils;
+uses fphashutils;
 
 //------------------------------------------------------------------------------
 // SHA256

+ 2 - 2
packages/fcl-hash/src/sha512.pp → packages/fcl-hash/src/fpsha512.pp

@@ -11,7 +11,7 @@
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
-unit sha512;
+unit fpsha512;
 
 {$mode ObjFPC}{$H+}
 {$modeswitch advancedrecords}
@@ -20,7 +20,7 @@ unit sha512;
 interface
 
 uses
-  Classes, SysUtils, hashutils;
+  Classes, SysUtils, fphashutils;
 
 Type
   THashBuffer = array[0..127] of Byte;

+ 2 - 2
packages/fcl-hash/tests/utestpem.pp

@@ -5,7 +5,7 @@ unit utestpem;
 interface
 
 uses
-  Classes, SysUtils, fpcunit, testregistry, asn, pem;
+  Classes, SysUtils, fpcunit, testregistry, fpasn, fppem;
 
 Type
 
@@ -18,7 +18,7 @@ Type
 
 implementation
 
-uses basenenc, hashutils, ecc;
+uses basenenc, fphashutils, fpecc;
 
 
 { TTestPEM }

+ 2 - 2
packages/fcl-hash/tests/utestsha256.pp

@@ -5,7 +5,7 @@ unit utestsha256;
 interface
 
 uses
-  Classes, SysUtils, fpcunit, testutils, testregistry, ecc, sha256, hashutils;
+  Classes, SysUtils, fpcunit, testutils, testregistry, fpecc, fpsha256, fphashutils;
 
 type
 
@@ -51,7 +51,7 @@ type
 implementation
 
 uses
-   pem, ecdsa,  basenenc;
+   fppem, fpecdsa,  basenenc;
 
 { TTestECDSASHA256 }
 

+ 1 - 1
packages/fcl-hash/tests/utestsha512.pp

@@ -5,7 +5,7 @@ unit utestsha512;
 interface
 
 uses
-  Classes, SysUtils, fpcunit, testutils, testregistry, sha512, hashutils;
+  Classes, SysUtils, fpcunit, testutils, testregistry, fpsha512, fphashutils;
 
 type