Skip to content

feat: add SetCipherList to override TLS 1.2 cipher list #200

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

Open
freitasjca wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add SetCipherList to override TLS 1.2 cipher list #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions Net/Net.CrossSslSocket.Base.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,9 @@ TCrossSslSocketBase = class(TCrossSocket, ICrossSslSocket)
const APassword: string = ''); virtual;

procedure SetVerifyPeer(const AValue: Boolean); virtual;
{ TLSOPT-2 (fork-only): override negotiated cipher list (TLS 1.2 and below).
ACipherList is an OpenSSL cipher-list string. Empty = keep _InitSslCtx default. }
procedure SetCipherList(const ACipherList: string); virtual; abstract;

property Ssl: Boolean read GetSsl;
property VerifyPeer: Boolean read GetVerifyPeer write SetVerifyPeer;
Expand Down Expand Up @@ -407,6 +410,7 @@ procedure TCrossSslSocketBase.SetVerifyPeer(const AValue: Boolean);
end;
end;


procedure TCrossSslSocketBase.AddCACertificate(const ABuf: Pointer;
const ASize: Integer);
begin
Expand Down
20 changes: 20 additions & 0 deletions Net/Net.CrossSslSocket.OpenSSL.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ TCrossOpenSslSocket = class(TCrossSslSocketBase)
const ASize: Integer); overload; override;
procedure SetPrivateKey(const APKeyBuf: Pointer; const APKeyBufSize: Integer;
const APassword: string); overload; override;
{ Override the TLS 1.2 cipher list via SSL_CTX_set_cipher_list. }
procedure SetCipherList(const ACipherList: string); override;
end;

{$IFDEF CROSS_OPENSSL_SELFTEST}
Expand Down Expand Up @@ -1170,6 +1172,24 @@ procedure TCrossOpenSslSocket.SetPrivateKey(const APKeyBuf: Pointer;
end;
end;

procedure TCrossOpenSslSocket.SetCipherList(const ACipherList: string);
var
LAnsi: AnsiString;
begin
if not Ssl or (FSslCtx = nil) or (ACipherList = '') then Exit;

BeginTlsConfigUpdate;
try
LAnsi := AnsiString(ACipherList);
if SSL_CTX_set_cipher_list(FSslCtx, PAnsiChar(LAnsi)) <> 1 then
raise ESsl.Create(
'SetCipherList: SSL_CTX_set_cipher_list rejected "' + ACipherList +
'" (no matching ciphers)');
finally
EndTlsConfigUpdate;
end;
end;

procedure TCrossOpenSslSocket.TriggerConnected(const AConnection: ICrossConnection);
var
LConnection: TCrossOpenSslConnection;
Expand Down