From 303834e2a20989011dd4910498bf4a0ba861a922 Mon Sep 17 00:00:00 2001
From: Ondrej Pokorny <ondrej@kluug.net>
Date: Mon, 18 Nov 2024 22:39:03 +0100
Subject: [PATCH] TCustomBase64Encoding.DoDecode/DoEncode(array of Byte): no
 UTF8 encoding/decoding

---
 packages/vcl-compat/src/system.netencoding.pp | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/packages/vcl-compat/src/system.netencoding.pp b/packages/vcl-compat/src/system.netencoding.pp
index 912fab5b3b..f098f4e27a 100644
--- a/packages/vcl-compat/src/system.netencoding.pp
+++ b/packages/vcl-compat/src/system.netencoding.pp
@@ -111,6 +111,9 @@ type
 
     Function DoDecode(const aInput: RawByteString): RawByteString; overload; override;
     Function DoEncode(const aInput: RawByteString): RawByteString; overload; override;
+
+    Function DoDecode(const aInput: array of Byte): TBytes; overload; override;
+    Function DoEncode(const aInput: array of Byte): TBytes; overload; override;
   end;
 
   { TBase64Encoding }
@@ -186,6 +189,40 @@ begin
   end;
 end;
 
+function TCustomBase64Encoding.DoDecode(const aInput: array of Byte): TBytes;
+var
+  Instream  : TBytesStream;
+  Outstream : TBytesStream;
+  Decoder   : TBase64DecodingStream;
+const
+  cPad: AnsiChar = '=';
+begin
+  if Length(aInput)=0 then
+    Exit(nil);
+  Instream:=TBytesStream.Create;
+  try
+    Instream.WriteBuffer(aInput[0], Length(aInput));
+    while Instream.Size mod 4 > 0 do
+      Instream.WriteBuffer(cPad, 1);
+    Instream.Position:=0;
+    Outstream:=TBytesStream.Create;
+    try
+      Decoder:=TBase64DecodingStream.Create(Instream,bdmMIME);
+      try
+         Outstream.CopyFrom(Decoder,Decoder.Size);
+         Result:=Outstream.Bytes;
+         SetLength(Result,Outstream.Size);
+      finally
+        Decoder.Free;
+      end;
+    finally
+      Outstream.Free;
+    end;
+  finally
+    Instream.Free;
+  end;
+end;
+
 function TCustomBase64Encoding.DoEncode(const aInput, aOutput: TStream): Integer;
 Var
   S : TBase64EncodingStream;
@@ -200,6 +237,28 @@ begin
   end;
 end;
 
+function TCustomBase64Encoding.DoEncode(const aInput: array of Byte): TBytes;
+var
+  Outstream : TBytesStream;
+  Encoder   : TBase64EncodingStream;
+begin
+  if Length(aInput)=0 then
+    Exit(nil);
+  Outstream:=TBytesStream.Create;
+  try
+    Encoder:=TBase64EncodingStream.create(outstream,FCharsPerline,FLineSeparator,FPadEnd);
+    try
+      Encoder.Write(aInput[0],Length(aInput));
+    finally
+      Encoder.Free;
+    end;
+    Result:=Outstream.Bytes;
+    SetLength(Result,Outstream.Size);
+  finally
+    Outstream.free;
+  end;
+end;
+
 function TCustomBase64Encoding.DoDecode(const aInput: RawByteString): RawByteString;
 begin
   Result:=DecodeStringBase64(aInput,False);