Fixed Git's messing up.

Author: MHumm

Source/DECHashBase.pas

@@ -349,125 +349,6 @@   TDECHash = class(TDECObject, IDECHash)
     /// </returns>
     function CalcString(const Value: RawByteString; Format: TDECFormatClass): RawByteString; overload;
 
-    /// <summary>
-<<<<<<< HEAD
-    ///   Calculates the hash value over a given stream of bytes
-    /// </summary>
-    /// <param name="Stream">
-    ///   Memory or file stream over which the hash value shall be calculated.
-    ///   The stream must be assigned. The hash value will always be calculated
-    ///   from the current position of the stream.
-    /// </param>
-    /// <param name="Size">
-    ///   Number of bytes within the stream over which to calculate the hash value
-    /// </param>
-    /// <param name="HashResult">
-    ///   In this byte array the calculated hash value will be returned
-    /// </param>
-    /// <param name="OnProgress">
-    ///   Optional callback routine. It can be used to display the progress of
-    ///   the operation.
-    /// </param>
-    procedure CalcStream(const Stream: TStream; Size: Int64; var HashResult: TBytes;
-                         const OnProgress:TDECProgressEvent = nil); overload;
-    /// <summary>
-    ///   Calculates the hash value over a givens stream of bytes
-    /// </summary>
-    /// <param name="Stream">
-    ///   Memory or file stream over which the hash value shall be calculated.
-    ///   The stream must be assigned. The hash value will always be calculated
-    ///   from the current position of the stream.
-    /// </param>
-    /// <param name="Size">
-    ///   Number of bytes within the stream over which to calculate the hash value
-    /// </param>
-    /// <param name="Format">
-    ///   Optional formatting class. The formatting of that will be applied to
-    ///   the returned hash value.
-    /// </param>
-    /// <param name="OnProgress">
-    ///   Optional callback routine. It can be used to display the progress of
-    ///   the operation.
-    /// </param>
-    /// <returns>
-    ///   Hash value over the bytes in the stream, formatted with the formatting
-    ///   passed as format parameter, if used.
-    /// </returns>
-    function CalcStream(const Stream: TStream; Size: Int64; Format: TDECFormatClass = nil;
-                        const OnProgress:TDECProgressEvent = nil): RawByteString; overload;
-
-    /// <summary>
-    ///   Calculates the hash value over a given stream of bytes. The calculated
-    ///   hash value can be retrieved with one of the DigestAsXXX methods.
-    /// </summary>
-    /// <param name="Stream">
-    ///   Memory or file stream over which the hash value shall be calculated.
-    ///   The stream must be assigned. The hash value will always be calculated
-    ///   from the current position of the stream.
-    /// </param>
-    /// <param name="Size">
-    ///   Number of bytes within the stream over which to calculate the hash value
-    /// </param>
-    /// <param name="OnProgress">
-    ///   Optional callback routine. It can be used to display the progress of
-    ///   the operation.
-    /// </param>
-    /// <param name="DoFinalize">
-    ///   Optinal parameter: if true this call is the last one and the
-    ///   finalization of the hash calculation, including calling done, will be
-    ///   carried out in this method call as well.
-    /// </param>
-    /// <remarks>
-    ///   Before calling this method for the first time after creation of the
-    ///   hash instance or after calling Done Init needs to be called.
-    ///   After calling this method Done needs to be called and in case of
-    ///   algorithms (like SHA3) with a message size in bits and not whole bytes
-    ///   the contents of the last byte needs to be assigned to PaddingByte before
-    ///   calling Done!
-    /// </remarks>
-    procedure CalcStream(const Stream: TStream; Size: Int64;
-                         const OnProgress:TDECProgressEvent = nil;
-                         DoFinalize: Boolean = false); overload;
-
-    /// <summary>
-    ///   Calculates the hash value over the contents of a given file
-    /// </summary>
-    /// <param name="FileName">
-    ///   Path and name of the file to be processed
-    /// </param>
-    /// <param name="HashResult">
-    ///   Here the resulting hash value is being returned as byte array
-    /// </param>
-    /// <param name="OnProgress">
-    ///   Optional callback. If being used the hash calculation will call it from
-    ///   time to time to return the current progress of the operation
-    /// </param>
-    procedure CalcFile(const FileName: string; var HashResult: TBytes;
-                       const OnProgress:TDECProgressEvent = nil); overload;
-    /// <summary>
-    ///   Calculates the hash value over the contents of a given file
-=======
-    ///   Defines the byte used in some algorithms to padd the end of the data
-    ///   if the length of the data cannot be divided by required size for the
-    ///   hash algorithm without reminder. For algorithms which can handle message
-    ///   lengths which are not whole bytes (e.g. SHA3), it can be used to define
-    ///   the last bits. This should be done only for those methods not already
-    ///   returning the calculated hash value, as those manage handling of the
-    ///   last byte themselves.
->>>>>>> origin/development
-    /// </summary>
-    /// <remarks>
-    ///   If an algorithm is used which can operate on bit sized message lengths
-    ///   and a method for feeding the data is used which does not already return
-    ///   the calculated hash value one needs to set the contents of the last
-    ///   byte with this property! For a stream for instance the length specified
-    ///   when calling CalcStream needs to be 1 byte less and that last byte
-    ///   needs to be assigned to this property just before calling Done.
-    /// </remarks>
-<<<<<<< HEAD
-    function CalcFile(const FileName: string; Format: TDECFormatClass = nil;
-                      const OnProgress:TDECProgressEvent = nil): RawByteString; overload;
-
     /// <summary>
     ///   Defines the byte used in some algorithms to padd the end of the data
     ///   if the length of the data cannot be divided by required size for the
@@ -485,8 +366,6 @@   TDECHash = class(TDECObject, IDECHash)
     ///   when calling CalcStream needs to be 1 byte less and that last byte
     ///   needs to be assigned to this property just before calling Done.
     /// </remarks>
-=======
->>>>>>> origin/development
     property PaddingByte: Byte read GetPaddingByte write SetPaddingByte;
   end;
 
@@ -875,180 +754,6 @@ class function TDECHash.ClassByName(const Name: string): TDECHashClass;
   Result := TDECHashClass(ClassList.ClassByName(Name));
 end;
 
-<<<<<<< HEAD
-procedure TDECHash.CalcStream(const Stream: TStream; Size: Int64;
-  var HashResult: TBytes; const OnProgress:TDECProgressEvent);
-var
-  Buffer: TBytes;
-  Bytes: Integer;
-  Max, Pos: Int64;
-begin
-  Assert(Assigned(Stream), 'Stream to calculate hash on is not assigned');
-
-  Max := 0;
-  SetLength(HashResult, 0);
-  try
-    Init;
-
-    if StreamBufferSize <= 0 then
-      StreamBufferSize := 8192;
-
-    Pos := Stream.Position;
-
-    if Size < 0 then
-      Size := Stream.Size - Pos;
-
-    // Last byte is incomplete so it mustn't be processed
-    if (FFinalByteLength > 0) then
-      Dec(Size);
-
-    Max      := Pos + Size;
-
-    if Assigned(OnProgress) then
-      OnProgress(Max, 0, Started);
-
-    Bytes := StreamBufferSize mod FBufferSize;
-
-    if Bytes = 0 then
-      Bytes := StreamBufferSize
-    else
-      Bytes := StreamBufferSize + FBufferSize - Bytes;
-
-    if Bytes > Size then
-      SetLength(Buffer, Size)
-    else
-      SetLength(Buffer, Bytes);
-
-    while Size > 0 do
-    begin
-      Bytes := Length(Buffer);
-      if Bytes > Size then
-        Bytes := Size;
-      Stream.ReadBuffer(Buffer[0], Bytes);
-      Calc(Buffer[0], Bytes);
-      Dec(Size, Bytes);
-      Inc(Pos, Bytes);
-
-      if Assigned(OnProgress) then
-        OnProgress(Max, Pos, Processing);
-    end;
-
-    // Last byte is incomplete but algorithm may need its value for padding
-    if (FFinalByteLength > 0) then
-      Stream.ReadBuffer(FPaddingByte, 1);
-
-    Done;
-    HashResult := DigestAsBytes;
-  finally
-    ProtectBytes(Buffer);
-    if Assigned(OnProgress) then
-      OnProgress(Max, Max, Finished);
-  end;
-end;
-
-function TDECHash.CalcStream(const Stream: TStream; Size: Int64;
-  Format: TDECFormatClass; const OnProgress:TDECProgressEvent): RawByteString;
-var
-  Hash: TBytes;
-begin
-  CalcStream(Stream, Size, Hash, OnProgress);
-  Result := BytesToRawString(ValidFormat(Format).Encode(Hash));
-end;
-
-procedure TDECHash.CalcStream(const Stream: TStream; Size: Int64;
-                              const OnProgress:TDECProgressEvent;
-                              DoFinalize: Boolean);
-var
-  Buffer: TBytes;
-  Bytes: Integer;
-  Max, Pos: Int64;
-begin
-  Assert(Assigned(Stream), 'Stream to calculate hash on is not assigned');
-
-  Max := 0;
-  try
-    if StreamBufferSize <= 0 then
-      StreamBufferSize := 8192;
-
-    Pos := Stream.Position;
-
-    if Size < 0 then
-      Size := Stream.Size - Pos;
-
-    // Last byte is incomplete so it mustn't be processed
-    if DoFinalize and (FFinalByteLength > 0) then
-      Dec(Size);
-
-    Max      := Pos + Size;
-
-    if Assigned(OnProgress) then
-      OnProgress(Max, 0, Started);
-
-    Bytes := StreamBufferSize mod FBufferSize;
-
-    if Bytes = 0 then
-      Bytes := StreamBufferSize
-    else
-      Bytes := StreamBufferSize + FBufferSize - Bytes;
-
-    if Bytes > Size then
-      SetLength(Buffer, Size)
-    else
-      SetLength(Buffer, Bytes);
-
-    while Size > 0 do
-    begin
-      Bytes := Length(Buffer);
-      if Bytes > Size then
-        Bytes := Size;
-      Stream.ReadBuffer(Buffer[0], Bytes);
-      Calc(Buffer[0], Bytes);
-      Dec(Size, Bytes);
-      Inc(Pos, Bytes);
-
-      if Assigned(OnProgress) then
-        OnProgress(Max, Pos, Processing);
-    end;
-
-    // Last byte is incomplete but algorithm may need its value for padding
-    if DoFinalize then
-    begin
-      if (FFinalByteLength > 0) then
-        Stream.ReadBuffer(FPaddingByte, 1);
-      Done;
-    end;
-  finally
-    ProtectBytes(Buffer);
-    if Assigned(OnProgress) then
-      OnProgress(Max, Max, Finished);
-  end;
-end;
-
-procedure TDECHash.CalcFile(const FileName: string; var HashResult: TBytes;
-                            const OnProgress:TDECProgressEvent);
-var
-  S: TFileStream;
-begin
-  SetLength(HashResult, 0);
-  S := TFileStream.Create(FileName, fmOpenRead or fmShareDenyNone);
-  try
-    CalcStream(S, S.Size, HashResult, OnProgress);
-  finally
-    S.Free;
-  end;
-end;
-
-function TDECHash.CalcFile(const FileName: string; Format: TDECFormatClass;
-                           const OnProgress:TDECProgressEvent): RawByteString;
-var
-  Hash: TBytes;
-begin
-  CalcFile(FileName, Hash, OnProgress);
-  Result := BytesToRawString(ValidFormat(Format).Encode(Hash));
-end;
-
-=======
->>>>>>> origin/development
 {$IFDEF DELPHIORBCB}
 procedure ModuleUnload(Instance: NativeUInt);
 var // automaticaly deregistration/releasing