From 40fa147d2048e25631efb0b83cf191871ebef764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= <michael@freepascal.org>
Date: Sat, 13 Nov 2021 15:20:35 +0100
Subject: [PATCH] * Base hash units moved & renamed

(cherry picked from commit 16fa6fa1059745410315a7c19a7e31170a637e9b)
---
 packages/fcl-web/fpmake.pp              | 2 ++
 packages/fcl-web/src/jwt/fpjwaes256.pp  | 4 ++--
 packages/fcl-web/src/jwt/fpjwasha256.pp | 2 +-
 packages/fcl-web/src/jwt/fpjwasha384.pp | 2 +-
 packages/fcl-web/src/jwt/fpjwasha512.pp | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/fcl-web/fpmake.pp b/packages/fcl-web/fpmake.pp
index eca8aef01b..e9b47ddfb0 100644
--- a/packages/fcl-web/fpmake.pp
+++ b/packages/fcl-web/fpmake.pp
@@ -34,6 +34,8 @@ begin
     P.Dependencies.Add('fcl-net');
     P.Dependencies.Add('fcl-process');
     P.Dependencies.Add('fcl-fpcunit');
+    P.Dependencies.Add('fcl-hash');
+    P.Dependencies.Add('hash');
     P.Dependencies.Add('fcl-registry',AllWindowsOSes);
     P.Dependencies.Add('openssl',AllUnixOSes+AllWindowsOSes);
     P.Dependencies.Add('fastcgi');
diff --git a/packages/fcl-web/src/jwt/fpjwaes256.pp b/packages/fcl-web/src/jwt/fpjwaes256.pp
index 62345524cc..71c6eb5df3 100644
--- a/packages/fcl-web/src/jwt/fpjwaes256.pp
+++ b/packages/fcl-web/src/jwt/fpjwaes256.pp
@@ -5,7 +5,7 @@ unit fpjwaes256;
 interface
 
 uses
-  Classes, SysUtils, fpjwt, Ecc;
+  Classes, SysUtils, fpjwt, fpEcc;
 
 Type
   { TJWTSignerES256 }
@@ -22,7 +22,7 @@ Type
 
 implementation
 
-uses hashutils, basenenc, ecdsa;
+uses fphashutils, basenenc, fpecdsa;
 
 { TJWTSignerES256 }
 
diff --git a/packages/fcl-web/src/jwt/fpjwasha256.pp b/packages/fcl-web/src/jwt/fpjwasha256.pp
index 12981d0bfa..299657f3c5 100644
--- a/packages/fcl-web/src/jwt/fpjwasha256.pp
+++ b/packages/fcl-web/src/jwt/fpjwasha256.pp
@@ -20,7 +20,7 @@ Type
 
 implementation
 
-uses sha256, basenenc;
+uses fpsha256, basenenc;
 
 Const
   SErrHMACFailed = 'HMAC SHA256 of JWT Failed';
diff --git a/packages/fcl-web/src/jwt/fpjwasha384.pp b/packages/fcl-web/src/jwt/fpjwasha384.pp
index 8aa899142b..3aaaadcbbb 100644
--- a/packages/fcl-web/src/jwt/fpjwasha384.pp
+++ b/packages/fcl-web/src/jwt/fpjwasha384.pp
@@ -20,7 +20,7 @@ Type
 
 implementation
 
-uses sha512, basenenc;
+uses fpsha512, basenenc;
 
 Const
   SErrHMACFailed = 'HMAC SHA384 of JWT Failed';
diff --git a/packages/fcl-web/src/jwt/fpjwasha512.pp b/packages/fcl-web/src/jwt/fpjwasha512.pp
index 40f55410d6..a578be3d2f 100644
--- a/packages/fcl-web/src/jwt/fpjwasha512.pp
+++ b/packages/fcl-web/src/jwt/fpjwasha512.pp
@@ -20,7 +20,7 @@ Type
 
 implementation
 
-uses sha512, basenenc;
+uses fpsha512, basenenc;
 
 Const
   SErrHMACFailed = 'HMAC SHA512 of JWT Failed';