ADD: Windows without SSL, Linux with SSL

Author: PascalCorpsman

TCP_IP/Send_get_file/unit1.lfm

@@ -407,7 +407,6 @@ object Form1: TForm1
     OnCanSend = LTCPComponent1CanSend
     Timeout = 0
     ReuseAddress = True
-    Session = LSSLSessionComponent2
     Left = 416
     Top = 320
   end
@@ -432,7 +431,6 @@ object Form1: TForm1
   object LHTTPClientComponent1: TLHTTPClientComponent
     OnInput = LHTTPClientComponent1Input
     Timeout = 0
-    Session = LSSLSessionComponent1
     Left = 560
     Top = 224
   end
@@ -442,15 +440,4 @@ object Form1: TForm1
     Left = 568
     Top = 112
   end
-  object LSSLSessionComponent1: TLSSLSessionComponent
-    Method = msTLS
-    Left = 736
-    Top = 224
-  end
-  object LSSLSessionComponent2: TLSSLSessionComponent
-    Method = msTLS
-    SSLActive = False
-    Left = 552
-    Top = 320
-  end
 end

TCP_IP/Send_get_file/unit1.pas

@@ -31,7 +31,7 @@
 (*                               unter Linux                                  *)
 (*                      Neues Feature : Detailreichere Fortschrittsanzeige    *)
 (*                                      (immer eine Nachkomma Einheit mit)    *)
-(*               0.08 - publish reenable SSL                                  *)
+(*               0.08 - publish reenable SSL - Linux Only                     *)
 (*                                                                            *)
 (*                                                                            *)
 (*                                                                            *)
@@ -44,8 +44,11 @@
 
 Uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, ComCtrls, lNetComponents, lcommon, lNet, lclintf, lHTTPUtil, lhttp,
-  lNetSSL;
+  ExtCtrls, ComCtrls, lNetComponents, lcommon, lNet, lclintf, lHTTPUtil, lhttp
+{$IFDEF Linux}
+  , lNetSSL, openssl
+{$ENDIF}
+  ;
 
 (*
  * LNet von : http://lnet.wordpress.com/download/
@@ -99,15 +102,17 @@
     Label8: TLabel;
     Label9: TLabel;
     LHTTPClientComponent1: TLHTTPClientComponent;
-    LSSLSessionComponent1: TLSSLSessionComponent;
-    LSSLSessionComponent2: TLSSLSessionComponent;
     LTCPComponent1: TLTCPComponent;
     OpenDialog1: TOpenDialog;
     OpenDialog2: TOpenDialog;
     ProgressBar1: TProgressBar;
     RadioGroup1: TRadioGroup;
     SaveDialog1: TSaveDialog;
     Timer1: TTimer;
+{$IFDEF Linux}
+    LSSLSessionComponent1: TLSSLSessionComponent;
+    LSSLSessionComponent2: TLSSLSessionComponent;
+{$ENDIF}
     Procedure Button10Click(Sender: TObject);
     Procedure Button1Click(Sender: TObject);
     Procedure Button2Click(Sender: TObject);
@@ -289,6 +294,20 @@
   TransmitFile.Stream := Nil;
   TransmitFile.Filename := '';
   TransmitFile.Filesize := 0;
+{$IFDEF Windows}
+  GroupBox3.Enabled := false;
+  label17.caption := 'No ssl support for Windows systems, sorry ..';
+{$ENDIF}
+{$IFDEF Linux}
+  InitSSLInterface;
+  LSSLSessionComponent1 := TLSSLSessionComponent.create(self);
+  LSSLSessionComponent1.Method := msTLS;
+  LSSLSessionComponent2 := TLSSLSessionComponent.create(self);
+  LSSLSessionComponent2.Method := msTLS;
+  LSSLSessionComponent2.SSLActive := False;
+  LHTTPClientComponent1.Session := LSSLSessionComponent2;
+  LTCPComponent1.Session;
+{$ENDIF}
 End;
 
 Procedure TForm1.FormDropFiles(Sender: TObject; Const FileNames: Array Of String
@@ -594,10 +613,12 @@
 
 Procedure TForm1.RadioGroup1Click(Sender: TObject);
 Begin
+{$IFDEF Linux}
   Case RadioGroup1.ItemIndex Of
     0: LSSLSessionComponent2.Method := msTLS;
     1: LSSLSessionComponent2.Method := msTLSv1_2;
   End;
+{$ENDIF}
 End;
 
 Procedure TForm1.Timer1Timer(Sender: TObject);
@@ -609,12 +630,14 @@
 Begin
   // receiver Connect
   Button4.OnClick(Nil);
+{$IFDEF Linux}
   If CheckBox1.Checked Then Begin
     LSSLSessionComponent2.CAFile := edit6.Text;
     LSSLSessionComponent2.KeyFile := edit7.Text;
     LSSLSessionComponent2.Password := edit8.Text;
   End;
   LSSLSessionComponent2.SSLActive := CheckBox1.Checked;
+{$ENDIF}
   If CheckBox2.Checked Then Begin
     LTCPComponent1.SocketNet := LAF_INET6;
   End
@@ -658,12 +681,14 @@
 Begin
   // Sender Connect
   Button2.OnClick(Nil);
+{$IFDEF Linux}
   If CheckBox1.Checked Then Begin
     LSSLSessionComponent2.CAFile := edit6.Text;
     LSSLSessionComponent2.KeyFile := edit7.Text;
     LSSLSessionComponent2.Password := edit8.Text;
   End;
   LSSLSessionComponent2.SSLActive := CheckBox1.Checked;
+{$ENDIF}
   If CheckBox3.Checked Then Begin
     LTCPComponent1.SocketNet := LAF_INET6;
   End
@@ -750,7 +775,9 @@
 
 Procedure TForm1.CheckBox1Change(Sender: TObject);
 Begin
+{$IFDEF Linux}
   LSSLSessionComponent2.SSLActive := CheckBox1.Checked;
+{$ENDIF}
 End;
 
 Procedure TForm1.CheckBox4Change(Sender: TObject);

graphics/ugraphics.pas

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* uGraphiks.pas                                                   ??.??.???? *)
 (*                                                                            *)
-(* Version     : 0.13                                                         *)
+(* Version     : 0.14                                                         *)
 (*                                                                            *)
 (* Author      : Uwe Schächterle (Corpsman)                                   *)
 (*                                                                            *)
@@ -41,6 +41,7 @@
 (*               0.12 - add wmFuchsia                                         *)
 (*                      FIX: glitch on rotating images                        *)
 (*               0.13 - RGBAToFPColor, FPColorToRGBA                          *)
+(*               0.14 - RGBAtoLuminanz                                        *)
 (*                                                                            *)
 (******************************************************************************)
 
@@ -116,6 +117,7 @@
 Function FPColorToHSL(Const Color: TFPColor): THSL;
 Function HSLToFPColor(Const hsl: THSL): TFPColor;
 
+Function RGBAtoLuminanz(Value: TRGBA): Byte; // Berechnet die Helligkeit einer Farbe
 Function FPColortoLuminanz(Value: TFPColor): Byte; // Berechnet die Helligkeit einer Farbe
 Function ColortoLuminanz(Value: TColor): Byte; // Berechnet die Helligkeit einer Farbe
 
@@ -527,6 +529,17 @@
   result.Alpha := 255 Shr 8;
 End;
 
+Function RGBAtoLuminanz(Value: TRGBA): Byte;
+Begin
+   //Y = 0.3R + 0.59G + 0.11B
+  result := min(255, max(0,
+    round(
+    value.R * 0.3 +
+    value.g * 0.59 +
+    value.b * 0.11
+    )));
+End;
+
 Function FPColortoLuminanz(Value: TFPColor): Byte;
 Begin
   //Y = 0.3R + 0.59G + 0.11B
@@ -542,6 +555,7 @@
 Var
   c: TFPColor;
 Begin
+  // TODO: ohne umwandlung nach tFPColor realisieren
   c.red := (value And $FF) Shl 8;
   c.green := (value And $FF00);
   c.blue := (value And $FF0000) Shr 8;