Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed unused SSL Registry and an empty unit #293

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Removed unused SSL Registry and an empty unit #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cebef3
Removed obsolete ssl registry
mezen Feb 3, 2020
2dd8f6f
Removed empty unit
mezen Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 0 additions & 80 deletions Lib/Protocols/IdSSL.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,64 +116,11 @@ TIdServerIOHandlerSSLBase = class(TIdServerIOHandler)
TIdClientSSLClass = class of TIdSSLIOHandlerSocketBase;
TIdServerSSLClass = class of TIdServerIOHandlerSSLBase;

Procedure RegisterSSL(const AProduct, AVendor, ACopyright,
ADescription, AURL : String;
const AClientClass : TIdClientSSLClass; const AServerClass : TIdServerSSLClass);

type
TIdSSLRegEntry = class(TCollectionItem)
protected
FProductName : String;
FVendor : String;
FCopyright : String;
FDescription : String;
FURL : String;
FClientClass : TIdClientSSLClass;
FServerClass : TIdServerSSLClass;
public
property ProductName : String read FProductName write FProductName;
property Vendor : String read FVendor write FVendor;
property Copyright : String read FCopyright write FCopyright;
property Description : String read FDescription write FDescription;
property URL : String read FURL write FURL;
property ClientClass : TIdClientSSLClass read FClientClass write FClientClass;
property ServerClass : TIdServerSSLClass read FServerClass write FServerClass;
end;

TIdSSLRegistry = class(TCollection)
protected
function GetItem ( Index: Integer ) : TIdSSLRegEntry;
procedure SetItem ( Index: Integer; const Value: TIdSSLRegEntry );
public
constructor Create; reintroduce;
function Add: TIdSSLRegEntry;
property Items [ Index: Integer ] : TIdSSLRegEntry read GetItem
write SetItem; default;
end;

var
GSSLRegistry : TIdSSLRegistry;

implementation

uses
SysUtils;

Procedure RegisterSSL(const AProduct, AVendor, ACopyright,
ADescription, AURL : String;
const AClientClass : TIdClientSSLClass; const AServerClass : TIdServerSSLClass);
var LR : TIdSSLRegEntry;
begin
LR := GSSLRegistry.Add;
LR.ProductName := AProduct;
LR.Vendor := AVendor;
LR.Copyright := ACopyRight;
LR.Description := ADescription;
LR.URL := AURL;
LR.ClientClass := AClientClass;
LR.ServerClass := AServerClass;
end;

{ TIdSSLIOHandlerSocketBase }

procedure TIdSSLIOHandlerSocketBase.InitComponent;
Expand Down Expand Up @@ -218,31 +165,4 @@ function TIdServerIOHandlerSSLBase.MakeClientIOHandler(ATheThread:TIdYarn ): TId
Result := MakeClientIOHandler;
end;

{ TIdSSLRegistry }

function TIdSSLRegistry.Add: TIdSSLRegEntry;
begin
Result := TIdSSLRegEntry( inherited Add );
end;

constructor TIdSSLRegistry.Create;
begin
inherited Create(TIdSSLRegEntry);
end;

function TIdSSLRegistry.GetItem(Index: Integer): TIdSSLRegEntry;
begin
Result := TIdSSLRegEntry ( inherited GetItem(Index) );
end;

procedure TIdSSLRegistry.SetItem(Index: Integer;
const Value: TIdSSLRegEntry);
begin
inherited SetItem(Index,Value);
end;

initialization
GSSLRegistry := TIdSSLRegistry.Create;
finalization
FreeAndNil(GSSLRegistry);
end.
9 changes: 0 additions & 9 deletions Lib/Protocols/IdSSLDotNET.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,14 +568,5 @@ procedure TIdServerIOHandlerSSLNET.Shutdown;
end;

initialization

RegisterSSL('Indy SSL Support for Microsoft.NET 2.0','Indy Pit Crew', {do not localize}
'Copyright � 1993 - 2007'#10#13 + {do not localize}
'Chad Z. Hower (Kudzu) and the Indy Pit Crew. All rights reserved.', {do not localize}
'Open SSL Support DLL Delphi and C++Builder interface', {do not localize}
'http://www.indyproject.org/'#10#13 + {do not localize}
'Original Author - J. Peter Mugaas', {do not localize}
TIdSSLIOHandlerSocketNET,
TIdServerIOHandlerSSLNET);
TIdSSLIOHandlerSocketNET.RegisterIOHandler;
end.
8 changes: 0 additions & 8 deletions Lib/Protocols/IdSSLOpenSSL.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4259,14 +4259,6 @@ function TIdSSLCipher.GetVersion:String;
initialization
Assert(SSLIsLoaded=nil);
SSLIsLoaded := TIdThreadSafeBoolean.Create;
RegisterSSL('OpenSSL','Indy Pit Crew', {do not localize}
'Copyright '+Char(169)+' 1993 - 2014'#10#13 + {do not localize}
'Chad Z. Hower (Kudzu) and the Indy Pit Crew. All rights reserved.', {do not localize}
'Open SSL Support DLL Delphi and C++Builder interface', {do not localize}
'http://www.indyproject.org/'#10#13 + {do not localize}
'Original Author - Gregor Ibic', {do not localize}
TIdSSLIOHandlerSocketOpenSSL,
TIdServerIOHandlerSSLOpenSSL);
TIdSSLIOHandlerSocketOpenSSL.RegisterIOHandler;
finalization
// TODO: TIdSSLIOHandlerSocketOpenSSL.UnregisterIOHandler;
Expand Down
27 changes: 0 additions & 27 deletions Lib/Protocols/IdServerIOHandlerSSLOpenSSL.pas
View file
Open in desktop

This file was deleted.