- Criação de uma classe intermediária para facilitar exportação de criptografia do pacote, RALHashes.pas #78

 * Ajuste em todas as classes para trocar RALHashes -> RALHashBase
 - Correção de IntegerOverflow nas hashes SHA
 * Ajuste de mensagem de erro referente às classes de criptografia e hash
 + Tratamento de entrada para evitar Invalid Pointer e Rangecheck Error
 - Ajuste de versionamento

Author: mobius1qwe

pkg/Delphi/PascalRAL.dpk

@@ -52,7 +52,7 @@ contains
   RALCripto in '..\..\src\utils\RALCripto.pas',
   RALCriptoAES in '..\..\src\utils\RALCriptoAES.pas',
   RALCustomObjects in '..\..\src\utils\RALCustomObjects.pas',
-  RALHashes in '..\..\src\utils\RALHashes.pas',
+  RALHashBase in '..\..\src\utils\RALHashBase.pas',
   RALJson in '..\..\src\utils\RALJson.pas',
   RALMD5 in '..\..\src\utils\RALMD5.pas',
   RALMIMETypes in '..\..\src\utils\RALMIMETypes.pas',
@@ -72,6 +72,7 @@ contains
   RALStorageCSV in '..\..\src\utils\RALStorageCSV.pas',
   RALStorageJSON in '..\..\src\utils\RALStorageJSON.pas',
   RALStorageBIN in '..\..\src\utils\RALStorageBIN.pas',
-  RALDBTypes in '..\..\src\base\RALDBTypes.pas';
+  RALDBTypes in '..\..\src\base\RALDBTypes.pas',
+  RALHashes in '..\..\src\utils\RALHashes.pas';
 
 end.

pkg/Delphi/PascalRAL.dproj

@@ -191,7 +191,7 @@
         <DCCReference Include="..\..\src\utils\RALCripto.pas"/>
         <DCCReference Include="..\..\src\utils\RALCriptoAES.pas"/>
         <DCCReference Include="..\..\src\utils\RALCustomObjects.pas"/>
-        <DCCReference Include="..\..\src\utils\RALHashes.pas"/>
+        <DCCReference Include="..\..\src\utils\RALHashBase.pas"/>
         <DCCReference Include="..\..\src\utils\RALJson.pas"/>
         <DCCReference Include="..\..\src\utils\RALMD5.pas"/>
         <DCCReference Include="..\..\src\utils\RALMIMETypes.pas"/>
@@ -212,6 +212,7 @@
         <DCCReference Include="..\..\src\utils\RALStorageJSON.pas"/>
         <DCCReference Include="..\..\src\utils\RALStorageBIN.pas"/>
         <DCCReference Include="..\..\src\base\RALDBTypes.pas"/>
+        <DCCReference Include="..\..\src\utils\RALHashes.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

src/base/RALConsts.pas

@@ -13,7 +13,7 @@ interface
 
 const
   // Versionamento
-  RALVERSION = '0.11.0-13 alpha';
+  RALVERSION = '0.11.0-16 alpha';
   RALVERSION_MAJOR = 0;
   RALVERSION_MINOR = 11;
   RALVERSION_PATCH = 0;

src/base/RALDBTypes.pas

@@ -378,7 +378,7 @@ class procedure TRALDB.ParseSQLParams(ASQL: StringRAL; AParams: TParams);
 
     for vInt := POSINISTR to RALHighStr(ASQL) do
     begin
-      vSQLChar := ASQL[vInt];
+      vSQLChar := CharRAL(ASQL[vInt]);
       if (vSQLChar = '''') and (not vEspaceDoubleQuote) and
         (not (vEscapeQuote and (vChar = '\'))) then
       begin

src/base/ralconsts_enus.inc

@@ -14,6 +14,7 @@
   emCompressLibFilesError = 'The library files of the following classes were not found: %s.';
   emContentCheckError = 'Content check error.';
   emCryptEmptyKey = 'Key must be provided.';
+  emHMACEmptyText = 'Input text must be provided.';
   emDBConnectionUndefined = 'Connection not set.';
   emDBDriverMissing = 'Connection driver not found.';
   emDBEmptyBody = 'Body is empty.';

src/base/ralconsts_eses.inc

@@ -14,6 +14,7 @@
   emCompressLibFilesError = 'No se encontraron los archivos binarios de biblioteca de las clases: %s.';
   emContentCheckError = 'Error de comprobación de contenido.';
   emCryptEmptyKey = 'Se debe proporcionar la clave.';
+  emHMACEmptyText = 'Se debe proporcionar lo texto.';
   emDBConnectionUndefined = 'Conexión no establecida.';
   emDBDriverMissing = 'No se encontró el controlador de conexión.';
   emDBEmptyBody = 'El cuerpo está vacío.';

src/base/ralconsts_ptbr.inc

@@ -14,6 +14,7 @@
   emCompressLibFilesError = 'Os arquivos binários das seguintes classes não foram encontrados: %s.';
   emContentCheckError = 'Erro de verificação de conteúdo.';
   emCryptEmptyKey = 'A chave deve ser fornecida.';
+  emHMACEmptyText = 'Texto de entrada não pode ser vazio.';
   emDBConnectionUndefined = 'Conexão não definida.';
   emDBDriverMissing = 'Driver de conexão não encontrado.';
   emDBEmptyBody = 'O "body" está vazio.';

src/database/sqldb/RALDBSQLDB.pas

@@ -31,7 +31,7 @@   TRALDBSQLDB = class(TRALDBBase)
                       var ALastInsertId : Int64RAL); override;
     function GetDriverType: TRALDBDriverType; override;
     function GetFieldTable(ADataset: TDataSet; AFieldIndex: IntegerRAL) : StringRAL; override;
-    function OpenNative(ASQL : string; AParams : TParams) : TDataset; override;
+    function OpenNative(ASQL : StringRAL; AParams : TParams) : TDataset; override;
     function OpenCompatible(ASQL : StringRAL; AParams : TParams) : TDataset; override;
 
     procedure SaveToStream(ADataset: TDataSet; AStream: TStream;
@@ -127,7 +127,7 @@ destructor TRALDBSQLDB.Destroy;
   inherited Destroy;
 end;
 
-function TRALDBSQLDB.OpenNative(ASQL : string; AParams : TParams) : TDataset;
+function TRALDBSQLDB.OpenNative(ASQL : StringRAL; AParams : TParams) : TDataset;
 var
   vQuery : TSQLQuery;
   vInt : integer;

src/utils/RALBase64.pas

@@ -37,6 +37,14 @@   TRALBase64 = class
     class function GetSizeDecode(ASize: Int64RAL): Int64RAL;
   end;
 
+  {$IF Defined(FPC) or Defined(DELPHIXE3UP)}
+  TRALBase64StringHelper = record helper for StringRAL
+  public
+    function toBase64: StringRAL;
+    function fromBase64: StringRAL;
+  end;
+  {$IFEND}
+
 implementation
 
 const
@@ -71,6 +79,9 @@ class function TRALBase64.Decode(const AValue: StringRAL): StringRAL;
 var
   vStream: TStream;
 begin
+  if AValue = '' then
+    Raise Exception.Create(emHMACEmptyText);
+
   vStream := StringToStreamUTF8(AValue);
   try
     Result := Decode(vStream);
@@ -340,6 +351,9 @@ class function TRALBase64.Encode(const AValue: StringRAL): StringRAL;
 var
   vStream: TStream;
 begin
+  if AValue = '' then
+    Raise Exception.Create(emHMACEmptyText);
+
   vStream := StringToStreamUTF8(AValue);
   try
     Result := Encode(vStream);
@@ -419,4 +433,18 @@ class function TRALBase64.EncodeAsStream(AValue: TStream): TStream;
   Result.Position := 0;
 end;
 
+{ TRALBase64StringHelper }
+
+{$IF Defined(FPC) or defined(DELPHIXE3UP)}
+function TRALBase64StringHelper.fromBase64: StringRAL;
+begin
+  Result := TRALBase64.Decode(Self);
+end;
+
+function TRALBase64StringHelper.toBase64: StringRAL;
+begin
+  Result := TRALBase64.Encode(Self);
+end;
+{$IFEND}
+
 end.

src/utils/RALCRC32.pas

@@ -4,10 +4,10 @@ interface
 
 uses
   Classes, SysUtils,
-  RALHashes, RALTypes;
+  RALHashBase, RALTypes;
 
 type
-  TRALCRC32 = class(TRALHashes)
+  TRALCRC32 = class(TRALHashBase)
   private
     FCRC32 : LongWord;
     FBuffer: array[0..63] of Byte;