- implementado classe de conversao para hexadecimal

- correção do output de criptografias para string (formato binario)

Author: FernandoCB

src/others/pascal_brotli

@@ -5,7 +5,7 @@ interface
 
 uses
   Classes, SysUtils,
-  RALTypes, RALStream, RALBase64, RALConsts;
+  RALTypes, RALStream, RALBase64, RALConsts, RALHexadecimal;
 
 type
 
@@ -35,6 +35,7 @@   TRALCripto = class
     FOutputType : TRALCriptoInOutType;
   protected
     procedure SetKey(const AValue: StringRAL); virtual;
+    function CanCript : boolean; virtual;
     function BeforeDecrypt(AValue: TStream): TStream;
     function BeforeEncrypt(AValue: TStream): TStream;
   public
@@ -128,7 +129,7 @@ function TRALCripto.Encrypt(AValue: TStream): StringRAL;
     vStream := BeforeEncrypt(AValue);
     vStream.Position := 0;
 
-    Result := StreamToString(vStream);
+    Result := StreamToString(vStream, True);
   finally
     FreeAndNil(vStream);
   end;
@@ -138,6 +139,9 @@ function TRALCripto.BeforeDecrypt(AValue: TStream): TStream;
 var
   vStreamInput, vStreamEnc : TStream;
 begin
+  if not CanCript then
+    Exit;
+
   case FIntputType of
     cotNone : begin
       Result := DecryptAsStream(AValue);
@@ -150,6 +154,14 @@ function TRALCripto.BeforeDecrypt(AValue: TStream): TStream;
         FreeAndNil(vStreamInput);
       end;
     end;
+    cotHEX: begin
+      vStreamInput := TRALHexadecimal.DecodeAsStream(AValue);
+      try
+        Result := DecryptAsStream(vStreamInput);
+      finally
+        FreeAndNil(vStreamInput);
+      end;
+    end;
   end;
 
   Result.Position := 0;
@@ -160,13 +172,21 @@ function TRALCripto.BeforeDecrypt(AValue: TStream): TStream;
       FreeAndNil(Result);
       Result := vStreamEnc;
     end;
+    cotHEX: begin
+      vStreamEnc := TRALHexadecimal.EncodeAsStream(Result);
+      FreeAndNil(Result);
+      Result := vStreamEnc;
+    end;
   end;
 end;
 
 function TRALCripto.BeforeEncrypt(AValue: TStream): TStream;
 var
   vStreamInput, vStreamEnc : TStream;
 begin
+  if not CanCript then
+    Exit;
+
   case FIntputType of
     cotNone : begin
       Result := EncryptAsStream(AValue);
@@ -179,6 +199,14 @@ function TRALCripto.BeforeEncrypt(AValue: TStream): TStream;
         FreeAndNil(vStreamInput);
       end;
     end;
+    cotHEX: begin
+      vStreamInput := TRALHexadecimal.DecodeAsStream(AValue);
+      try
+        Result := EncryptAsStream(vStreamInput);
+      finally
+        FreeAndNil(vStreamInput);
+      end;
+    end;
   end;
 
   Result.Position := 0;
@@ -189,9 +217,19 @@ function TRALCripto.BeforeEncrypt(AValue: TStream): TStream;
       FreeAndNil(Result);
       Result := vStreamEnc;
     end;
+    cotHEX: begin
+      vStreamEnc := TRALHexadecimal.EncodeAsStream(Result);
+      FreeAndNil(Result);
+      Result := vStreamEnc;
+    end;
   end;
 end;
 
+function TRALCripto.CanCript: boolean;
+begin
+  Result := True;
+end;
+
 constructor TRALCripto.Create;
 begin
   FOutputType := cotNone;

src/utils/RALCripto.pas

@@ -468,7 +468,7 @@ function TRALCriptoAES.EncryptAES(AInput, AOutput: PByte; AInputLen: integer): i
 
   Result := AInputLen;
   vTheads := RALCPUCount;
-  vSize := AInputLen div (vTheads - 1) div 16 * 16;
+  vSize := AInputLen div vTheads div 16 * 16;
   if vSize < 16 then
     vSize := 16;
 

src/utils/RALCriptoAES.pas

@@ -16,6 +16,8 @@   TRALCriptoOpenSSL = class(TRALCripto)
   private
     FAESType : TRALCriptoOpenSSLTypes;
     FIV : StringRAL;
+  protected
+    function CanCript : boolean; override;
   public
     constructor Create;
 
@@ -30,6 +32,15 @@ implementation
 
 { TRALCriptoOpenSSL }
 
+function TRALCriptoOpenSSL.CanCript: boolean;
+begin
+  Result := inherited;
+  if TRALOpenSSL.GetInstance.LibraryHandle = 0 then begin
+    Result := False;
+    raise Exception.Create('OpenSSL not loaded');
+  end;
+end;
+
 constructor TRALCriptoOpenSSL.Create;
 begin
   inherited;

src/utils/RALCriptoOpenSSL.pas

@@ -5,7 +5,7 @@ interface
 
 uses
   Classes, SysUtils,
-  RALBase64, RALTypes, RALTools, RALStream, RALConsts;
+  RALBase64, RALTypes, RALTools, RALStream, RALConsts, RALHexadecimal;
 
 type
   TRALHashOutputType = (rhotNone, rhotHex, rhotBase64, rhotBase64Url);
@@ -101,19 +101,8 @@ function TRALHashBase.DigestToBase64Url(AValue: TBytes): StringRAL;
 end;
 
 function TRALHashBase.DigestToHex(AValue: TBytes): StringRAL;
-const
-  HexChar: array[0..15] of CharRAL = ('0', '1', '2', '3', '4', '5', '6', '7',
-                                      '8', '9', 'a', 'b', 'c', 'd', 'e', 'f');
-var
-  vInt: IntegerRAL;
 begin
-  vInt := 0;
-  while vInt < Length(AValue) do
-  begin
-    Result := Result + HexChar[(AValue[vInt] shr 4) and $0f];
-    Result := Result + HexChar[(AValue[vInt] and $0f)];
-    Inc(vInt);
-  end;
+  Result := TRALHexadedimal.Encode(AValue);
 end;
 
 function TRALHashBase.Finalize: TBytes;