Browse Source

fcl-web: fixed compile tcjwt

mattias 3 years ago
parent
commit
bf2d0853b6
1 changed files with 3 additions and 3 deletions
  1. 3 3
      packages/fcl-web/tests/tcjwt.pp

+ 3 - 3
packages/fcl-web/tests/tcjwt.pp

@@ -54,7 +54,7 @@ type
 implementation
 implementation
 
 
 uses
 uses
-  basenenc, sha256, fpjwasha256, sha512, fpjwasha512, fpjwasha384, fpjwaes256, fpecc, fppem;
+  basenenc, fpsha256, fpjwasha256, fpsha512, fpjwasha512, fpjwasha384, fpjwaes256, fpecc, fppem;
 
 
 { TMyJWT }
 { TMyJWT }
 
 
@@ -100,7 +100,7 @@ begin
   P1:=FJWT.JOSE.AsEncodedString;
   P1:=FJWT.JOSE.AsEncodedString;
   P2:=FJWT.Claims.AsEncodedString;
   P2:=FJWT.Claims.AsEncodedString;
   B:=TEncoding.UTF8.GetAnsiBytes(P1+'.'+P2);
   B:=TEncoding.UTF8.GetAnsiBytes(P1+'.'+P2);
-  if not TSHA256.HMAC(FKey.AsPointer,FKey.Length,PByte(B),Length(B),aDigest) then
+  if not TSHA256.HMAC(FKey.AsPointer,FKey.Length,PByte(B),Length(B),aDigest{%H-}) then
     Fail('Could not HMAC');
     Fail('Could not HMAC');
   Sign:=Base64URL.Encode(@aDigest[0],Length(aDigest),False);
   Sign:=Base64URL.Encode(@aDigest[0],Length(aDigest),False);
 //  Writeln('Signed: ',P1+'.'+P2+'.'+Sign);
 //  Writeln('Signed: ',P1+'.'+P2+'.'+Sign);
@@ -137,7 +137,7 @@ begin
   P1:=FJWT.JOSE.AsEncodedString;
   P1:=FJWT.JOSE.AsEncodedString;
   P2:=FJWT.Claims.AsEncodedString;
   P2:=FJWT.Claims.AsEncodedString;
   B:=TEncoding.UTF8.GetAnsiBytes(P1+'.'+P2);
   B:=TEncoding.UTF8.GetAnsiBytes(P1+'.'+P2);
-  if not TSHA512.HMAC(FKey.AsPointer,FKey.Length,PByte(B),Length(B),aDigest) then
+  if not TSHA512.HMAC(FKey.AsPointer,FKey.Length,PByte(B),Length(B),aDigest{%H-}) then
     Fail('Could not HMAC');
     Fail('Could not HMAC');
   Sign:=Base64URL.Encode(@aDigest[0],Length(aDigest),False);
   Sign:=Base64URL.Encode(@aDigest[0],Length(aDigest),False);
 //  Writeln('Signed: ',P1+'.'+P2+'.'+Sign);
 //  Writeln('Signed: ',P1+'.'+P2+'.'+Sign);